diff --git a/src/as/com/threerings/bureau/client/BureauDirector.as b/src/as/com/threerings/bureau/client/BureauDirector.as index 27d3f5550..293e7c9eb 100644 --- a/src/as/com/threerings/bureau/client/BureauDirector.as +++ b/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); } /** diff --git a/src/as/com/threerings/bureau/client/BureauService.as b/src/as/com/threerings/bureau/client/BureauService.as index f071a9bf6..2366b90a8 100644 --- a/src/as/com/threerings/bureau/client/BureauService.as +++ b/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; } } diff --git a/src/as/com/threerings/bureau/data/BureauMarshaller.as b/src/as/com/threerings/bureau/data/BureauMarshaller.as index 0b017fa1d..dc0cdc233 100644 --- a/src/as/com/threerings/bureau/data/BureauMarshaller.as +++ b/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, [ - Integer.valueOf(arg2) + sendRequest(AGENT_CREATED, [ + 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, [ - Integer.valueOf(arg2) + sendRequest(AGENT_CREATION_FAILED, [ + 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, [ - Integer.valueOf(arg2) + sendRequest(AGENT_DESTROYED, [ + 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, [ - arg2 + sendRequest(BUREAU_ERROR, [ + 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, [ - arg2 + sendRequest(BUREAU_INITIALIZED, [ + arg1 ]); } } diff --git a/src/as/com/threerings/crowd/chat/client/ChannelSpeakService.as b/src/as/com/threerings/crowd/chat/client/ChannelSpeakService.as index 70f7fb5f2..553b9941c 100644 --- a/src/as/com/threerings/crowd/chat/client/ChannelSpeakService.as +++ b/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; } } diff --git a/src/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/as/com/threerings/crowd/chat/client/ChatDirector.as index 3378f0dc7..46928a251 100644 --- a/src/as/com/threerings/crowd/chat/client/ChatDirector.as +++ b/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); } /** diff --git a/src/as/com/threerings/crowd/chat/client/ChatService.as b/src/as/com/threerings/crowd/chat/client/ChatService.as index bdc16e25d..bc4f16ff1 100644 --- a/src/as/com/threerings/crowd/chat/client/ChatService.as +++ b/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; } } diff --git a/src/as/com/threerings/crowd/chat/client/SpeakService.as b/src/as/com/threerings/crowd/chat/client/SpeakService.as index 94a80d383..9a0bfc633 100644 --- a/src/as/com/threerings/crowd/chat/client/SpeakService.as +++ b/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; } } diff --git a/src/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as b/src/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as index ccd2f81af..c7104dbed 100644 --- a/src/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as +++ b/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, [ - arg2, arg3, Byte.valueOf(arg4) + sendRequest(SPEAK, [ + arg1, arg2, Byte.valueOf(arg3) ]); } } diff --git a/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as index 885094ac2..55635c827 100644 --- a/src/as/com/threerings/crowd/chat/data/ChatMarshaller.as +++ b/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, [ - arg2 + sendRequest(AWAY, [ + 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(); - listener3.listener = arg3; - sendRequest(arg1, BROADCAST, [ - arg2, listener3 + var listener2 :InvocationMarshaller_ListenerMarshaller = new InvocationMarshaller_ListenerMarshaller(); + listener2.listener = arg2; + sendRequest(BROADCAST, [ + 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(); - listener4.listener = arg4; - sendRequest(arg1, TELL, [ - arg2, arg3, listener4 + var listener3 :ChatMarshaller_TellMarshaller = new ChatMarshaller_TellMarshaller(); + listener3.listener = arg3; + sendRequest(TELL, [ + arg1, arg2, listener3 ]); } } diff --git a/src/as/com/threerings/crowd/chat/data/SpeakMarshaller.as b/src/as/com/threerings/crowd/chat/data/SpeakMarshaller.as index bbd5d8e43..e9f237f56 100644 --- a/src/as/com/threerings/crowd/chat/data/SpeakMarshaller.as +++ b/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, [ - arg2, Byte.valueOf(arg3) + sendRequest(SPEAK, [ + arg1, Byte.valueOf(arg2) ]); } } diff --git a/src/as/com/threerings/crowd/client/BodyService.as b/src/as/com/threerings/crowd/client/BodyService.as index db037faed..21d61de7d 100644 --- a/src/as/com/threerings/crowd/client/BodyService.as +++ b/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; } } diff --git a/src/as/com/threerings/crowd/client/LocationDirector.as b/src/as/com/threerings/crowd/client/LocationDirector.as index f83452160..8b231eda7 100644 --- a/src/as/com/threerings/crowd/client/LocationDirector.as +++ b/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 diff --git a/src/as/com/threerings/crowd/client/LocationService.as b/src/as/com/threerings/crowd/client/LocationService.as index c5c55edf5..39e6aa750 100644 --- a/src/as/com/threerings/crowd/client/LocationService.as +++ b/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; } } diff --git a/src/as/com/threerings/crowd/data/BodyMarshaller.as b/src/as/com/threerings/crowd/data/BodyMarshaller.as index da810d091..39d784900 100644 --- a/src/as/com/threerings/crowd/data/BodyMarshaller.as +++ b/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, [ - langBoolean.valueOf(arg2) + sendRequest(SET_IDLE, [ + langBoolean.valueOf(arg1) ]); } } diff --git a/src/as/com/threerings/crowd/data/LocationMarshaller.as b/src/as/com/threerings/crowd/data/LocationMarshaller.as index a7bd3796d..32ea5641a 100644 --- a/src/as/com/threerings/crowd/data/LocationMarshaller.as +++ b/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(); - listener3.listener = arg3; - sendRequest(arg1, MOVE_TO, [ - Integer.valueOf(arg2), listener3 + var listener2 :LocationMarshaller_MoveMarshaller = new LocationMarshaller_MoveMarshaller(); + listener2.listener = arg2; + sendRequest(MOVE_TO, [ + Integer.valueOf(arg1), listener2 ]); } } diff --git a/src/as/com/threerings/presents/client/TimeBaseService.as b/src/as/com/threerings/presents/client/TimeBaseService.as index ffea5756b..603535f4c 100644 --- a/src/as/com/threerings/presents/client/TimeBaseService.as +++ b/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; } } diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as b/src/as/com/threerings/presents/data/TimeBaseMarshaller.as index 41783df93..7df8cce74 100644 --- a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as +++ b/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(); - listener3.listener = arg3; - sendRequest(arg1, GET_TIME_OID, [ - arg2, listener3 + var listener2 :TimeBaseMarshaller_GotTimeBaseMarshaller = new TimeBaseMarshaller_GotTimeBaseMarshaller(); + listener2.listener = arg2; + sendRequest(GET_TIME_OID, [ + arg1, listener2 ]); } }