From a97e9db978f3271499c04895a9a77cd560903bf6 Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Mon, 15 Apr 2002 16:28:05 +0000 Subject: [PATCH] Moved remaining client.*Codes classes into their respective data packages as they are intended to represent codes shared between the client and the server. Made correspondingly necessary changes throughout. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1240 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/chat/data/ChatCodes.java | 4 ++-- .../com/threerings/crowd/client/LocationService.java | 3 ++- .../threerings/crowd/{client => data}/LocationCodes.java | 6 +++--- .../com/threerings/crowd/server/LocationProvider.java | 9 ++++++--- src/java/com/threerings/crowd/server/PlaceRegistry.java | 3 +-- src/java/com/threerings/micasa/lobby/LobbyCodes.java | 4 ++-- .../micasa/simulator/client/SimulatorDirector.java | 4 +++- .../simulator/{client => data}/SimulatorCodes.java | 4 ++-- .../micasa/simulator/server/SimulatorManager.java | 4 ++-- .../com/threerings/parlor/client/ParlorDirector.java | 3 ++- src/java/com/threerings/parlor/client/ParlorService.java | 3 ++- .../threerings/parlor/{client => data}/ParlorCodes.java | 6 +++--- src/java/com/threerings/parlor/data/Table.java | 4 ++-- src/java/com/threerings/parlor/game/GameCodes.java | 4 ++-- src/java/com/threerings/parlor/game/GameManager.java | 4 ++-- src/java/com/threerings/parlor/server/ParlorManager.java | 4 ++-- .../com/threerings/parlor/server/ParlorProvider.java | 4 ++-- src/java/com/threerings/parlor/server/TableManager.java | 4 ++-- .../presents/{client => data}/InvocationCodes.java | 4 ++-- .../com/threerings/whirled/client/SceneDirector.java | 3 ++- src/java/com/threerings/whirled/client/SceneService.java | 3 ++- .../threerings/whirled/{client => data}/SceneCodes.java | 6 +++--- .../com/threerings/whirled/server/SceneProvider.java | 4 ++-- .../whirled/spot/client/SpotSceneDirector.java | 3 ++- .../com/threerings/whirled/spot/client/SpotService.java | 3 ++- .../whirled/spot/{client => data}/SpotCodes.java | 6 +++--- .../com/threerings/whirled/spot/server/SpotProvider.java | 4 ++-- .../threerings/whirled/spot/server/SpotSceneManager.java | 4 ++-- .../com/threerings/whirled/zone/client/ZoneService.java | 3 ++- .../whirled/zone/{client => data}/ZoneCodes.java | 6 +++--- .../com/threerings/whirled/zone/server/ZoneProvider.java | 4 ++-- 31 files changed, 71 insertions(+), 59 deletions(-) rename src/java/com/threerings/crowd/{client => data}/LocationCodes.java (90%) rename src/java/com/threerings/micasa/simulator/{client => data}/SimulatorCodes.java (72%) rename src/java/com/threerings/parlor/{client => data}/ParlorCodes.java (96%) rename src/java/com/threerings/presents/{client => data}/InvocationCodes.java (91%) rename src/java/com/threerings/whirled/{client => data}/SceneCodes.java (79%) rename src/java/com/threerings/whirled/spot/{client => data}/SpotCodes.java (92%) rename src/java/com/threerings/whirled/zone/{client => data}/ZoneCodes.java (74%) diff --git a/src/java/com/threerings/crowd/chat/data/ChatCodes.java b/src/java/com/threerings/crowd/chat/data/ChatCodes.java index 73aa6105d..83328bf2c 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatCodes.java +++ b/src/java/com/threerings/crowd/chat/data/ChatCodes.java @@ -1,9 +1,9 @@ // -// $Id: ChatCodes.java,v 1.6 2002/02/28 23:16:42 mdb Exp $ +// $Id: ChatCodes.java,v 1.7 2002/04/15 16:28:01 shaper Exp $ package com.threerings.crowd.chat; -import com.threerings.presents.client.InvocationCodes; +import com.threerings.presents.data.InvocationCodes; /** * Contains codes used by the chat invocation services. diff --git a/src/java/com/threerings/crowd/client/LocationService.java b/src/java/com/threerings/crowd/client/LocationService.java index cc5770098..dd8725906 100644 --- a/src/java/com/threerings/crowd/client/LocationService.java +++ b/src/java/com/threerings/crowd/client/LocationService.java @@ -1,11 +1,12 @@ // -// $Id: LocationService.java,v 1.4 2001/10/11 04:07:51 mdb Exp $ +// $Id: LocationService.java,v 1.5 2002/04/15 16:28:01 shaper Exp $ package com.threerings.crowd.client; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationDirector; import com.threerings.crowd.Log; +import com.threerings.crowd.data.LocationCodes; /** * The location services provide a mechanism by which the client can diff --git a/src/java/com/threerings/crowd/client/LocationCodes.java b/src/java/com/threerings/crowd/data/LocationCodes.java similarity index 90% rename from src/java/com/threerings/crowd/client/LocationCodes.java rename to src/java/com/threerings/crowd/data/LocationCodes.java index 257868209..c3dc04b35 100644 --- a/src/java/com/threerings/crowd/client/LocationCodes.java +++ b/src/java/com/threerings/crowd/data/LocationCodes.java @@ -1,9 +1,9 @@ // -// $Id: LocationCodes.java,v 1.2 2001/10/11 04:07:51 mdb Exp $ +// $Id: LocationCodes.java,v 1.1 2002/04/15 16:28:01 shaper Exp $ -package com.threerings.crowd.client; +package com.threerings.crowd.data; -import com.threerings.presents.client.InvocationCodes; +import com.threerings.presents.data.InvocationCodes; /** * Contains codes used by the location invocation services. diff --git a/src/java/com/threerings/crowd/server/LocationProvider.java b/src/java/com/threerings/crowd/server/LocationProvider.java index 74c430d7c..02083bec3 100644 --- a/src/java/com/threerings/crowd/server/LocationProvider.java +++ b/src/java/com/threerings/crowd/server/LocationProvider.java @@ -1,5 +1,5 @@ // -// $Id: LocationProvider.java,v 1.11 2001/12/04 01:02:59 mdb Exp $ +// $Id: LocationProvider.java,v 1.12 2002/04/15 16:28:01 shaper Exp $ package com.threerings.crowd.server; @@ -11,8 +11,11 @@ import com.threerings.presents.server.InvocationProvider; import com.threerings.presents.server.ServiceFailedException; import com.threerings.crowd.Log; -import com.threerings.crowd.client.LocationCodes; -import com.threerings.crowd.data.*; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.data.LocationCodes; +import com.threerings.crowd.data.OccupantInfo; +import com.threerings.crowd.data.PlaceConfig; +import com.threerings.crowd.data.PlaceObject; /** * This class provides the server end of the location services. diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java index bd5a018f4..ef8268d25 100644 --- a/src/java/com/threerings/crowd/server/PlaceRegistry.java +++ b/src/java/com/threerings/crowd/server/PlaceRegistry.java @@ -1,5 +1,5 @@ // -// $Id: PlaceRegistry.java,v 1.19 2002/03/28 22:32:31 mdb Exp $ +// $Id: PlaceRegistry.java,v 1.20 2002/04/15 16:28:01 shaper Exp $ package com.threerings.crowd.server; @@ -16,7 +16,6 @@ import com.threerings.presents.dobj.Subscriber; import com.threerings.presents.server.InvocationManager; import com.threerings.crowd.Log; -import com.threerings.crowd.client.LocationCodes; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/micasa/lobby/LobbyCodes.java b/src/java/com/threerings/micasa/lobby/LobbyCodes.java index d59a6fcb9..19c2d0a84 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyCodes.java +++ b/src/java/com/threerings/micasa/lobby/LobbyCodes.java @@ -1,9 +1,9 @@ // -// $Id: LobbyCodes.java,v 1.3 2001/10/11 04:13:33 mdb Exp $ +// $Id: LobbyCodes.java,v 1.4 2002/04/15 16:28:02 shaper Exp $ package com.threerings.micasa.lobby; -import com.threerings.presents.client.InvocationCodes; +import com.threerings.presents.data.InvocationCodes; /** * Contains codes used by the lobby invocation services. diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorDirector.java b/src/java/com/threerings/micasa/simulator/client/SimulatorDirector.java index 2e84ac24c..729b1ae8a 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorDirector.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorDirector.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorDirector.java,v 1.1 2001/12/19 09:32:02 shaper Exp $ +// $Id: SimulatorDirector.java,v 1.2 2002/04/15 16:28:02 shaper Exp $ package com.threerings.micasa.simulator.client; @@ -8,6 +8,8 @@ import com.threerings.presents.client.InvocationDirector; import com.threerings.parlor.game.GameConfig; +import com.threerings.micasa.simulator.data.SimulatorCodes; + public class SimulatorDirector implements SimulatorCodes { /** diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorCodes.java b/src/java/com/threerings/micasa/simulator/data/SimulatorCodes.java similarity index 72% rename from src/java/com/threerings/micasa/simulator/client/SimulatorCodes.java rename to src/java/com/threerings/micasa/simulator/data/SimulatorCodes.java index 7fdd88568..b3db42c87 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorCodes.java +++ b/src/java/com/threerings/micasa/simulator/data/SimulatorCodes.java @@ -1,7 +1,7 @@ // -// $Id: SimulatorCodes.java,v 1.1 2001/12/19 09:32:02 shaper Exp $ +// $Id: SimulatorCodes.java,v 1.1 2002/04/15 16:28:02 shaper Exp $ -package com.threerings.micasa.simulator.client; +package com.threerings.micasa.simulator.data; public interface SimulatorCodes { diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java index ab1774068..9bdbda025 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorManager.java,v 1.9 2002/03/28 22:32:32 mdb Exp $ +// $Id: SimulatorManager.java,v 1.10 2002/04/15 16:28:02 shaper Exp $ package com.threerings.micasa.simulator.server; @@ -25,7 +25,7 @@ import com.threerings.parlor.game.GameObject; import com.threerings.micasa.Log; import com.threerings.micasa.simulator.client.Simulant; -import com.threerings.micasa.simulator.client.SimulatorCodes; +import com.threerings.micasa.simulator.data.SimulatorCodes; /** * The simulator manager is responsible for handling the simulator diff --git a/src/java/com/threerings/parlor/client/ParlorDirector.java b/src/java/com/threerings/parlor/client/ParlorDirector.java index 5db5560d3..04932763f 100644 --- a/src/java/com/threerings/parlor/client/ParlorDirector.java +++ b/src/java/com/threerings/parlor/client/ParlorDirector.java @@ -1,5 +1,5 @@ // -// $Id: ParlorDirector.java,v 1.14 2002/02/09 11:23:49 mdb Exp $ +// $Id: ParlorDirector.java,v 1.15 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.client; @@ -10,6 +10,7 @@ import com.samskivert.util.HashIntMap; import com.threerings.presents.client.InvocationReceiver; import com.threerings.parlor.Log; +import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.util.ParlorContext; diff --git a/src/java/com/threerings/parlor/client/ParlorService.java b/src/java/com/threerings/parlor/client/ParlorService.java index c94645cf9..b32441e18 100644 --- a/src/java/com/threerings/parlor/client/ParlorService.java +++ b/src/java/com/threerings/parlor/client/ParlorService.java @@ -1,5 +1,5 @@ // -// $Id: ParlorService.java,v 1.11 2001/10/26 01:40:22 mdb Exp $ +// $Id: ParlorService.java,v 1.12 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.client; @@ -7,6 +7,7 @@ import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationDirector; import com.threerings.parlor.Log; +import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.GameConfig; /** diff --git a/src/java/com/threerings/parlor/client/ParlorCodes.java b/src/java/com/threerings/parlor/data/ParlorCodes.java similarity index 96% rename from src/java/com/threerings/parlor/client/ParlorCodes.java rename to src/java/com/threerings/parlor/data/ParlorCodes.java index 83ddd1af8..d09b9878d 100644 --- a/src/java/com/threerings/parlor/client/ParlorCodes.java +++ b/src/java/com/threerings/parlor/data/ParlorCodes.java @@ -1,9 +1,9 @@ // -// $Id: ParlorCodes.java,v 1.10 2001/10/26 01:40:22 mdb Exp $ +// $Id: ParlorCodes.java,v 1.1 2002/04/15 16:28:02 shaper Exp $ -package com.threerings.parlor.client; +package com.threerings.parlor.data; -import com.threerings.presents.client.InvocationCodes; +import com.threerings.presents.data.InvocationCodes; /** * Contains codes used by the parlor invocation services. diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java index f4a8e88ec..b55576d4c 100644 --- a/src/java/com/threerings/parlor/data/Table.java +++ b/src/java/com/threerings/parlor/data/Table.java @@ -1,5 +1,5 @@ // -// $Id: Table.java,v 1.8 2002/03/18 23:21:26 mdb Exp $ +// $Id: Table.java,v 1.9 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.data; @@ -12,7 +12,7 @@ import com.samskivert.util.StringUtil; import com.threerings.presents.dobj.DSet; import com.threerings.presents.io.ValueMarshaller; -import com.threerings.parlor.client.ParlorCodes; +import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.GameConfig; /** diff --git a/src/java/com/threerings/parlor/game/GameCodes.java b/src/java/com/threerings/parlor/game/GameCodes.java index 869f723b9..e5ca1cde4 100644 --- a/src/java/com/threerings/parlor/game/GameCodes.java +++ b/src/java/com/threerings/parlor/game/GameCodes.java @@ -1,9 +1,9 @@ // -// $Id: GameCodes.java,v 1.3 2001/10/11 21:08:21 mdb Exp $ +// $Id: GameCodes.java,v 1.4 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.game; -import com.threerings.presents.client.InvocationCodes; +import com.threerings.presents.data.InvocationCodes; /** * Contains codes used by the game services. diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/GameManager.java index 492f7b225..1560c7053 100644 --- a/src/java/com/threerings/parlor/game/GameManager.java +++ b/src/java/com/threerings/parlor/game/GameManager.java @@ -1,5 +1,5 @@ // -// $Id: GameManager.java,v 1.24 2002/04/14 00:26:05 mdb Exp $ +// $Id: GameManager.java,v 1.25 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.game; @@ -16,7 +16,7 @@ import com.threerings.crowd.server.CrowdServer; import com.threerings.crowd.server.PlaceManagerDelegate; import com.threerings.parlor.Log; -import com.threerings.parlor.client.ParlorCodes; +import com.threerings.parlor.data.ParlorCodes; /** * The game manager handles the server side management of a game. It diff --git a/src/java/com/threerings/parlor/server/ParlorManager.java b/src/java/com/threerings/parlor/server/ParlorManager.java index a3e64b82e..5c0f90dee 100644 --- a/src/java/com/threerings/parlor/server/ParlorManager.java +++ b/src/java/com/threerings/parlor/server/ParlorManager.java @@ -1,5 +1,5 @@ // -// $Id: ParlorManager.java,v 1.17 2002/03/28 22:32:32 mdb Exp $ +// $Id: ParlorManager.java,v 1.18 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.server; @@ -12,7 +12,7 @@ import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.server.CrowdServer; import com.threerings.parlor.Log; -import com.threerings.parlor.client.ParlorCodes; +import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameManager; diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java index ef6012bb7..f27e60b7c 100644 --- a/src/java/com/threerings/parlor/server/ParlorProvider.java +++ b/src/java/com/threerings/parlor/server/ParlorProvider.java @@ -1,5 +1,5 @@ // -// $Id: ParlorProvider.java,v 1.10 2001/10/23 23:47:02 mdb Exp $ +// $Id: ParlorProvider.java,v 1.11 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.server; @@ -11,7 +11,7 @@ import com.threerings.crowd.server.CrowdServer; import com.threerings.crowd.server.PlaceManager; import com.threerings.parlor.Log; -import com.threerings.parlor.client.ParlorCodes; +import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.GameConfig; /** diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java index 97a1b6bbe..df9c69687 100644 --- a/src/java/com/threerings/parlor/server/TableManager.java +++ b/src/java/com/threerings/parlor/server/TableManager.java @@ -1,5 +1,5 @@ // -// $Id: TableManager.java,v 1.4 2001/10/26 01:40:22 mdb Exp $ +// $Id: TableManager.java,v 1.5 2002/04/15 16:28:02 shaper Exp $ package com.threerings.parlor.server; @@ -23,7 +23,7 @@ import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.PlaceRegistry; import com.threerings.parlor.Log; -import com.threerings.parlor.client.ParlorCodes; +import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.data.Table; import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableLobbyObject; diff --git a/src/java/com/threerings/presents/client/InvocationCodes.java b/src/java/com/threerings/presents/data/InvocationCodes.java similarity index 91% rename from src/java/com/threerings/presents/client/InvocationCodes.java rename to src/java/com/threerings/presents/data/InvocationCodes.java index 23a0bd8c6..5358f6ebb 100644 --- a/src/java/com/threerings/presents/client/InvocationCodes.java +++ b/src/java/com/threerings/presents/data/InvocationCodes.java @@ -1,7 +1,7 @@ // -// $Id: InvocationCodes.java,v 1.4 2002/01/22 02:50:36 mdb Exp $ +// $Id: InvocationCodes.java,v 1.1 2002/04/15 16:28:03 shaper Exp $ -package com.threerings.presents.client; +package com.threerings.presents.data; /** * The invocation codes interface provides codes that are commonly used by diff --git a/src/java/com/threerings/whirled/client/SceneDirector.java b/src/java/com/threerings/whirled/client/SceneDirector.java index 549e4bed5..4a03d80b0 100644 --- a/src/java/com/threerings/whirled/client/SceneDirector.java +++ b/src/java/com/threerings/whirled/client/SceneDirector.java @@ -1,5 +1,5 @@ // -// $Id: SceneDirector.java,v 1.10 2001/12/16 05:18:20 mdb Exp $ +// $Id: SceneDirector.java,v 1.11 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.client; @@ -16,6 +16,7 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.whirled.Log; import com.threerings.whirled.client.persist.SceneRepository; +import com.threerings.whirled.data.SceneCodes; import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.util.NoSuchSceneException; import com.threerings.whirled.util.WhirledContext; diff --git a/src/java/com/threerings/whirled/client/SceneService.java b/src/java/com/threerings/whirled/client/SceneService.java index af4652940..fb5c52acf 100644 --- a/src/java/com/threerings/whirled/client/SceneService.java +++ b/src/java/com/threerings/whirled/client/SceneService.java @@ -1,5 +1,5 @@ // -// $Id: SceneService.java,v 1.5 2001/10/11 04:07:54 mdb Exp $ +// $Id: SceneService.java,v 1.6 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.client; @@ -7,6 +7,7 @@ import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationDirector; import com.threerings.whirled.Log; +import com.threerings.whirled.data.SceneCodes; /** * The scene service class provides the client interface to the scene diff --git a/src/java/com/threerings/whirled/client/SceneCodes.java b/src/java/com/threerings/whirled/data/SceneCodes.java similarity index 79% rename from src/java/com/threerings/whirled/client/SceneCodes.java rename to src/java/com/threerings/whirled/data/SceneCodes.java index 85a6153fa..d3fb39e09 100644 --- a/src/java/com/threerings/whirled/client/SceneCodes.java +++ b/src/java/com/threerings/whirled/data/SceneCodes.java @@ -1,9 +1,9 @@ // -// $Id: SceneCodes.java,v 1.3 2001/11/12 20:56:55 mdb Exp $ +// $Id: SceneCodes.java,v 1.1 2002/04/15 16:28:03 shaper Exp $ -package com.threerings.whirled.client; +package com.threerings.whirled.data; -import com.threerings.crowd.client.LocationCodes; +import com.threerings.crowd.data.LocationCodes; /** * Contains codes used by the scene invocation services. diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index 85df3eca3..16b002e11 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -1,5 +1,5 @@ // -// $Id: SceneProvider.java,v 1.7 2001/12/16 05:39:16 mdb Exp $ +// $Id: SceneProvider.java,v 1.8 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.server; @@ -12,7 +12,7 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.LocationProvider; import com.threerings.whirled.Log; -import com.threerings.whirled.client.SceneCodes; +import com.threerings.whirled.data.SceneCodes; import com.threerings.whirled.data.SceneModel; /** diff --git a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java index 4e175e881..0366e441c 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java +++ b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneDirector.java,v 1.10 2002/02/03 08:22:38 shaper Exp $ +// $Id: SpotSceneDirector.java,v 1.11 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.spot.client; @@ -23,6 +23,7 @@ import com.threerings.whirled.util.WhirledContext; import com.threerings.whirled.spot.Log; import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Portal; +import com.threerings.whirled.spot.data.SpotCodes; /** * Extends the standard scene director with facilities to move between diff --git a/src/java/com/threerings/whirled/spot/client/SpotService.java b/src/java/com/threerings/whirled/spot/client/SpotService.java index d6312d6c1..10159fff0 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotService.java +++ b/src/java/com/threerings/whirled/spot/client/SpotService.java @@ -1,5 +1,5 @@ // -// $Id: SpotService.java,v 1.4 2001/12/16 21:02:18 mdb Exp $ +// $Id: SpotService.java,v 1.5 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.spot.client; @@ -9,6 +9,7 @@ import com.threerings.presents.client.InvocationDirector; import com.threerings.whirled.client.SceneDirector; import com.threerings.whirled.spot.Log; +import com.threerings.whirled.spot.data.SpotCodes; /** * Provides a mechanism by which the client can request to move between diff --git a/src/java/com/threerings/whirled/spot/client/SpotCodes.java b/src/java/com/threerings/whirled/spot/data/SpotCodes.java similarity index 92% rename from src/java/com/threerings/whirled/spot/client/SpotCodes.java rename to src/java/com/threerings/whirled/spot/data/SpotCodes.java index 8ec93c174..001fdfeea 100644 --- a/src/java/com/threerings/whirled/spot/client/SpotCodes.java +++ b/src/java/com/threerings/whirled/spot/data/SpotCodes.java @@ -1,10 +1,10 @@ // -// $Id: SpotCodes.java,v 1.5 2002/02/03 08:22:38 shaper Exp $ +// $Id: SpotCodes.java,v 1.1 2002/04/15 16:28:03 shaper Exp $ -package com.threerings.whirled.spot.client; +package com.threerings.whirled.spot.data; import com.threerings.crowd.chat.ChatCodes; -import com.threerings.whirled.client.SceneCodes; +import com.threerings.whirled.data.SceneCodes; /** * Contains codes used by the Spot invocation services. diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java index dcdfbb66c..c3f6cbbb4 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java @@ -1,5 +1,5 @@ // -// $Id: SpotProvider.java,v 1.5 2001/12/16 21:02:18 mdb Exp $ +// $Id: SpotProvider.java,v 1.6 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.spot.server; @@ -18,7 +18,7 @@ import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.server.SceneRegistry; import com.threerings.whirled.spot.Log; -import com.threerings.whirled.spot.client.SpotCodes; +import com.threerings.whirled.spot.data.SpotCodes; import com.threerings.whirled.spot.data.SpotOccupantInfo; /** diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java index eafd7ce52..bfe096362 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java +++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java @@ -1,5 +1,5 @@ // -// $Id: SpotSceneManager.java,v 1.4 2001/12/16 21:02:18 mdb Exp $ +// $Id: SpotSceneManager.java,v 1.5 2002/04/15 16:28:03 shaper Exp $ package com.threerings.whirled.spot.server; @@ -16,7 +16,7 @@ import com.threerings.crowd.data.OccupantInfo; import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.spot.Log; -import com.threerings.whirled.spot.client.SpotCodes; +import com.threerings.whirled.spot.data.SpotCodes; import com.threerings.whirled.spot.data.SpotOccupantInfo; /** diff --git a/src/java/com/threerings/whirled/zone/client/ZoneService.java b/src/java/com/threerings/whirled/zone/client/ZoneService.java index d4d6a71f3..577159ecd 100644 --- a/src/java/com/threerings/whirled/zone/client/ZoneService.java +++ b/src/java/com/threerings/whirled/zone/client/ZoneService.java @@ -1,5 +1,5 @@ // -// $Id: ZoneService.java,v 1.2 2001/12/17 00:56:19 mdb Exp $ +// $Id: ZoneService.java,v 1.3 2002/04/15 16:28:04 shaper Exp $ package com.threerings.whirled.zone.client; @@ -7,6 +7,7 @@ import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationDirector; import com.threerings.whirled.zone.Log; +import com.threerings.whirled.zone.data.ZoneCodes; /** * The zone service class provides the client interface to the zone diff --git a/src/java/com/threerings/whirled/zone/client/ZoneCodes.java b/src/java/com/threerings/whirled/zone/data/ZoneCodes.java similarity index 74% rename from src/java/com/threerings/whirled/zone/client/ZoneCodes.java rename to src/java/com/threerings/whirled/zone/data/ZoneCodes.java index 718551118..92c5695ad 100644 --- a/src/java/com/threerings/whirled/zone/client/ZoneCodes.java +++ b/src/java/com/threerings/whirled/zone/data/ZoneCodes.java @@ -1,9 +1,9 @@ // -// $Id: ZoneCodes.java,v 1.1 2001/12/04 00:31:58 mdb Exp $ +// $Id: ZoneCodes.java,v 1.1 2002/04/15 16:28:04 shaper Exp $ -package com.threerings.whirled.zone.client; +package com.threerings.whirled.zone.data; -import com.threerings.whirled.client.SceneCodes; +import com.threerings.whirled.data.SceneCodes; /** * Contains codes used by the zone services. diff --git a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java index 9918cc6a7..f1e79d801 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java @@ -1,5 +1,5 @@ // -// $Id: ZoneProvider.java,v 1.5 2002/02/07 03:26:58 mdb Exp $ +// $Id: ZoneProvider.java,v 1.6 2002/04/15 16:28:05 shaper Exp $ package com.threerings.whirled.zone.server; @@ -16,7 +16,7 @@ import com.threerings.whirled.server.SceneRegistry; import com.threerings.whirled.server.SceneManager; import com.threerings.whirled.zone.Log; -import com.threerings.whirled.zone.client.ZoneCodes; +import com.threerings.whirled.zone.data.ZoneCodes; import com.threerings.whirled.zone.data.ZoneSummary; import com.threerings.whirled.zone.data.ZonedBodyObject;