From 8410b8893c99dd742d300daf09f067c31d8286ab Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 6 Aug 2008 00:53:22 +0000 Subject: [PATCH] Actually these had been generated. Bruno must have regenerated them with an old version of Narya. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@710 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../card/trick/data/TrickCardGameMarshaller.as | 8 ++++---- .../threerings/parlor/data/ParlorMarshaller.as | 10 +++++----- .../data/ParlorMarshaller_InviteMarshaller.as | 2 +- .../threerings/parlor/data/TableMarshaller.as | 12 ++++++------ .../threerings/whirled/data/SceneMarshaller.as | 4 ++-- .../data/SceneMarshaller_SceneMoveMarshaller.as | 8 ++++---- .../whirled/spot/data/SpotMarshaller.as | 10 +++++----- .../whirled/zone/data/ZoneMarshaller.as | 4 ++-- .../data/ZoneMarshaller_ZoneMoveMarshaller.as | 6 +++--- .../micasa/lobby/LobbyDispatcher.java | 8 ++------ .../micasa/lobby/LobbyMarshaller.java | 10 +++++----- .../threerings/micasa/lobby/LobbyProvider.java | 4 ++-- .../simulator/data/SimulatorMarshaller.java | 1 - .../simulator/server/SimulatorDispatcher.java | 5 +---- .../trick/data/TrickCardGameMarshaller.java | 5 +---- .../trick/server/TrickCardGameDispatcher.java | 10 +++------- .../trick/server/TrickCardGameProvider.java | 7 ++++--- .../parlor/data/ParlorMarshaller.java | 3 +-- .../threerings/parlor/data/TableMarshaller.java | 1 - .../parlor/server/ParlorDispatcher.java | 14 ++++---------- .../parlor/server/ParlorProvider.java | 8 ++++---- .../parlor/server/TableDispatcher.java | 17 +++++------------ .../threerings/parlor/server/TableProvider.java | 11 ++++++----- .../parlor/tourney/data/TourneyMarshaller.java | 1 - .../parlor/tourney/data/TourniesMarshaller.java | 1 - .../tourney/server/TourneyDispatcher.java | 11 +++-------- .../parlor/tourney/server/TourneyProvider.java | 7 ++++--- .../tourney/server/TourniesDispatcher.java | 5 +---- .../parlor/tourney/server/TourniesProvider.java | 3 ++- .../puzzle/data/PuzzleGameMarshaller.java | 1 - .../puzzle/server/PuzzleGameDispatcher.java | 8 ++------ .../puzzle/server/PuzzleGameProvider.java | 5 +++-- .../stage/data/StageSceneMarshaller.java | 1 - .../stage/server/StageSceneDispatcher.java | 8 ++------ .../stage/server/StageSceneProvider.java | 5 +++-- .../whirled/data/SceneMarshaller.java | 3 +-- .../whirled/server/SceneDispatcher.java | 5 +---- .../whirled/server/SceneProvider.java | 2 +- .../whirled/spot/data/SpotMarshaller.java | 1 - .../whirled/spot/server/SpotDispatcher.java | 14 ++++---------- .../whirled/spot/server/SpotProvider.java | 9 +++++---- .../whirled/zone/data/ZoneMarshaller.java | 3 +-- .../whirled/zone/server/ZoneDispatcher.java | 5 +---- .../whirled/zone/server/ZoneProvider.java | 2 +- 44 files changed, 105 insertions(+), 163 deletions(-) diff --git a/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as b/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as index a4bcecc9..27f9c373 100644 --- a/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as +++ b/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as @@ -29,7 +29,7 @@ import com.threerings.presents.data.InvocationMarshaller; import com.threerings.util.Integer; /** - * Provides the implementation of the {@link TrickCardGameService} interface + * Provides the implementation of the TrickCardGameService interface * that marshalls the arguments and delivers the request to the provider * on the server. Also provides an implementation of the response listener * interfaces that marshall the response arguments and deliver them back @@ -38,7 +38,7 @@ import com.threerings.util.Integer; public class TrickCardGameMarshaller extends InvocationMarshaller implements TrickCardGameService { - /** The method id used to dispatch {@link #playCard} requests. */ + /** The method id used to dispatch playCard requests. */ public static const PLAY_CARD :int = 1; // from interface TrickCardGameService @@ -49,7 +49,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #requestRematch} requests. */ + /** The method id used to dispatch requestRematch requests. */ public static const REQUEST_REMATCH :int = 2; // from interface TrickCardGameService @@ -60,7 +60,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #sendCardsToPlayer} requests. */ + /** The method id used to dispatch sendCardsToPlayer requests. */ public static const SEND_CARDS_TO_PLAYER :int = 3; // from interface TrickCardGameService diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller.as index a1b9e00b..56384ab1 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller.as @@ -34,7 +34,7 @@ import com.threerings.util.Integer; import com.threerings.util.Name; /** - * Provides the implementation of the {@link ParlorService} interface + * Provides the implementation of the ParlorService interface * that marshalls the arguments and delivers the request to the provider * on the server. Also provides an implementation of the response listener * interfaces that marshall the response arguments and deliver them back @@ -43,7 +43,7 @@ import com.threerings.util.Name; public class ParlorMarshaller extends InvocationMarshaller implements ParlorService { - /** The method id used to dispatch {@link #cancel} requests. */ + /** The method id used to dispatch cancel requests. */ public static const CANCEL :int = 1; // from interface ParlorService @@ -56,7 +56,7 @@ public class ParlorMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #invite} requests. */ + /** The method id used to dispatch invite requests. */ public static const INVITE :int = 2; // from interface ParlorService @@ -69,7 +69,7 @@ public class ParlorMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #respond} requests. */ + /** The method id used to dispatch respond requests. */ public static const RESPOND :int = 3; // from interface ParlorService @@ -82,7 +82,7 @@ public class ParlorMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #startSolitaire} requests. */ + /** The method id used to dispatch startSolitaire requests. */ public static const START_SOLITAIRE :int = 4; // from interface ParlorService diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as index 35a135cf..b69f5053 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as @@ -30,7 +30,7 @@ import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; public class ParlorMarshaller_InviteMarshaller extends InvocationMarshaller_ListenerMarshaller { - /** The method id used to dispatch {@link #inviteReceived} responses. */ + /** The method id used to dispatch inviteReceived responses. */ public static const INVITE_RECEIVED :int = 1; // from InvocationMarshaller_ListenerMarshaller diff --git a/src/as/com/threerings/parlor/data/TableMarshaller.as b/src/as/com/threerings/parlor/data/TableMarshaller.as index 997d1220..45fe25d5 100644 --- a/src/as/com/threerings/parlor/data/TableMarshaller.as +++ b/src/as/com/threerings/parlor/data/TableMarshaller.as @@ -32,7 +32,7 @@ import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller; import com.threerings.util.Integer; /** - * Provides the implementation of the {@link TableService} interface + * Provides the implementation of the TableService interface * that marshalls the arguments and delivers the request to the provider * on the server. Also provides an implementation of the response listener * interfaces that marshall the response arguments and deliver them back @@ -41,7 +41,7 @@ import com.threerings.util.Integer; public class TableMarshaller extends InvocationMarshaller implements TableService { - /** The method id used to dispatch {@link #bootPlayer} requests. */ + /** The method id used to dispatch bootPlayer requests. */ public static const BOOT_PLAYER :int = 1; // from interface TableService @@ -54,7 +54,7 @@ public class TableMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #createTable} requests. */ + /** The method id used to dispatch createTable requests. */ public static const CREATE_TABLE :int = 2; // from interface TableService @@ -67,7 +67,7 @@ public class TableMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #joinTable} requests. */ + /** The method id used to dispatch joinTable requests. */ public static const JOIN_TABLE :int = 3; // from interface TableService @@ -80,7 +80,7 @@ public class TableMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #leaveTable} requests. */ + /** The method id used to dispatch leaveTable requests. */ public static const LEAVE_TABLE :int = 4; // from interface TableService @@ -93,7 +93,7 @@ public class TableMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #startTableNow} requests. */ + /** The method id used to dispatch startTableNow requests. */ public static const START_TABLE_NOW :int = 5; // from interface TableService diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller.as index 1bab7169..9ce3a8d6 100644 --- a/src/as/com/threerings/whirled/data/SceneMarshaller.as +++ b/src/as/com/threerings/whirled/data/SceneMarshaller.as @@ -28,7 +28,7 @@ import com.threerings.whirled.client.SceneService; import com.threerings.whirled.client.SceneService_SceneMoveListener; /** - * Provides the implementation of the {@link SceneService} interface + * Provides the implementation of the SceneService interface * that marshalls the arguments and delivers the request to the provider * on the server. Also provides an implementation of the response listener * interfaces that marshall the response arguments and deliver them back @@ -37,7 +37,7 @@ import com.threerings.whirled.client.SceneService_SceneMoveListener; public class SceneMarshaller extends InvocationMarshaller implements SceneService { - /** The method id used to dispatch {@link #moveTo} requests. */ + /** The method id used to dispatch moveTo requests. */ public static const MOVE_TO :int = 1; // from interface SceneService diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as index 6e20cd42..3f3d88cd 100644 --- a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as +++ b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as @@ -32,16 +32,16 @@ import com.threerings.whirled.client.SceneService_SceneMoveListener; public class SceneMarshaller_SceneMoveMarshaller extends InvocationMarshaller_ListenerMarshaller { - /** The method id used to dispatch {@link #moveRequiresServerSwitch} responses. */ + /** The method id used to dispatch moveRequiresServerSwitch responses. */ public static const MOVE_REQUIRES_SERVER_SWITCH :int = 1; - /** The method id used to dispatch {@link #moveSucceeded} responses. */ + /** The method id used to dispatch moveSucceeded responses. */ public static const MOVE_SUCCEEDED :int = 2; - /** The method id used to dispatch {@link #moveSucceededWithScene} responses. */ + /** The method id used to dispatch moveSucceededWithScene responses. */ public static const MOVE_SUCCEEDED_WITH_SCENE :int = 3; - /** The method id used to dispatch {@link #moveSucceededWithUpdates} responses. */ + /** The method id used to dispatch moveSucceededWithUpdates responses. */ public static const MOVE_SUCCEEDED_WITH_UPDATES :int = 4; // from InvocationMarshaller_ListenerMarshaller diff --git a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as index 5e668af7..6e95ef7a 100644 --- a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as +++ b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as @@ -32,7 +32,7 @@ import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller; import com.threerings.whirled.spot.client.SpotService; /** - * Provides the implementation of the {@link SpotService} interface + * Provides the implementation of the SpotService interface * that marshalls the arguments and delivers the request to the provider * on the server. Also provides an implementation of the response listener * interfaces that marshall the response arguments and deliver them back @@ -41,7 +41,7 @@ import com.threerings.whirled.spot.client.SpotService; public class SpotMarshaller extends InvocationMarshaller implements SpotService { - /** The method id used to dispatch {@link #changeLocation} requests. */ + /** The method id used to dispatch changeLocation requests. */ public static const CHANGE_LOCATION :int = 1; // from interface SpotService @@ -54,7 +54,7 @@ public class SpotMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #clusterSpeak} requests. */ + /** The method id used to dispatch clusterSpeak requests. */ public static const CLUSTER_SPEAK :int = 2; // from interface SpotService @@ -65,7 +65,7 @@ public class SpotMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #joinCluster} requests. */ + /** The method id used to dispatch joinCluster requests. */ public static const JOIN_CLUSTER :int = 3; // from interface SpotService @@ -78,7 +78,7 @@ public class SpotMarshaller extends InvocationMarshaller ]); } - /** The method id used to dispatch {@link #traversePortal} requests. */ + /** The method id used to dispatch traversePortal requests. */ public static const TRAVERSE_PORTAL :int = 4; // from interface SpotService diff --git a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as index 8cd85cd0..3fb18b13 100644 --- a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as +++ b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as @@ -28,7 +28,7 @@ import com.threerings.whirled.zone.client.ZoneService; import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; /** - * Provides the implementation of the {@link ZoneService} interface + * Provides the implementation of the ZoneService interface * that marshalls the arguments and delivers the request to the provider * on the server. Also provides an implementation of the response listener * interfaces that marshall the response arguments and deliver them back @@ -37,7 +37,7 @@ import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; public class ZoneMarshaller extends InvocationMarshaller implements ZoneService { - /** The method id used to dispatch {@link #moveTo} requests. */ + /** The method id used to dispatch moveTo requests. */ public static const MOVE_TO :int = 1; // from interface ZoneService diff --git a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as index 8678d6d0..f21a6b28 100644 --- a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as +++ b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as @@ -33,13 +33,13 @@ import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; public class ZoneMarshaller_ZoneMoveMarshaller extends InvocationMarshaller_ListenerMarshaller { - /** The method id used to dispatch {@link #moveSucceeded} responses. */ + /** The method id used to dispatch moveSucceeded responses. */ public static const MOVE_SUCCEEDED :int = 1; - /** The method id used to dispatch {@link #moveSucceededWithScene} responses. */ + /** The method id used to dispatch moveSucceededWithScene responses. */ public static const MOVE_SUCCEEDED_WITH_SCENE :int = 2; - /** The method id used to dispatch {@link #moveSucceededWithUpdates} responses. */ + /** The method id used to dispatch moveSucceededWithUpdates responses. */ public static const MOVE_SUCCEEDED_WITH_UPDATES :int = 3; // from InvocationMarshaller_ListenerMarshaller diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java index bde19330..2a1148c2 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java +++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java @@ -22,7 +22,6 @@ package com.threerings.micasa.lobby; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; @@ -46,7 +45,6 @@ public class LobbyDispatcher extends InvocationDispatcher return new LobbyMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -55,15 +53,13 @@ public class LobbyDispatcher extends InvocationDispatcher switch (methodId) { case LobbyMarshaller.GET_CATEGORIES: ((LobbyProvider)provider).getCategories( - source, - (LobbyService.CategoriesListener)args[0] + source, (LobbyService.CategoriesListener)args[0] ); return; case LobbyMarshaller.GET_LOBBIES: ((LobbyProvider)provider).getLobbies( - source, - (String)args[0], (LobbyService.LobbiesListener)args[1] + source, (String)args[0], (LobbyService.LobbiesListener)args[1] ); return; diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java index 81c2555e..49e8be0c 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java +++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.micasa.lobby; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; -import com.threerings.presents.net.Transport; import java.util.List; /** @@ -38,7 +37,7 @@ public class LobbyMarshaller extends InvocationMarshaller implements LobbyService { /** - * Marshalls results to implementations of {@link CategoriesListener}. + * Marshalls results to implementations of {@link LobbyService.CategoriesListener}. */ public static class CategoriesMarshaller extends ListenerMarshaller implements CategoriesListener @@ -73,7 +72,7 @@ public class LobbyMarshaller extends InvocationMarshaller } /** - * Marshalls results to implementations of {@link LobbiesListener}. + * Marshalls results to implementations of {@link LobbyService.LobbiesListener}. */ public static class LobbiesMarshaller extends ListenerMarshaller implements LobbiesListener @@ -83,7 +82,7 @@ public class LobbyMarshaller extends InvocationMarshaller public static final int GOT_LOBBIES = 1; // from interface LobbiesMarshaller - public void gotLobbies (List arg1) + public void gotLobbies (List arg1) { _invId = null; omgr.postEvent(new InvocationResponseEvent( @@ -92,12 +91,13 @@ public class LobbyMarshaller extends InvocationMarshaller } @Override // from InvocationMarshaller + @SuppressWarnings("unchecked") public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { case GOT_LOBBIES: ((LobbiesListener)listener).gotLobbies( - (List)args[0]); + (List)args[0]); return; default: diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java index 25cef2cb..32c5da25 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java +++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java @@ -33,12 +33,12 @@ public interface LobbyProvider extends InvocationProvider /** * Handles a {@link LobbyService#getCategories} request. */ - public void getCategories (ClientObject caller, LobbyService.CategoriesListener arg1) + void getCategories (ClientObject caller, LobbyService.CategoriesListener arg1) throws InvocationException; /** * Handles a {@link LobbyService#getLobbies} request. */ - public void getLobbies (ClientObject caller, String arg1, LobbyService.LobbiesListener arg2) + void getLobbies (ClientObject caller, String arg1, LobbyService.LobbiesListener arg2) throws InvocationException; } diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java index b829a43f..b9a7e715 100644 --- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java +++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java @@ -25,7 +25,6 @@ import com.threerings.micasa.simulator.client.SimulatorService; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.net.Transport; /** * Provides the implementation of the {@link SimulatorService} interface diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java index 2efd2931..b67c3c25 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java @@ -24,7 +24,6 @@ package com.threerings.micasa.simulator.server; import com.threerings.micasa.simulator.data.SimulatorMarshaller; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; @@ -48,7 +47,6 @@ public class SimulatorDispatcher extends InvocationDispatcher return new ParlorMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -60,29 +58,25 @@ public class ParlorDispatcher extends InvocationDispatcher switch (methodId) { case ParlorMarshaller.CANCEL: ((ParlorProvider)provider).cancel( - source, - ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] ); return; case ParlorMarshaller.INVITE: ((ParlorProvider)provider).invite( - source, - (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2] + source, (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2] ); return; case ParlorMarshaller.RESPOND: ((ParlorProvider)provider).respond( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3] ); return; case ParlorMarshaller.START_SOLITAIRE: ((ParlorProvider)provider).startSolitaire( - source, - (GameConfig)args[0], (InvocationService.ConfirmListener)args[1] + source, (GameConfig)args[0], (InvocationService.ConfirmListener)args[1] ); return; diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java index a03e46e1..972a27dd 100644 --- a/src/java/com/threerings/parlor/server/ParlorProvider.java +++ b/src/java/com/threerings/parlor/server/ParlorProvider.java @@ -37,24 +37,24 @@ public interface ParlorProvider extends InvocationProvider /** * Handles a {@link ParlorService#cancel} request. */ - public void cancel (ClientObject caller, int arg1, InvocationService.InvocationListener arg2) + void cancel (ClientObject caller, int arg1, InvocationService.InvocationListener arg2) throws InvocationException; /** * Handles a {@link ParlorService#invite} request. */ - public void invite (ClientObject caller, Name arg1, GameConfig arg2, ParlorService.InviteListener arg3) + void invite (ClientObject caller, Name arg1, GameConfig arg2, ParlorService.InviteListener arg3) throws InvocationException; /** * Handles a {@link ParlorService#respond} request. */ - public void respond (ClientObject caller, int arg1, int arg2, Object arg3, InvocationService.InvocationListener arg4) + void respond (ClientObject caller, int arg1, int arg2, Object arg3, InvocationService.InvocationListener arg4) throws InvocationException; /** * Handles a {@link ParlorService#startSolitaire} request. */ - public void startSolitaire (ClientObject caller, GameConfig arg1, InvocationService.ConfirmListener arg2) + void startSolitaire (ClientObject caller, GameConfig arg1, InvocationService.ConfirmListener arg2) throws InvocationException; } diff --git a/src/java/com/threerings/parlor/server/TableDispatcher.java b/src/java/com/threerings/parlor/server/TableDispatcher.java index e799d2ad..6d4d5b05 100644 --- a/src/java/com/threerings/parlor/server/TableDispatcher.java +++ b/src/java/com/threerings/parlor/server/TableDispatcher.java @@ -26,7 +26,6 @@ import com.threerings.parlor.data.TableMarshaller; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; @@ -50,7 +49,6 @@ public class TableDispatcher extends InvocationDispatcher return new TableMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -59,36 +57,31 @@ public class TableDispatcher extends InvocationDispatcher switch (methodId) { case TableMarshaller.BOOT_PLAYER: ((TableProvider)provider).bootPlayer( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] ); return; case TableMarshaller.CREATE_TABLE: ((TableProvider)provider).createTable( - source, - (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2] + source, (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2] ); return; case TableMarshaller.JOIN_TABLE: ((TableProvider)provider).joinTable( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] ); return; case TableMarshaller.LEAVE_TABLE: ((TableProvider)provider).leaveTable( - source, - ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] ); return; case TableMarshaller.START_TABLE_NOW: ((TableProvider)provider).startTableNow( - source, - ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] ); return; diff --git a/src/java/com/threerings/parlor/server/TableProvider.java b/src/java/com/threerings/parlor/server/TableProvider.java index df08575b..efaa0a40 100644 --- a/src/java/com/threerings/parlor/server/TableProvider.java +++ b/src/java/com/threerings/parlor/server/TableProvider.java @@ -21,6 +21,7 @@ package com.threerings.parlor.server; +import com.threerings.parlor.client.TableService; import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.InvocationService; @@ -36,30 +37,30 @@ public interface TableProvider extends InvocationProvider /** * Handles a {@link TableService#bootPlayer} request. */ - public void bootPlayer (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3) + void bootPlayer (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3) throws InvocationException; /** * Handles a {@link TableService#createTable} request. */ - public void createTable (ClientObject caller, TableConfig arg1, GameConfig arg2, InvocationService.ResultListener arg3) + void createTable (ClientObject caller, TableConfig arg1, GameConfig arg2, InvocationService.ResultListener arg3) throws InvocationException; /** * Handles a {@link TableService#joinTable} request. */ - public void joinTable (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3) + void joinTable (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3) throws InvocationException; /** * Handles a {@link TableService#leaveTable} request. */ - public void leaveTable (ClientObject caller, int arg1, InvocationService.InvocationListener arg2) + void leaveTable (ClientObject caller, int arg1, InvocationService.InvocationListener arg2) throws InvocationException; /** * Handles a {@link TableService#startTableNow} request. */ - public void startTableNow (ClientObject caller, int arg1, InvocationService.InvocationListener arg2) + void startTableNow (ClientObject caller, int arg1, InvocationService.InvocationListener arg2) throws InvocationException; } diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java index 5fd8cfb8..b4148272 100644 --- a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java +++ b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java @@ -25,7 +25,6 @@ import com.threerings.parlor.tourney.client.TourneyService; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.net.Transport; /** * Provides the implementation of the {@link TourneyService} interface diff --git a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java index 1ca15cde..d5f7a942 100644 --- a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java +++ b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java @@ -25,7 +25,6 @@ import com.threerings.parlor.tourney.client.TourniesService; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.net.Transport; /** * Provides the implementation of the {@link TourniesService} interface diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java index 7c304467..67d8a9de 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java +++ b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java @@ -24,7 +24,6 @@ package com.threerings.parlor.tourney.server; import com.threerings.parlor.tourney.data.TourneyMarshaller; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; @@ -48,7 +47,6 @@ public class TourneyDispatcher extends InvocationDispatcher return new TourneyMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -57,22 +55,19 @@ public class TourneyDispatcher extends InvocationDispatcher switch (methodId) { case TourneyMarshaller.CANCEL: ((TourneyProvider)provider).cancel( - source, - (InvocationService.ConfirmListener)args[0] + source, (InvocationService.ConfirmListener)args[0] ); return; case TourneyMarshaller.JOIN: ((TourneyProvider)provider).join( - source, - (InvocationService.ConfirmListener)args[0] + source, (InvocationService.ConfirmListener)args[0] ); return; case TourneyMarshaller.LEAVE: ((TourneyProvider)provider).leave( - source, - (InvocationService.ConfirmListener)args[0] + source, (InvocationService.ConfirmListener)args[0] ); return; diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java index 485d4632..cfbb2cb8 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java +++ b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java @@ -21,6 +21,7 @@ package com.threerings.parlor.tourney.server; +import com.threerings.parlor.tourney.client.TourneyService; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; @@ -34,18 +35,18 @@ public interface TourneyProvider extends InvocationProvider /** * Handles a {@link TourneyService#cancel} request. */ - public void cancel (ClientObject caller, InvocationService.ConfirmListener arg1) + void cancel (ClientObject caller, InvocationService.ConfirmListener arg1) throws InvocationException; /** * Handles a {@link TourneyService#join} request. */ - public void join (ClientObject caller, InvocationService.ConfirmListener arg1) + void join (ClientObject caller, InvocationService.ConfirmListener arg1) throws InvocationException; /** * Handles a {@link TourneyService#leave} request. */ - public void leave (ClientObject caller, InvocationService.ConfirmListener arg1) + void leave (ClientObject caller, InvocationService.ConfirmListener arg1) throws InvocationException; } diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java index a716aa14..62812f32 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java @@ -25,7 +25,6 @@ import com.threerings.parlor.tourney.data.TourneyConfig; import com.threerings.parlor.tourney.data.TourniesMarshaller; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; @@ -49,7 +48,6 @@ public class TourniesDispatcher extends InvocationDispatcher return new TourniesMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -58,8 +56,7 @@ public class TourniesDispatcher extends InvocationDispatcher switch (methodId) { case TourniesMarshaller.CREATE_TOURNEY: ((TourniesProvider)provider).createTourney( - source, - (TourneyConfig)args[0], (InvocationService.ResultListener)args[1] + source, (TourneyConfig)args[0], (InvocationService.ResultListener)args[1] ); return; diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java index 7414913a..e6f9e006 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java @@ -21,6 +21,7 @@ package com.threerings.parlor.tourney.server; +import com.threerings.parlor.tourney.client.TourniesService; import com.threerings.parlor.tourney.data.TourneyConfig; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; @@ -35,6 +36,6 @@ public interface TourniesProvider extends InvocationProvider /** * Handles a {@link TourniesService#createTourney} request. */ - public void createTourney (ClientObject caller, TourneyConfig arg1, InvocationService.ResultListener arg2) + void createTourney (ClientObject caller, TourneyConfig arg1, InvocationService.ResultListener arg2) throws InvocationException; } diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java index 0cb6dfed..5e6bb84f 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java +++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java @@ -23,7 +23,6 @@ package com.threerings.puzzle.data; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.net.Transport; import com.threerings.puzzle.client.PuzzleGameService; /** diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java index 5ad3d424..80428afe 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java +++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java @@ -22,7 +22,6 @@ package com.threerings.puzzle.server; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; import com.threerings.puzzle.data.Board; @@ -48,7 +47,6 @@ public class PuzzleGameDispatcher extends InvocationDispatcher return new SceneMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -57,8 +55,7 @@ public class SceneDispatcher extends InvocationDispatcher switch (methodId) { case SceneMarshaller.MOVE_TO: ((SceneProvider)provider).moveTo( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2] ); return; diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index d4b77f4c..f6f7e556 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -34,6 +34,6 @@ public interface SceneProvider extends InvocationProvider /** * Handles a {@link SceneService#moveTo} request. */ - public void moveTo (ClientObject caller, int arg1, int arg2, SceneService.SceneMoveListener arg3) + void moveTo (ClientObject caller, int arg1, int arg2, SceneService.SceneMoveListener arg3) throws InvocationException; } diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java index 02942afc..9742bdaf 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java +++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.whirled.spot.data; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.net.Transport; import com.threerings.whirled.client.SceneService; import com.threerings.whirled.data.SceneMarshaller; import com.threerings.whirled.spot.client.SpotService; diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java index 88115555..d39ecde0 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java +++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java @@ -23,7 +23,6 @@ package com.threerings.whirled.spot.server; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; import com.threerings.whirled.client.SceneService; @@ -50,7 +49,6 @@ public class SpotDispatcher extends InvocationDispatcher return new SpotMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -59,29 +57,25 @@ public class SpotDispatcher extends InvocationDispatcher switch (methodId) { case SpotMarshaller.CHANGE_LOCATION: ((SpotProvider)provider).changeLocation( - source, - ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2] + source, ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2] ); return; case SpotMarshaller.CLUSTER_SPEAK: ((SpotProvider)provider).clusterSpeak( - source, - (String)args[0], ((Byte)args[1]).byteValue() + source, (String)args[0], ((Byte)args[1]).byteValue() ); return; case SpotMarshaller.JOIN_CLUSTER: ((SpotProvider)provider).joinCluster( - source, - ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1] ); return; case SpotMarshaller.TRAVERSE_PORTAL: ((SpotProvider)provider).traversePortal( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3] ); return; diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java index b077c929..09e68085 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java @@ -26,6 +26,7 @@ import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; import com.threerings.whirled.client.SceneService; +import com.threerings.whirled.spot.client.SpotService; import com.threerings.whirled.spot.data.Location; /** @@ -36,23 +37,23 @@ public interface SpotProvider extends InvocationProvider /** * Handles a {@link SpotService#changeLocation} request. */ - public void changeLocation (ClientObject caller, int arg1, Location arg2, InvocationService.ConfirmListener arg3) + void changeLocation (ClientObject caller, int arg1, Location arg2, InvocationService.ConfirmListener arg3) throws InvocationException; /** * Handles a {@link SpotService#clusterSpeak} request. */ - public void clusterSpeak (ClientObject caller, String arg1, byte arg2); + void clusterSpeak (ClientObject caller, String arg1, byte arg2); /** * Handles a {@link SpotService#joinCluster} request. */ - public void joinCluster (ClientObject caller, int arg1, InvocationService.ConfirmListener arg2) + void joinCluster (ClientObject caller, int arg1, InvocationService.ConfirmListener arg2) throws InvocationException; /** * Handles a {@link SpotService#traversePortal} request. */ - public void traversePortal (ClientObject caller, int arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4) + void traversePortal (ClientObject caller, int arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4) throws InvocationException; } diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java index e3063670..2079494d 100644 --- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java +++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java @@ -25,7 +25,6 @@ import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; -import com.threerings.presents.net.Transport; import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneUpdate; import com.threerings.whirled.zone.client.ZoneService; @@ -41,7 +40,7 @@ public class ZoneMarshaller extends InvocationMarshaller implements ZoneService { /** - * Marshalls results to implementations of {@link ZoneMoveListener}. + * Marshalls results to implementations of {@link ZoneService.ZoneMoveListener}. */ public static class ZoneMoveMarshaller extends ListenerMarshaller implements ZoneMoveListener diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java index 4ed831eb..8e11434d 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java @@ -22,7 +22,6 @@ package com.threerings.whirled.zone.server; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.server.InvocationDispatcher; import com.threerings.presents.server.InvocationException; import com.threerings.whirled.zone.client.ZoneService; @@ -48,7 +47,6 @@ public class ZoneDispatcher extends InvocationDispatcher return new ZoneMarshaller(); } - @SuppressWarnings("unchecked") @Override // documentation inherited public void dispatchRequest ( ClientObject source, int methodId, Object[] args) @@ -57,8 +55,7 @@ public class ZoneDispatcher extends InvocationDispatcher switch (methodId) { case ZoneMarshaller.MOVE_TO: ((ZoneProvider)provider).moveTo( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3] ); return; diff --git a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java index 86f7b202..beabd15d 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java @@ -34,6 +34,6 @@ public interface ZoneProvider extends InvocationProvider /** * Handles a {@link ZoneService#moveTo} request. */ - public void moveTo (ClientObject caller, int arg1, int arg2, int arg3, ZoneService.ZoneMoveListener arg4) + void moveTo (ClientObject caller, int arg1, int arg2, int arg3, ZoneService.ZoneMoveListener arg4) throws InvocationException; }