Regenerated services, and the callers that love them.

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

src/as/com/threerings/bureau/client/BureauDirector.as

@@ -56,7 +56,7 @@ public class BureauDirector extends BasicDirector
     {
         super.clientDidLogon(event);
         var id :String = BureauContext(_ctx).getBureauId();
-        _bureauService.bureauInitialized(_ctx.getClient(), id);
+        _bureauService.bureauInitialized(id);
     }
 
     /**
@@ -64,7 +64,7 @@ public class BureauDirector extends BasicDirector
      */
     public function fatalError (message :String) :void
     {
-        _bureauService.bureauError(_ctx.getClient(), message);
+        _bureauService.bureauError(message);
     }
 
     /**
@@ -104,7 +104,7 @@ public class BureauDirector extends BasicDirector
             else {
                 subscriber.unsubscribe(_ctx.getDObjectManager());
             }
-            _bureauService.agentDestroyed(_ctx.getClient(), agentId);
+            _bureauService.agentDestroyed(agentId);
         }
     }
 
@@ -125,12 +125,12 @@ public class BureauDirector extends BasicDirector
         }
         catch (e :Error) {
             log.warning("Could not create agent", "obj", agentObject, e);
-            _bureauService.agentCreationFailed(_ctx.getClient(), oid);
+            _bureauService.agentCreationFailed(oid);
             return;
         }
         
         _agents.put(oid, agent);
-        _bureauService.agentCreated(_ctx.getClient(), oid);
+        _bureauService.agentCreated(oid);
     }
 
     /**

src/as/com/threerings/bureau/client/BureauService.as

@@ -30,18 +30,18 @@ import com.threerings.presents.client.InvocationService;
 public interface BureauService extends InvocationService
 {
     // from Java interface BureauService
-    function agentCreated (arg1 :Client, arg2 :int) :void;
+    function agentCreated (arg1 :int) :void;
 
     // from Java interface BureauService
-    function agentCreationFailed (arg1 :Client, arg2 :int) :void;
+    function agentCreationFailed (arg1 :int) :void;
 
     // from Java interface BureauService
-    function agentDestroyed (arg1 :Client, arg2 :int) :void;
+    function agentDestroyed (arg1 :int) :void;
 
     // from Java interface BureauService
-    function bureauError (arg1 :Client, arg2 :String) :void;
+    function bureauError (arg1 :String) :void;
 
     // from Java interface BureauService
-    function bureauInitialized (arg1 :Client, arg2 :String) :void;
+    function bureauInitialized (arg1 :String) :void;
 }
 }

src/as/com/threerings/bureau/data/BureauMarshaller.as

@@ -40,10 +40,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static const AGENT_CREATED :int = 1;
 
     // from interface BureauService
-    public function agentCreated (arg1 :Client, arg2 :int) :void
+    public function agentCreated (arg1 :int) :void
     {
-        sendRequest(arg1, AGENT_CREATED, [
+        sendRequest(AGENT_CREATED, [
-            Integer.valueOf(arg2)
+            Integer.valueOf(arg1)
         ]);
     }
 
@@ -51,10 +51,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static const AGENT_CREATION_FAILED :int = 2;
 
     // from interface BureauService
-    public function agentCreationFailed (arg1 :Client, arg2 :int) :void
+    public function agentCreationFailed (arg1 :int) :void
     {
-        sendRequest(arg1, AGENT_CREATION_FAILED, [
+        sendRequest(AGENT_CREATION_FAILED, [
-            Integer.valueOf(arg2)
+            Integer.valueOf(arg1)
         ]);
     }
 
@@ -62,10 +62,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static const AGENT_DESTROYED :int = 3;
 
     // from interface BureauService
-    public function agentDestroyed (arg1 :Client, arg2 :int) :void
+    public function agentDestroyed (arg1 :int) :void
     {
-        sendRequest(arg1, AGENT_DESTROYED, [
+        sendRequest(AGENT_DESTROYED, [
-            Integer.valueOf(arg2)
+            Integer.valueOf(arg1)
         ]);
     }
 
@@ -73,10 +73,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static const BUREAU_ERROR :int = 4;
 
     // from interface BureauService
-    public function bureauError (arg1 :Client, arg2 :String) :void
+    public function bureauError (arg1 :String) :void
     {
-        sendRequest(arg1, BUREAU_ERROR, [
+        sendRequest(BUREAU_ERROR, [
-            arg2
+            arg1
         ]);
     }
 
@@ -84,10 +84,10 @@ public class BureauMarshaller extends InvocationMarshaller
     public static const BUREAU_INITIALIZED :int = 5;
 
     // from interface BureauService
-    public function bureauInitialized (arg1 :Client, arg2 :String) :void
+    public function bureauInitialized (arg1 :String) :void
     {
-        sendRequest(arg1, BUREAU_INITIALIZED, [
+        sendRequest(BUREAU_INITIALIZED, [
-            arg2
+            arg1
         ]);
     }
 }

src/as/com/threerings/crowd/chat/client/ChannelSpeakService.as

@@ -31,6 +31,6 @@ import com.threerings.presents.client.InvocationService;
 public interface ChannelSpeakService extends InvocationService
 {
     // from Java interface ChannelSpeakService
-    function speak (arg1 :Client, arg2 :ChatChannel, arg3 :String, arg4 :int) :void;
+    function speak (arg1 :ChatChannel, arg2 :String, arg3 :int) :void;
 }
 }

src/as/com/threerings/crowd/chat/client/ChatDirector.as

@@ -427,7 +427,7 @@ public class ChatDirector extends BasicDirector
         }
 
         // dispatch a speak request using the supplied speak service
-        speakService.speak(_cctx.getClient(), message, mode);
+        speakService.speak(message, mode);
     }
 
     /**
@@ -442,7 +442,7 @@ public class ChatDirector extends BasicDirector
             reason = MessageBundle.compose("m.broadcast_failed", reason);
             displayFeedback(_bundle, reason);
         };
-        _cservice.broadcast(_cctx.getClient(), message, new InvocationAdapter(failure));
+        _cservice.broadcast(message, new InvocationAdapter(failure));
     }
 
     /**
@@ -505,7 +505,7 @@ public class ChatDirector extends BasicDirector
                 displaySystem(_bundle, rmsg, SystemMessage.FEEDBACK, feedbackLocaltype);
             }
         };
-        _cservice.tell(_cctx.getClient(), target, message, new TellAdapter(failure, success));
+        _cservice.tell(target, message, new TellAdapter(failure, success));
     }
 
     /**
@@ -522,7 +522,7 @@ public class ChatDirector extends BasicDirector
             }
         }
         // pass the buck right on along
-        _cservice.away(_cctx.getClient(), message);
+        _cservice.away(message);
     }
 
     /**

src/as/com/threerings/crowd/chat/client/ChatService.as

@@ -32,12 +32,12 @@ import com.threerings.util.Name;
 public interface ChatService extends InvocationService
 {
     // from Java interface ChatService
-    function away (arg1 :Client, arg2 :String) :void;
+    function away (arg1 :String) :void;
 
     // from Java interface ChatService
-    function broadcast (arg1 :Client, arg2 :String, arg3 :InvocationService_InvocationListener) :void;
+    function broadcast (arg1 :String, arg2 :InvocationService_InvocationListener) :void;
 
     // from Java interface ChatService
-    function tell (arg1 :Client, arg2 :Name, arg3 :String, arg4 :ChatService_TellListener) :void;
+    function tell (arg1 :Name, arg2 :String, arg3 :ChatService_TellListener) :void;
 }
 }

src/as/com/threerings/crowd/chat/client/SpeakService.as

@@ -30,6 +30,6 @@ import com.threerings.presents.client.InvocationService;
 public interface SpeakService extends InvocationService
 {
     // from Java interface SpeakService
-    function speak (arg1 :Client, arg2 :String, arg3 :int) :void;
+    function speak (arg1 :String, arg2 :int) :void;
 }
 }

src/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as

@@ -40,10 +40,10 @@ public class ChannelSpeakMarshaller extends InvocationMarshaller
     public static const SPEAK :int = 1;
 
     // from interface ChannelSpeakService
-    public function speak (arg1 :Client, arg2 :ChatChannel, arg3 :String, arg4 :int) :void
+    public function speak (arg1 :ChatChannel, arg2 :String, arg3 :int) :void
     {
-        sendRequest(arg1, SPEAK, [
+        sendRequest(SPEAK, [
-            arg2, arg3, Byte.valueOf(arg4)
+            arg1, arg2, Byte.valueOf(arg3)
         ]);
     }
 }

src/as/com/threerings/crowd/chat/data/ChatMarshaller.as

@@ -43,10 +43,10 @@ public class ChatMarshaller extends InvocationMarshaller
     public static const AWAY :int = 1;
 
     // from interface ChatService
-    public function away (arg1 :Client, arg2 :String) :void
+    public function away (arg1 :String) :void
     {
-        sendRequest(arg1, AWAY, [
+        sendRequest(AWAY, [
-            arg2
+            arg1
         ]);
     }
 
@@ -54,12 +54,12 @@ public class ChatMarshaller extends InvocationMarshaller
     public static const BROADCAST :int = 2;
 
     // from interface ChatService
-    public function broadcast (arg1 :Client, arg2 :String, arg3 :InvocationService_InvocationListener) :void
+    public function broadcast (arg1 :String, arg2 :InvocationService_InvocationListener) :void
     {
-        var listener3 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
+        var listener2 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, BROADCAST, [
+        sendRequest(BROADCAST, [
-            arg2, listener3
+            arg1, listener2
         ]);
     }
 
@@ -67,12 +67,12 @@ public class ChatMarshaller extends InvocationMarshaller
     public static const TELL :int = 3;
 
     // from interface ChatService
-    public function tell (arg1 :Client, arg2 :Name, arg3 :String, arg4 :ChatService_TellListener) :void
+    public function tell (arg1 :Name, arg2 :String, arg3 :ChatService_TellListener) :void
     {
-        var listener4 :ChatMarshaller_TellMarshaller = new ChatMarshaller_TellMarshaller();
+        var listener3 :ChatMarshaller_TellMarshaller = new ChatMarshaller_TellMarshaller();
-        listener4.listener = arg4;
+        listener3.listener = arg3;
-        sendRequest(arg1, TELL, [
+        sendRequest(TELL, [
-            arg2, arg3, listener4
+            arg1, arg2, listener3
         ]);
     }
 }

src/as/com/threerings/crowd/chat/data/SpeakMarshaller.as

@@ -40,10 +40,10 @@ public class SpeakMarshaller extends InvocationMarshaller
     public static const SPEAK :int = 1;
 
     // from interface SpeakService
-    public function speak (arg1 :Client, arg2 :String, arg3 :int) :void
+    public function speak (arg1 :String, arg2 :int) :void
     {
-        sendRequest(arg1, SPEAK, [
+        sendRequest(SPEAK, [
-            arg2, Byte.valueOf(arg3)
+            arg1, Byte.valueOf(arg2)
         ]);
     }
 }

src/as/com/threerings/crowd/client/BodyService.as

@@ -30,6 +30,6 @@ import com.threerings.presents.client.InvocationService;
 public interface BodyService extends InvocationService
 {
     // from Java interface BodyService
-    function setIdle (arg1 :Client, arg2 :Boolean) :void;
+    function setIdle (arg1 :Boolean) :void;
 }
 }

src/as/com/threerings/crowd/client/LocationDirector.as

@@ -178,7 +178,7 @@ public class LocationDirector extends BasicDirector
 
         // issue a moveTo request
         log.info("Issuing moveTo(" + placeId + ").");
-        _lservice.moveTo(_cctx.getClient(), placeId, new MoveAdapter(success, failure));
+        _lservice.moveTo(placeId, new MoveAdapter(success, failure));
         return true;
     }
 
@@ -213,7 +213,7 @@ public class LocationDirector extends BasicDirector
 
         // if we're not actually in a place, then no need to do anything
         if (_placeId > 0) {
-            _lservice.leavePlace(_cctx.getClient());
+            _lservice.leavePlace();
             didLeavePlace();
 
             // let our observers know that we're no longer in a location

src/as/com/threerings/crowd/client/LocationService.as

@@ -30,9 +30,9 @@ import com.threerings.presents.client.InvocationService;
 public interface LocationService extends InvocationService
 {
     // from Java interface LocationService
-    function leavePlace (arg1 :Client) :void;
+    function leavePlace () :void;
 
     // from Java interface LocationService
-    function moveTo (arg1 :Client, arg2 :int, arg3 :LocationService_MoveListener) :void;
+    function moveTo (arg1 :int, arg2 :LocationService_MoveListener) :void;
 }
 }

src/as/com/threerings/crowd/data/BodyMarshaller.as

@@ -40,10 +40,10 @@ public class BodyMarshaller extends InvocationMarshaller
     public static const SET_IDLE :int = 1;
 
     // from interface BodyService
-    public function setIdle (arg1 :Client, arg2 :Boolean) :void
+    public function setIdle (arg1 :Boolean) :void
     {
-        sendRequest(arg1, SET_IDLE, [
+        sendRequest(SET_IDLE, [
-            langBoolean.valueOf(arg2)
+            langBoolean.valueOf(arg1)
         ]);
     }
 }

src/as/com/threerings/crowd/data/LocationMarshaller.as

@@ -41,9 +41,9 @@ public class LocationMarshaller extends InvocationMarshaller
     public static const LEAVE_PLACE :int = 1;
 
     // from interface LocationService
-    public function leavePlace (arg1 :Client) :void
+    public function leavePlace () :void
     {
-        sendRequest(arg1, LEAVE_PLACE, [
+        sendRequest(LEAVE_PLACE, [
             
         ]);
     }
@@ -52,12 +52,12 @@ public class LocationMarshaller extends InvocationMarshaller
     public static const MOVE_TO :int = 2;
 
     // from interface LocationService
-    public function moveTo (arg1 :Client, arg2 :int, arg3 :LocationService_MoveListener) :void
+    public function moveTo (arg1 :int, arg2 :LocationService_MoveListener) :void
     {
-        var listener3 :LocationMarshaller_MoveMarshaller = new LocationMarshaller_MoveMarshaller();
+        var listener2 :LocationMarshaller_MoveMarshaller = new LocationMarshaller_MoveMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, MOVE_TO, [
+        sendRequest(MOVE_TO, [
-            Integer.valueOf(arg2), listener3
+            Integer.valueOf(arg1), listener2
         ]);
     }
 }

src/as/com/threerings/presents/client/TimeBaseService.as

@@ -28,6 +28,6 @@ package com.threerings.presents.client {
 public interface TimeBaseService extends InvocationService
 {
     // from Java interface TimeBaseService
-    function getTimeOid (arg1 :Client, arg2 :String, arg3 :TimeBaseService_GotTimeBaseListener) :void;
+    function getTimeOid (arg1 :String, arg2 :TimeBaseService_GotTimeBaseListener) :void;
 }
 }

src/as/com/threerings/presents/data/TimeBaseMarshaller.as

@@ -39,12 +39,12 @@ public class TimeBaseMarshaller extends InvocationMarshaller
     public static const GET_TIME_OID :int = 1;
 
     // from interface TimeBaseService
-    public function getTimeOid (arg1 :Client, arg2 :String, arg3 :TimeBaseService_GotTimeBaseListener) :void
+    public function getTimeOid (arg1 :String, arg2 :TimeBaseService_GotTimeBaseListener) :void
     {
-        var listener3 :TimeBaseMarshaller_GotTimeBaseMarshaller = new TimeBaseMarshaller_GotTimeBaseMarshaller();
+        var listener2 :TimeBaseMarshaller_GotTimeBaseMarshaller = new TimeBaseMarshaller_GotTimeBaseMarshaller();
-        listener3.listener = arg3;
+        listener2.listener = arg2;
-        sendRequest(arg1, GET_TIME_OID, [
+        sendRequest(GET_TIME_OID, [
-            arg2, listener3
+            arg1, listener2
         ]);
     }
 }