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
This commit is contained in:
Walter Korman
2002-04-15 16:28:05 +00:00
parent f6fedf5bdf
commit a97e9db978
31 changed files with 71 additions and 59 deletions
@@ -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; 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. * Contains codes used by the chat invocation services.
@@ -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; package com.threerings.crowd.client;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationDirector; import com.threerings.presents.client.InvocationDirector;
import com.threerings.crowd.Log; import com.threerings.crowd.Log;
import com.threerings.crowd.data.LocationCodes;
/** /**
* The location services provide a mechanism by which the client can * The location services provide a mechanism by which the client can
@@ -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. * Contains codes used by the location invocation services.
@@ -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; package com.threerings.crowd.server;
@@ -11,8 +11,11 @@ import com.threerings.presents.server.InvocationProvider;
import com.threerings.presents.server.ServiceFailedException; import com.threerings.presents.server.ServiceFailedException;
import com.threerings.crowd.Log; import com.threerings.crowd.Log;
import com.threerings.crowd.client.LocationCodes; import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.*; 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. * This class provides the server end of the location services.
@@ -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; package com.threerings.crowd.server;
@@ -16,7 +16,6 @@ import com.threerings.presents.dobj.Subscriber;
import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.InvocationManager;
import com.threerings.crowd.Log; import com.threerings.crowd.Log;
import com.threerings.crowd.client.LocationCodes;
import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.data.PlaceObject;
@@ -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; 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. * Contains codes used by the lobby invocation services.
@@ -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; 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.parlor.game.GameConfig;
import com.threerings.micasa.simulator.data.SimulatorCodes;
public class SimulatorDirector implements SimulatorCodes public class SimulatorDirector implements SimulatorCodes
{ {
/** /**
@@ -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 public interface SimulatorCodes
{ {
@@ -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; 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.Log;
import com.threerings.micasa.simulator.client.Simulant; 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 * The simulator manager is responsible for handling the simulator
@@ -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; package com.threerings.parlor.client;
@@ -10,6 +10,7 @@ import com.samskivert.util.HashIntMap;
import com.threerings.presents.client.InvocationReceiver; import com.threerings.presents.client.InvocationReceiver;
import com.threerings.parlor.Log; import com.threerings.parlor.Log;
import com.threerings.parlor.data.ParlorCodes;
import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameConfig;
import com.threerings.parlor.util.ParlorContext; import com.threerings.parlor.util.ParlorContext;
@@ -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; package com.threerings.parlor.client;
@@ -7,6 +7,7 @@ import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationDirector; import com.threerings.presents.client.InvocationDirector;
import com.threerings.parlor.Log; import com.threerings.parlor.Log;
import com.threerings.parlor.data.ParlorCodes;
import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameConfig;
/** /**
@@ -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. * Contains codes used by the parlor invocation services.
@@ -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; package com.threerings.parlor.data;
@@ -12,7 +12,7 @@ import com.samskivert.util.StringUtil;
import com.threerings.presents.dobj.DSet; import com.threerings.presents.dobj.DSet;
import com.threerings.presents.io.ValueMarshaller; import com.threerings.presents.io.ValueMarshaller;
import com.threerings.parlor.client.ParlorCodes; import com.threerings.parlor.data.ParlorCodes;
import com.threerings.parlor.game.GameConfig; import com.threerings.parlor.game.GameConfig;
/** /**
@@ -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; package com.threerings.parlor.game;
import com.threerings.presents.client.InvocationCodes; import com.threerings.presents.data.InvocationCodes;
/** /**
* Contains codes used by the game services. * Contains codes used by the game services.
@@ -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; package com.threerings.parlor.game;
@@ -16,7 +16,7 @@ import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.server.PlaceManagerDelegate; import com.threerings.crowd.server.PlaceManagerDelegate;
import com.threerings.parlor.Log; 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 * The game manager handles the server side management of a game. It
@@ -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; package com.threerings.parlor.server;
@@ -12,7 +12,7 @@ import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.server.CrowdServer; import com.threerings.crowd.server.CrowdServer;
import com.threerings.parlor.Log; 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.GameConfig;
import com.threerings.parlor.game.GameManager; import com.threerings.parlor.game.GameManager;
@@ -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; package com.threerings.parlor.server;
@@ -11,7 +11,7 @@ import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.PlaceManager;
import com.threerings.parlor.Log; 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.GameConfig;
/** /**
@@ -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; package com.threerings.parlor.server;
@@ -23,7 +23,7 @@ import com.threerings.crowd.server.PlaceManager;
import com.threerings.crowd.server.PlaceRegistry; import com.threerings.crowd.server.PlaceRegistry;
import com.threerings.parlor.Log; 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.Table;
import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.data.TableLobbyObject; import com.threerings.parlor.data.TableLobbyObject;
@@ -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 * The invocation codes interface provides codes that are commonly used by
@@ -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; package com.threerings.whirled.client;
@@ -16,6 +16,7 @@ import com.threerings.crowd.data.PlaceObject;
import com.threerings.whirled.Log; import com.threerings.whirled.Log;
import com.threerings.whirled.client.persist.SceneRepository; import com.threerings.whirled.client.persist.SceneRepository;
import com.threerings.whirled.data.SceneCodes;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.util.NoSuchSceneException; import com.threerings.whirled.util.NoSuchSceneException;
import com.threerings.whirled.util.WhirledContext; import com.threerings.whirled.util.WhirledContext;
@@ -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; package com.threerings.whirled.client;
@@ -7,6 +7,7 @@ import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationDirector; import com.threerings.presents.client.InvocationDirector;
import com.threerings.whirled.Log; import com.threerings.whirled.Log;
import com.threerings.whirled.data.SceneCodes;
/** /**
* The scene service class provides the client interface to the scene * The scene service class provides the client interface to the scene
@@ -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. * Contains codes used by the scene invocation services.
@@ -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; package com.threerings.whirled.server;
@@ -12,7 +12,7 @@ import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.LocationProvider; import com.threerings.crowd.server.LocationProvider;
import com.threerings.whirled.Log; import com.threerings.whirled.Log;
import com.threerings.whirled.client.SceneCodes; import com.threerings.whirled.data.SceneCodes;
import com.threerings.whirled.data.SceneModel; import com.threerings.whirled.data.SceneModel;
/** /**
@@ -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; 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.Log;
import com.threerings.whirled.spot.data.Location; import com.threerings.whirled.spot.data.Location;
import com.threerings.whirled.spot.data.Portal; import com.threerings.whirled.spot.data.Portal;
import com.threerings.whirled.spot.data.SpotCodes;
/** /**
* Extends the standard scene director with facilities to move between * Extends the standard scene director with facilities to move between
@@ -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; 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.client.SceneDirector;
import com.threerings.whirled.spot.Log; 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 * Provides a mechanism by which the client can request to move between
@@ -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.crowd.chat.ChatCodes;
import com.threerings.whirled.client.SceneCodes; import com.threerings.whirled.data.SceneCodes;
/** /**
* Contains codes used by the Spot invocation services. * Contains codes used by the Spot invocation services.
@@ -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; 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.server.SceneRegistry;
import com.threerings.whirled.spot.Log; 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; import com.threerings.whirled.spot.data.SpotOccupantInfo;
/** /**
@@ -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; 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.server.SceneManager;
import com.threerings.whirled.spot.Log; 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; import com.threerings.whirled.spot.data.SpotOccupantInfo;
/** /**
@@ -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; 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.presents.client.InvocationDirector;
import com.threerings.whirled.zone.Log; import com.threerings.whirled.zone.Log;
import com.threerings.whirled.zone.data.ZoneCodes;
/** /**
* The zone service class provides the client interface to the zone * The zone service class provides the client interface to the zone
@@ -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. * Contains codes used by the zone services.
@@ -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; 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.server.SceneManager;
import com.threerings.whirled.zone.Log; 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.ZoneSummary;
import com.threerings.whirled.zone.data.ZonedBodyObject; import com.threerings.whirled.zone.data.ZonedBodyObject;