Updated to use new Client-reference-free style.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6398 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/main/java/com/threerings/bureau/client/BureauDirector.java

@@ -56,7 +56,7 @@ public abstract class BureauDirector extends BasicDirector
     public void clientDidLogon (Client client)
     {
         super.clientDidLogon(client);
-        _bureauService.bureauInitialized(_ctx.getClient(), _ctx.getBureauId());
+        _bureauService.bureauInitialized(_ctx.getBureauId());
     }
 
     /**
@@ -103,7 +103,7 @@ public abstract class BureauDirector extends BasicDirector
             } else {
                 subscriber.unsubscribe(_ctx.getDObjectManager());
             }
-            _bureauService.agentDestroyed(_ctx.getClient(), agentId);
+            _bureauService.agentDestroyed(agentId);
         }
     }
 
@@ -124,12 +124,12 @@ public abstract class BureauDirector extends BasicDirector
             agent.start();
         } catch (Throwable t) {
             log.warning("Could not create agent", "obj", agentObject, t);
-            _bureauService.agentCreationFailed(_ctx.getClient(), oid);
+            _bureauService.agentCreationFailed(oid);
             return;
         }
 
         _agents.put(oid, agent);
-        _bureauService.agentCreated(_ctx.getClient(), oid);
+        _bureauService.agentCreated(oid);
     }
 
     /**

src/main/java/com/threerings/bureau/client/BureauService.java

@@ -34,31 +34,31 @@ public interface BureauService extends InvocationService
      * requests via the <code>BureauReceiver</code>.
      * @see BureauReceiver
      */
-    void bureauInitialized (Client client, String bureauId);
+    void bureauInitialized (String bureauId);
 
     /**
      * Notifies the server that this bureau has encountered a critical error and needs to be shut
      * down.
      */
-    void bureauError (Client client, String message);
+    void bureauError (String message);
 
     /**
      * Notify the server that a previosuly requested agent is now created and ready to use.
      * @see BureauReceiver#createAgent
      */
-    void agentCreated (Client client, int agentId);
+    void agentCreated (int agentId);
 
     /**
      * Notify the server that a previosuly requested agent could not be created.
      * @see BureauReceiver#createAgent
      */
-    void agentCreationFailed (Client client, int agentId);
+    void agentCreationFailed (int agentId);
 
     /**
      * Notify the server that an agent is no longer running. Normally called in response
      * to a call to <code>destroyAgent</code>
      * @see BureauReceiver#destroyAgent
      */
-    void agentDestroyed (Client client, int agentId);
+    void agentDestroyed (int agentId);
 }
 

src/main/java/com/threerings/bureau/data/BureauMarshaller.java

@@ -43,10 +43,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static final int AGENT_CREATED = 1;
 
     // from interface BureauService
-    public void agentCreated (Client arg1, int arg2)
+    public void agentCreated (int arg1)
     {
-        sendRequest(arg1, AGENT_CREATED, new Object[] {
-            Integer.valueOf(arg2)
+        sendRequest(AGENT_CREATED, new Object[] {
+            Integer.valueOf(arg1)
         });
     }
 
@@ -54,10 +54,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static final int AGENT_CREATION_FAILED = 2;
 
     // from interface BureauService
-    public void agentCreationFailed (Client arg1, int arg2)
+    public void agentCreationFailed (int arg1)
     {
-        sendRequest(arg1, AGENT_CREATION_FAILED, new Object[] {
-            Integer.valueOf(arg2)
+        sendRequest(AGENT_CREATION_FAILED, new Object[] {
+            Integer.valueOf(arg1)
         });
     }
 
@@ -65,10 +65,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static final int AGENT_DESTROYED = 3;
 
     // from interface BureauService
-    public void agentDestroyed (Client arg1, int arg2)
+    public void agentDestroyed (int arg1)
     {
-        sendRequest(arg1, AGENT_DESTROYED, new Object[] {
-            Integer.valueOf(arg2)
+        sendRequest(AGENT_DESTROYED, new Object[] {
+            Integer.valueOf(arg1)
         });
     }
 
@@ -76,10 +76,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static final int BUREAU_ERROR = 4;
 
     // from interface BureauService
-    public void bureauError (Client arg1, String arg2)
+    public void bureauError (String arg1)
     {
-        sendRequest(arg1, BUREAU_ERROR, new Object[] {
-            arg2
+        sendRequest(BUREAU_ERROR, new Object[] {
+            arg1
         });
     }
 
@@ -87,10 +87,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static final int BUREAU_INITIALIZED = 5;
 
     // from interface BureauService
-    public void bureauInitialized (Client arg1, String arg2)
+    public void bureauInitialized (String arg1)
     {
-        sendRequest(arg1, BUREAU_INITIALIZED, new Object[] {
-            arg2
+        sendRequest(BUREAU_INITIALIZED, new Object[] {
+            arg1
         });
     }
 }