Unburden init() from things that can be injected.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5715 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -877,7 +877,7 @@ public abstract class PeerManager
|
|||||||
if (peer == null) {
|
if (peer == null) {
|
||||||
peer = _injector.getInstance(getPeerNodeClass());
|
peer = _injector.getInstance(getPeerNodeClass());
|
||||||
_peers.put(record.nodeName, peer);
|
_peers.put(record.nodeName, peer);
|
||||||
peer.init(this, _omgr, _conmgr, record);
|
peer.init(record);
|
||||||
}
|
}
|
||||||
peer.refresh(record);
|
peer.refresh(record);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,12 +65,8 @@ public class PeerNode
|
|||||||
/**
|
/**
|
||||||
* Initializes this peer node and creates its internal client.
|
* Initializes this peer node and creates its internal client.
|
||||||
*/
|
*/
|
||||||
public void init (PeerManager peermgr, final PresentsDObjectMgr omgr,
|
public void init (NodeRecord record)
|
||||||
final ConnectionManager conmgr, NodeRecord record)
|
|
||||||
{
|
{
|
||||||
_peermgr = peermgr;
|
|
||||||
_omgr = omgr;
|
|
||||||
_conmgr = conmgr;
|
|
||||||
_record = record;
|
_record = record;
|
||||||
_client = new Client(null, _omgr) {
|
_client = new Client(null, _omgr) {
|
||||||
@Override protected void convertFromRemote (DObject target, DEvent event) {
|
@Override protected void convertFromRemote (DObject target, DEvent event) {
|
||||||
@@ -330,14 +326,15 @@ public class PeerNode
|
|||||||
}
|
}
|
||||||
} // END: class NodeObjectListener
|
} // END: class NodeObjectListener
|
||||||
|
|
||||||
protected PeerManager _peermgr;
|
|
||||||
protected PresentsDObjectMgr _omgr;
|
|
||||||
protected ConnectionManager _conmgr;
|
|
||||||
protected NodeRecord _record;
|
protected NodeRecord _record;
|
||||||
protected NodeObjectListener _listener;
|
protected NodeObjectListener _listener;
|
||||||
protected Client _client;
|
protected Client _client;
|
||||||
protected long _lastConnectStamp;
|
protected long _lastConnectStamp;
|
||||||
|
|
||||||
|
@Inject protected PeerManager _peermgr;
|
||||||
|
@Inject protected PresentsDObjectMgr _omgr;
|
||||||
|
@Inject protected ConnectionManager _conmgr;
|
||||||
|
|
||||||
/** The amount of time after which a node record can be considered out of date and invalid. */
|
/** The amount of time after which a node record can be considered out of date and invalid. */
|
||||||
protected static final long STALE_INTERVAL = 5L * 60L * 1000L;
|
protected static final long STALE_INTERVAL = 5L * 60L * 1000L;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user