From 318f7a6cf11c687df8865ab1b96edb6cb4107c15 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 2 Apr 2011 00:03:21 +0000 Subject: [PATCH] Updated services with new factored out response sending method. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1067 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../micasa/lobby/LobbyMarshaller.java | 10 ++------ .../parlor/data/ParlorMarshaller.java | 5 +--- .../whirled/data/SceneMarshaller.java | 20 +++------------ .../whirled/spot/data/SpotMarshaller.java | 25 ++++--------------- .../whirled/zone/data/ZoneMarshaller.java | 20 +++------------ 5 files changed, 16 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java index 787934e5..6a2d2a65 100644 --- a/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java +++ b/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java @@ -52,10 +52,7 @@ public class LobbyMarshaller extends InvocationMarshaller // from interface CategoriesMarshaller public void gotCategories (String[] arg1) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, GOT_CATEGORIES, - new Object[] { arg1 }, transport)); + sendResponse(GOT_CATEGORIES, new Object[] { arg1 }); } @Override // from InvocationMarshaller @@ -87,10 +84,7 @@ public class LobbyMarshaller extends InvocationMarshaller // from interface LobbiesMarshaller public void gotLobbies (List arg1) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, GOT_LOBBIES, - new Object[] { arg1 }, transport)); + sendResponse(GOT_LOBBIES, new Object[] { arg1 }); } @Override // from InvocationMarshaller diff --git a/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java index 9342da91..0c451dae 100644 --- a/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java +++ b/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java @@ -55,10 +55,7 @@ public class ParlorMarshaller extends InvocationMarshaller // from interface InviteMarshaller public void inviteReceived (int arg1) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, INVITE_RECEIVED, - new Object[] { Integer.valueOf(arg1) }, transport)); + sendResponse(INVITE_RECEIVED, new Object[] { Integer.valueOf(arg1) }); } @Override // from InvocationMarshaller diff --git a/src/main/java/com/threerings/whirled/data/SceneMarshaller.java b/src/main/java/com/threerings/whirled/data/SceneMarshaller.java index f3054ab4..fad4d530 100644 --- a/src/main/java/com/threerings/whirled/data/SceneMarshaller.java +++ b/src/main/java/com/threerings/whirled/data/SceneMarshaller.java @@ -53,10 +53,7 @@ public class SceneMarshaller extends InvocationMarshaller // from interface SceneMoveMarshaller public void moveRequiresServerSwitch (String arg1, int[] arg2) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_REQUIRES_SERVER_SWITCH, - new Object[] { arg1, arg2 }, transport)); + sendResponse(MOVE_REQUIRES_SERVER_SWITCH, new Object[] { arg1, arg2 }); } /** The method id used to dispatch {@link #moveSucceeded} @@ -66,10 +63,7 @@ public class SceneMarshaller extends InvocationMarshaller // from interface SceneMoveMarshaller public void moveSucceeded (int arg1, PlaceConfig arg2) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED, - new Object[] { Integer.valueOf(arg1), arg2 }, transport)); + sendResponse(MOVE_SUCCEEDED, new Object[] { Integer.valueOf(arg1), arg2 }); } /** The method id used to dispatch {@link #moveSucceededWithScene} @@ -79,10 +73,7 @@ public class SceneMarshaller extends InvocationMarshaller // from interface SceneMoveMarshaller public void moveSucceededWithScene (int arg1, PlaceConfig arg2, SceneModel arg3) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE, - new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport)); + sendResponse(MOVE_SUCCEEDED_WITH_SCENE, new Object[] { Integer.valueOf(arg1), arg2, arg3 }); } /** The method id used to dispatch {@link #moveSucceededWithUpdates} @@ -92,10 +83,7 @@ public class SceneMarshaller extends InvocationMarshaller // from interface SceneMoveMarshaller public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, SceneUpdate[] arg3) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES, - new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport)); + sendResponse(MOVE_SUCCEEDED_WITH_UPDATES, new Object[] { Integer.valueOf(arg1), arg2, arg3 }); } @Override // from InvocationMarshaller diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java index 2e167441..c65d02de 100644 --- a/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java +++ b/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java @@ -56,10 +56,7 @@ public class SpotMarshaller extends InvocationMarshaller // from interface SpotSceneMoveMarshaller public void moveRequiresServerSwitch (String arg1, int[] arg2) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_REQUIRES_SERVER_SWITCH, - new Object[] { arg1, arg2 }, transport)); + sendResponse(MOVE_REQUIRES_SERVER_SWITCH, new Object[] { arg1, arg2 }); } /** The method id used to dispatch {@link #moveSucceeded} @@ -69,10 +66,7 @@ public class SpotMarshaller extends InvocationMarshaller // from interface SpotSceneMoveMarshaller public void moveSucceeded (int arg1, PlaceConfig arg2) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED, - new Object[] { Integer.valueOf(arg1), arg2 }, transport)); + sendResponse(MOVE_SUCCEEDED, new Object[] { Integer.valueOf(arg1), arg2 }); } /** The method id used to dispatch {@link #moveSucceededWithScene} @@ -82,10 +76,7 @@ public class SpotMarshaller extends InvocationMarshaller // from interface SpotSceneMoveMarshaller public void moveSucceededWithScene (int arg1, PlaceConfig arg2, SceneModel arg3) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE, - new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport)); + sendResponse(MOVE_SUCCEEDED_WITH_SCENE, new Object[] { Integer.valueOf(arg1), arg2, arg3 }); } /** The method id used to dispatch {@link #moveSucceededWithUpdates} @@ -95,10 +86,7 @@ public class SpotMarshaller extends InvocationMarshaller // from interface SpotSceneMoveMarshaller public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, SceneUpdate[] arg3) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES, - new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport)); + sendResponse(MOVE_SUCCEEDED_WITH_UPDATES, new Object[] { Integer.valueOf(arg1), arg2, arg3 }); } /** The method id used to dispatch {@link #requestCancelled} @@ -108,10 +96,7 @@ public class SpotMarshaller extends InvocationMarshaller // from interface SpotSceneMoveMarshaller public void requestCancelled () { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, REQUEST_CANCELLED, - new Object[] { }, transport)); + sendResponse(REQUEST_CANCELLED, new Object[] { }); } @Override // from InvocationMarshaller diff --git a/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java index 2bf7747c..9e838bc1 100644 --- a/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java +++ b/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java @@ -55,10 +55,7 @@ public class ZoneMarshaller extends InvocationMarshaller // from interface ZoneMoveMarshaller public void moveRequiresServerSwitch (String arg1, int[] arg2) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_REQUIRES_SERVER_SWITCH, - new Object[] { arg1, arg2 }, transport)); + sendResponse(MOVE_REQUIRES_SERVER_SWITCH, new Object[] { arg1, arg2 }); } /** The method id used to dispatch {@link #moveSucceeded} @@ -68,10 +65,7 @@ public class ZoneMarshaller extends InvocationMarshaller // from interface ZoneMoveMarshaller public void moveSucceeded (int arg1, PlaceConfig arg2, ZoneSummary arg3) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED, - new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport)); + sendResponse(MOVE_SUCCEEDED, new Object[] { Integer.valueOf(arg1), arg2, arg3 }); } /** The method id used to dispatch {@link #moveSucceededWithScene} @@ -81,10 +75,7 @@ public class ZoneMarshaller extends InvocationMarshaller // from interface ZoneMoveMarshaller public void moveSucceededWithScene (int arg1, PlaceConfig arg2, ZoneSummary arg3, SceneModel arg4) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE, - new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }, transport)); + sendResponse(MOVE_SUCCEEDED_WITH_SCENE, new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }); } /** The method id used to dispatch {@link #moveSucceededWithUpdates} @@ -94,10 +85,7 @@ public class ZoneMarshaller extends InvocationMarshaller // from interface ZoneMoveMarshaller public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, ZoneSummary arg3, SceneUpdate[] arg4) { - _invId = null; - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES, - new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }, transport)); + sendResponse(MOVE_SUCCEEDED_WITH_UPDATES, new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }); } @Override // from InvocationMarshaller