AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructured invocation director so that it can be used in the absence of

Browse Source 
a Client instance.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1228 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-04-10 06:08:59 +00:00
parent 95017c3ebf
commit 625fc79502
2 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/client/Client.java
+17 -11
View File
@@ -1,11 +1,13 @@
//
// $Id: Client.java,v 1.21 2002/03/11 19:51:25 mdb Exp $
// $Id: Client.java,v 1.22 2002/04/10 06:08:59 mdb Exp $
package com.threerings.presents.client;
import java.util.ArrayList;
import java.util.List;
import com.samskivert.util.ResultListener;
import com.threerings.presents.Log;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.DObjectManager;
@@ -319,7 +321,20 @@ public class Client
_cloid = data.clientOid;
// initialize our invocation director
_invdir.init(this, data.invOid);
ResultListener rl = new ResultListener() {
public void requestCompleted (Object result) {
// keep this around
_clobj = (ClientObject)result;
// let the client know that logon has now fully succeeded
notifyObservers(Client.CLIENT_DID_LOGON, null);
}
public void requestFailed (Exception cause) {
// pass the buck onto the listeners
notifyObservers(Client.CLIENT_FAILED_TO_LOGON, cause);
}
};
_invdir.init(_comm.getDObjectManager(), _cloid, data.invOid, rl);
// we can't quite call initialization completed at this point
// because we need for the invocation director to fully initialize
@@ -327,15 +342,6 @@ public class Client
// client loose to do things like request invocation services
}
void invocationDirectorReady (ClientObject clobj)
{
// keep this around
_clobj = clobj;
// let the client know that logon has now fully succeeded
notifyObservers(Client.CLIENT_DID_LOGON, null);
}
protected Credentials _creds;
protected Invoker _invoker;
protected ClientObject _clobj;
src/java/com/threerings/presents/client/InvocationDirector.java
+48 -35
View File
@@ -1,5 +1,5 @@
//
// $Id: InvocationDirector.java,v 1.17 2002/01/30 18:30:43 mdb Exp $
// $Id: InvocationDirector.java,v 1.18 2002/04/10 06:08:59 mdb Exp $
package com.threerings.presents.client;
@@ -8,6 +8,7 @@ import java.util.HashMap;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.StringUtil;
import com.samskivert.util.ResultListener;
import com.threerings.presents.Log;
import com.threerings.presents.data.*;
@@ -35,23 +36,49 @@ import com.threerings.presents.util.ClassUtil;
* notifications at any time from the server.
*/
public class InvocationDirector
implements Subscriber, MessageListener
implements MessageListener
{
/**
* Initializes the invocation director with the specified invocation
* manager oid. It will obtain its distributed object manager and
* client object references from the supplied client instance. The
* invocation manager oid is the oid of the object on the server to
* which to deliver invocation requests.
* Initializes the invocation director.
*
* @param omgr the distributed object manager via which the invocation
* manager will send and receive events.
* @param cloid the oid of the object on which invocation
* notifications as well as invocation responses will be received.
* @param imoid the oid of the object on the server to which to
* deliver invocation requests.
* @param initListener a result listener that will be notified when
* the invocation director is up and running (meaning it has
* subscribed successfully to the client object and is ready to
* process invocation requests); or when initialization has failed.
*/
public void init (Client client, int imoid)
public void init (DObjectManager omgr, final int cloid, int imoid,
final ResultListener initListener)
{
_client = client;
_omgr = client.getDObjectManager();
_omgr = omgr;
_imoid = imoid;
// add ourselves as a subscriber to the client object
_omgr.subscribeToObject(client.getClientOid(), this);
_omgr.subscribeToObject(cloid, new Subscriber() {
public void objectAvailable (DObject object)
{
// add ourselves as a message listener
object.addListener(InvocationDirector.this);
// let the client know that we're ready to go now that
// we've got our subscription to the client object
initListener.requestCompleted(object);
}
public void requestFailed (int oid, ObjectAccessException cause)
{
// aiya! we were unable to subscribe to the client object.
// we're hosed, hosed, hosed
Log.warning("Invocation director unable to subscribe to " +
"client object [cloid=" + cloid + "]!");
initListener.requestFailed(cause);
}
});
}
/**
@@ -118,6 +145,9 @@ public class InvocationDirector
*/
public void registerReceiver (String module, InvocationReceiver receiver)
{
if (_receivers == null) {
_receivers = new HashMap();
}
_receivers.put(module, receiver);
}
@@ -128,27 +158,9 @@ public class InvocationDirector
*/
public void unregisterReceiver (String module)
{
_receivers.remove(module);
}
// documentation inherited
public void objectAvailable (DObject object)
{
// add ourselves as a message listener
object.addListener(this);
// let the client know that we're ready to go now that we've got
// our subscription to the client object
_client.invocationDirectorReady((ClientObject)object);
}
// documentation inherited
public void requestFailed (int oid, ObjectAccessException cause)
{
// aiya! we were unable to subscribe to the client object. we're
// hosed, hosed, hosed
Log.warning("Invocation director unable to subscribe to client " +
"object. All is wrong in the universe.");
if (_receivers != null) {
_receivers.remove(module);
}
}
/**
@@ -221,8 +233,10 @@ public class InvocationDirector
String module = (String)args[0];
String proc = (String)args[1];
InvocationReceiver receiver =
(InvocationReceiver)_receivers.get(module);
InvocationReceiver receiver = null;
if (_receivers != null) {
receiver = (InvocationReceiver)_receivers.get(module);
}
if (receiver == null) {
Log.warning("No receiver registered for notification " +
"[args=" + StringUtil.toString(args) + "].");
@@ -275,7 +289,6 @@ public class InvocationDirector
}
}
protected Client _client;
protected DObjectManager _omgr;
protected int _imoid;