Decided to take the pain and refactor the parlor.game and parlor.turn

packages properly into client, data and server subpackages. This
eliminates a bunch of hackery I had to do to properly handle dead code
removal when building the Game Gardens client and games and it simplifies
things and sets a good example to follow the standard procedure as much as
possible.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3381 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/micasa/lobby/LobbyConfig.java

@@ -28,7 +28,7 @@ import java.util.Properties;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.micasa.util.MiCasaContext;
 
 public class LobbyConfig extends PlaceConfig

src/java/com/threerings/micasa/lobby/LobbyController.java

@@ -1,5 +1,5 @@
 //
-// $Id: LobbyController.java,v 1.11 2004/08/27 02:12:50 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -30,7 +30,7 @@ import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.client.*;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 import com.threerings.micasa.Log;
 import com.threerings.micasa.util.MiCasaContext;

src/java/com/threerings/micasa/lobby/table/TableListView.java

@@ -44,7 +44,7 @@ import com.threerings.parlor.client.SeatednessObserver;
 import com.threerings.parlor.client.TableDirector;
 import com.threerings.parlor.client.TableObserver;
 import com.threerings.parlor.data.Table;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.data.PlaceObject;

src/java/com/threerings/micasa/simulator/client/SimulatorController.java

@@ -1,5 +1,5 @@
 //
-// $Id: SimulatorController.java,v 1.3 2004/08/27 02:12:52 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -29,7 +29,7 @@ import com.threerings.presents.client.SessionObserver;
 
 import com.threerings.crowd.data.BodyObject;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
 import com.threerings.micasa.Log;

src/java/com/threerings/micasa/simulator/client/SimulatorService.java

@@ -1,5 +1,5 @@
 //
-// $Id: SimulatorService.java,v 1.2 2004/08/27 02:12:52 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -24,7 +24,7 @@ package com.threerings.micasa.simulator.client;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Provides access to simulator invocation services.

src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java

@@ -22,7 +22,7 @@
 package com.threerings.micasa.simulator.data;
 
 import com.threerings.micasa.simulator.client.SimulatorService;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;

src/java/com/threerings/micasa/simulator/server/Simulant.java

@@ -1,5 +1,5 @@
 //
-// $Id: Simulant.java,v 1.5 2004/08/27 02:12:54 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -27,8 +27,8 @@ import com.threerings.presents.dobj.MessageEvent;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 public abstract class Simulant
 {

src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java

@@ -23,7 +23,7 @@ package com.threerings.micasa.simulator.server;
 
 import com.threerings.micasa.simulator.client.SimulatorService;
 import com.threerings.micasa.simulator.data.SimulatorMarshaller;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;

src/java/com/threerings/micasa/simulator/server/SimulatorManager.java

@@ -1,5 +1,5 @@
 //
-// $Id: SimulatorManager.java,v 1.18 2004/10/22 19:27:54 ray Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -37,9 +37,9 @@ import com.threerings.crowd.server.PlaceManager;
 import com.threerings.crowd.server.PlaceRegistry.CreationObserver;
 import com.threerings.crowd.server.PlaceRegistry;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.data.GameObject;
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.server.GameManager;
 
 import com.threerings.micasa.Log;
 

src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java

@@ -1,5 +1,5 @@
 //
-// $Id: SimulatorProvider.java,v 1.4 2004/08/27 02:12:54 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -25,7 +25,7 @@ import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
 import com.threerings.crowd.data.BodyObject;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 import com.threerings.micasa.Log;
 

src/java/com/threerings/parlor/card/client/CardGameController.java

@@ -27,7 +27,7 @@ import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.CardCodes;
 import com.threerings.parlor.card.data.Hand;
 
-import com.threerings.parlor.game.GameController;
+import com.threerings.parlor.game.client.GameController;
 
 /**
  * A controller class for card games.  Handles common functions like

src/java/com/threerings/parlor/card/data/CardGameObject.java

@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.card.data;
 
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.data.GameObject;
 
 /**
  * Game object class for card games.

src/java/com/threerings/parlor/card/server/CardGameManager.java

@@ -32,7 +32,7 @@ import com.threerings.parlor.card.data.CardGameObject;
 import com.threerings.parlor.card.data.Deck;
 import com.threerings.parlor.card.data.Hand;
 
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 import com.threerings.presents.client.InvocationService.ConfirmListener;
 import com.threerings.presents.data.ClientObject;

src/java/com/threerings/parlor/card/trick/TrickCardGameController.java

@@ -1,5 +1,5 @@
 //
-// $Id: TrickCardGameController.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.card.trick;
 
-import com.threerings.parlor.turn.TurnGameController;
+import com.threerings.parlor.turn.client.TurnGameController;
 
 /**
  * A card game controller interface for trick-based card games, such as

src/java/com/threerings/parlor/card/trick/TrickCardGameControllerDelegate.java

@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.card.trick;
 
-import com.threerings.parlor.turn.TurnGameControllerDelegate;
+import com.threerings.parlor.turn.client.TurnGameControllerDelegate;
 
 import com.threerings.presents.dobj.AttributeChangedEvent;
 

src/java/com/threerings/parlor/card/trick/TrickCardGameManager.java

@@ -1,5 +1,5 @@
 //
-// $Id: TrickCardGameManager.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.card.trick;
 
-import com.threerings.parlor.turn.TurnGameManager;
+import com.threerings.parlor.turn.server.TurnGameManager;
 
 /**
  * A card game manager interface for trick-based card games, such as

src/java/com/threerings/parlor/card/trick/TrickCardGameManagerDelegate.java

@@ -23,9 +23,9 @@ package com.threerings.parlor.card.trick;
 
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
-import com.threerings.parlor.turn.TurnGameManagerDelegate;
+import com.threerings.parlor.turn.server.TurnGameManagerDelegate;
 
 /**
  * A card game manager delegate for trick-based card games, such as

src/java/com/threerings/parlor/card/trick/TrickCardGameObject.java

@@ -1,5 +1,5 @@
 //
-// $Id: TrickCardGameObject.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.card.trick;
 
-import com.threerings.parlor.turn.TurnGameObject;
+import com.threerings.parlor.turn.data.TurnGameObject;
 
 /**
  * Game objects for trick-based card games must implement this interface.

src/java/com/threerings/parlor/client/GameConfigurator.java

@@ -24,7 +24,7 @@ package com.threerings.parlor.client;
 import javax.swing.JPanel;
 import com.samskivert.swing.VGroupLayout;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
 /**

src/java/com/threerings/parlor/client/Invitation.java

@@ -1,5 +1,5 @@
 //
-// $Id: Invitation.java,v 1.4 2004/08/27 02:20:12 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -25,7 +25,7 @@ import com.threerings.util.Name;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.data.ParlorCodes;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
 /**

src/java/com/threerings/parlor/client/InvitationResponseObserver.java

@@ -1,5 +1,5 @@
 //
-// $Id: InvitationResponseObserver.java,v 1.7 2004/08/27 02:20:12 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.client;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * A client entity that wishes to generate invitations for games must

src/java/com/threerings/parlor/client/ParlorDecoder.java

@@ -4,7 +4,7 @@
 package com.threerings.parlor.client;
 
 import com.threerings.parlor.client.ParlorReceiver;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.InvocationDecoder;
 import com.threerings.util.Name;
 

src/java/com/threerings/parlor/client/ParlorDirector.java

@@ -32,7 +32,7 @@ import com.threerings.presents.client.InvocationService;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.data.ParlorCodes;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
 /**

src/java/com/threerings/parlor/client/ParlorReceiver.java

@@ -26,7 +26,7 @@ import com.threerings.util.Name;
 import com.threerings.presents.client.InvocationReceiver;
 
 import com.threerings.parlor.data.ParlorCodes;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Defines, for the parlor services, a set of notifications delivered

src/java/com/threerings/parlor/client/ParlorService.java

@@ -26,7 +26,7 @@ import com.threerings.util.Name;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Provides an interface to the various parlor invocation services.

src/java/com/threerings/parlor/client/TableDirector.java

@@ -37,7 +37,7 @@ import com.threerings.crowd.data.PlaceObject;
 import com.threerings.parlor.Log;
 import com.threerings.parlor.data.Table;
 import com.threerings.parlor.data.TableLobbyObject;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
 /**

src/java/com/threerings/parlor/data/ParlorMarshaller.java

@@ -22,7 +22,7 @@
 package com.threerings.parlor.data;
 
 import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;

src/java/com/threerings/parlor/data/Table.java

@@ -31,7 +31,7 @@ import com.threerings.util.Name;
 import com.threerings.presents.dobj.DSet;
 
 import com.threerings.parlor.data.ParlorCodes;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * This class represents a table that is being used to matchmake a game by

src/java/com/threerings/parlor/game/client/GameController.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.client;
 
 import java.awt.event.ActionEvent;
 
@@ -34,6 +34,10 @@ import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.Log;
+import com.threerings.parlor.game.data.GameCodes;
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.parlor.game.data.GameObject;
+import com.threerings.parlor.game.data.PartyGameConfig;
 import com.threerings.parlor.util.ParlorContext;
 
 /**

src/java/com/threerings/parlor/game/client/GameControllerDelegate.java

@@ -1,5 +1,5 @@
 //
-// $Id: GameControllerDelegate.java,v 1.3 2004/08/27 02:20:14 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.client;
 
 import com.threerings.crowd.client.PlaceControllerDelegate;
 

src/java/com/threerings/parlor/game/client/GameService.java

@@ -1,5 +1,5 @@
 //
-// $Id: GameService.java,v 1.3 2004/08/27 02:20:14 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.client;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;

src/java/com/threerings/parlor/game/data/GameCodes.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.data;
 
 import com.threerings.presents.data.InvocationCodes;
 

src/java/com/threerings/parlor/game/data/GameConfig.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.data;
 
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.util.Name;

src/java/com/threerings/parlor/game/data/GameMarshaller.java

@@ -19,9 +19,9 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.data;
 
-import com.threerings.parlor.game.GameService;
+import com.threerings.parlor.game.client.GameService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;

src/java/com/threerings/parlor/game/data/GameObject.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.data;
 
 import com.samskivert.util.ListUtil;
 import com.samskivert.util.StringUtil;

src/java/com/threerings/parlor/game/data/PartyGameConfig.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.data;
 
 import com.threerings.parlor.data.TableConfig;
 

src/java/com/threerings/parlor/game/data/TeamGameConfig.java

@@ -1,5 +1,5 @@
 //
-// $Id: TeamGameConfig.java,v 1.1 2004/11/04 23:31:10 andrzej Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.data;
 
 import com.threerings.parlor.data.TableConfig;
 

src/java/com/threerings/parlor/game/server/AI.java

@@ -1,7 +1,7 @@
 //
-// $Id: AI.java,v 1.1 2004/10/22 19:27:54 ray Exp $
+// $Id$
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
 /**
  * Represents attributes of an AI player.

src/java/com/threerings/parlor/game/server/AIGameTicker.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
 import java.util.Iterator;
 import java.util.HashSet;

src/java/com/threerings/parlor/game/server/GameDispatcher.java

@@ -19,10 +19,10 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
-import com.threerings.parlor.game.GameMarshaller;
+import com.threerings.parlor.game.data.GameMarshaller;
-import com.threerings.parlor.game.GameService;
+import com.threerings.parlor.game.client.GameService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;

src/java/com/threerings/parlor/game/server/GameManager.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,6 +45,11 @@ import com.threerings.crowd.server.PlaceManagerDelegate;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.data.ParlorCodes;
+import com.threerings.parlor.game.data.GameCodes;
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.parlor.game.data.GameMarshaller;
+import com.threerings.parlor.game.data.GameObject;
+import com.threerings.parlor.game.data.PartyGameConfig;
 import com.threerings.parlor.server.ParlorSender;
 
 /**

src/java/com/threerings/parlor/game/server/GameManagerDelegate.java

@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
 import com.threerings.crowd.server.PlaceManagerDelegate;
 

src/java/com/threerings/parlor/game/server/GameProvider.java

@@ -1,5 +1,5 @@
 //
-// $Id: GameProvider.java,v 1.3 2004/08/27 02:20:14 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;

src/java/com/threerings/parlor/game/server/GameWatcher.java

@@ -1,5 +1,5 @@
 //
-// $Id: GameWatcher.java,v 1.3 2004/08/27 02:20:14 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.game;
+package com.threerings.parlor.game.server;
 
 import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;
@@ -28,6 +28,8 @@ import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.server.PlaceManager;
 import com.threerings.crowd.server.PlaceRegistry;
 
+import com.threerings.parlor.game.data.GameObject;
+
 /**
  * An abstract convenience class used server-side to keep an eye on a game
  * and perform a one-time game-over activity when the game ends.  Classes

src/java/com/threerings/parlor/server/ParlorDispatcher.java

@@ -23,7 +23,7 @@ package com.threerings.parlor.server;
 
 import com.threerings.parlor.client.ParlorService;
 import com.threerings.parlor.data.ParlorMarshaller;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;

src/java/com/threerings/parlor/server/ParlorManager.java

@@ -1,5 +1,5 @@
 //
-// $Id: ParlorManager.java,v 1.22 2004/08/27 02:20:14 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -32,8 +32,8 @@ import com.threerings.crowd.server.PlaceRegistry;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.data.ParlorCodes;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 /**
  * The parlor manager is responsible for the parlor services in

src/java/com/threerings/parlor/server/ParlorProvider.java

@@ -37,8 +37,8 @@ import com.threerings.parlor.Log;
 import com.threerings.parlor.client.ParlorService.InviteListener;
 import com.threerings.parlor.client.ParlorService.TableListener;
 import com.threerings.parlor.data.ParlorCodes;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 /**
  * The parlor provider handles the server side of the various Parlor

src/java/com/threerings/parlor/server/ParlorSender.java

@@ -5,7 +5,7 @@ package com.threerings.parlor.server;
 
 import com.threerings.parlor.client.ParlorDecoder;
 import com.threerings.parlor.client.ParlorReceiver;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationSender;
 import com.threerings.util.Name;

src/java/com/threerings/parlor/server/TableManager.java

@@ -46,8 +46,8 @@ import com.threerings.parlor.data.ParlorCodes;
 import com.threerings.parlor.data.Table;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.data.TableLobbyObject;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 /**
  * A table manager can be used by a place manager to take care of the

src/java/com/threerings/parlor/turn/client/TurnDisplay.java

@@ -1,7 +1,25 @@
 //
 // $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.turn;
+package com.threerings.parlor.turn.client;
 
 import java.awt.Color;
 import java.awt.GridBagConstraints;
@@ -22,8 +40,8 @@ import com.threerings.util.Name;
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.data.GameObject;
-import com.threerings.parlor.turn.TurnGameObject;
+import com.threerings.parlor.turn.data.TurnGameObject;
 
 import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;

src/java/com/threerings/parlor/turn/client/TurnGameController.java

@@ -19,11 +19,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.turn;
+package com.threerings.parlor.turn.client;
 
 import com.threerings.util.Name;
 
-import com.threerings.parlor.game.GameController;
+import com.threerings.parlor.game.client.GameController;
 
 /**
  * Games that wish to make use of the turn game services should have their

src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java

@@ -1,5 +1,5 @@
 //
-// $Id: TurnGameControllerDelegate.java,v 1.6 2004/08/27 02:20:15 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.turn;
+package com.threerings.parlor.turn.client;
 
 import com.threerings.util.Name;
 
@@ -31,9 +31,11 @@ import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.util.CrowdContext;
 
-import com.threerings.parlor.game.GameController;
+import com.threerings.parlor.game.client.GameController;
-import com.threerings.parlor.game.GameControllerDelegate;
+import com.threerings.parlor.game.client.GameControllerDelegate;
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.data.GameObject;
+
+import com.threerings.parlor.turn.data.TurnGameObject;
 
 /**
  * Performs the client-side processing for a turn-based game. Games which

src/java/com/threerings/parlor/turn/data/TurnGameObject.java

@@ -19,11 +19,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.turn;
+package com.threerings.parlor.turn.data;
 
 import com.threerings.util.Name;
 
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.data.GameObject;
 
 /**
  * Games that wish to support turn-based play must implement this

src/java/com/threerings/parlor/turn/server/TurnGameManager.java

@@ -19,11 +19,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.turn;
+package com.threerings.parlor.turn.server;
 
 import com.threerings.util.Name;
 
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 /**
  * A game manager that wishes to make use of the turn game services should

src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java

@@ -1,5 +1,5 @@
 //
-// $Id: TurnGameManagerDelegate.java,v 1.10 2004/08/27 02:20:15 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -19,7 +19,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.threerings.parlor.turn;
+package com.threerings.parlor.turn.server;
 
 import com.threerings.util.Name;
 import com.threerings.util.RandomUtil;
@@ -27,8 +27,10 @@ import com.threerings.util.RandomUtil;
 import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.parlor.Log;
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
-import com.threerings.parlor.game.GameManagerDelegate;
+import com.threerings.parlor.game.server.GameManagerDelegate;
+
+import com.threerings.parlor.turn.data.TurnGameObject;
 
 /**
  * Performs the server-side turn-based game processing for a turn based

src/java/com/threerings/puzzle/client/PlayerStatusView.java

@@ -1,5 +1,5 @@
 //
-// $Id: PlayerStatusView.java,v 1.4 2004/08/27 02:20:27 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -25,7 +25,7 @@ import javax.swing.JPanel;
 
 import com.threerings.util.Name;
 
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.data.GameObject;
 
 import com.threerings.puzzle.data.BoardSummary;
 import com.threerings.puzzle.data.PuzzleConfig;

src/java/com/threerings/puzzle/client/PuzzleController.java

@@ -48,7 +48,7 @@ import com.threerings.presents.dobj.ElementUpdatedEvent;
 import com.threerings.crowd.client.PlaceControllerDelegate;
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.parlor.game.GameController;
+import com.threerings.parlor.game.client.GameController;
 
 import com.threerings.puzzle.Log;
 import com.threerings.puzzle.data.Board;

src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java

@@ -1,5 +1,5 @@
 //
-// $Id: PuzzleControllerDelegate.java,v 1.5 2004/10/15 23:33:51 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -23,7 +23,7 @@ package com.threerings.puzzle.client;
 
 import com.threerings.crowd.data.PlaceObject;
 
-import com.threerings.parlor.game.GameControllerDelegate;
+import com.threerings.parlor.game.client.GameControllerDelegate;
 
 import com.threerings.puzzle.data.Board;
 import com.threerings.puzzle.data.PuzzleCodes;

src/java/com/threerings/puzzle/data/PuzzleConfig.java

@@ -21,7 +21,7 @@
 
 package com.threerings.puzzle.data;
 
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 /**
  * Encapsulates the basic configuration information for a puzzle game.

src/java/com/threerings/puzzle/data/PuzzleObject.java

@@ -21,7 +21,7 @@
 
 package com.threerings.puzzle.data;
 
-import com.threerings.parlor.game.GameObject;
+import com.threerings.parlor.game.data.GameObject;
 
 /**
  * Extends the basic {@link GameObject} to add individual player

src/java/com/threerings/puzzle/server/PuzzleManager.java

@@ -34,7 +34,7 @@ import com.threerings.presents.dobj.OidList;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.server.CrowdServer;
 
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 import com.threerings.util.MessageBundle;
 import com.threerings.util.Name;

src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java

@@ -1,5 +1,5 @@
 //
-// $Id: PuzzleManagerDelegate.java,v 1.4 2004/08/27 02:20:32 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.puzzle.server;
 
-import com.threerings.parlor.game.GameManagerDelegate;
+import com.threerings.parlor.game.server.GameManagerDelegate;
 
 /**
  * Extends the {@link GameManagerDelegate} mechanism with puzzle manager

tests/src/java/com/threerings/parlor/TestClient.java

@@ -32,7 +32,8 @@ import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.client.*;
-import com.threerings.parlor.game.*;
+import com.threerings.parlor.game.client.*;
+import com.threerings.parlor.game.data.*;
 import com.threerings.parlor.util.ParlorContext;
 
 public class TestClient extends com.threerings.crowd.client.TestClient

tests/src/java/com/threerings/parlor/TestConfig.java

@@ -22,7 +22,7 @@
 package com.threerings.parlor;
 
 import com.threerings.parlor.client.GameConfigurator;
-import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.data.GameConfig;
 
 public class TestConfig extends GameConfig
 {

tests/src/java/com/threerings/parlor/TestController.java

@@ -1,5 +1,5 @@
 //
-// $Id: TestController.java,v 1.6 2004/08/27 02:21:02 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,7 +22,7 @@
 package com.threerings.parlor;
 
 import com.threerings.crowd.client.PlaceView;
-import com.threerings.parlor.game.GameController;
+import com.threerings.parlor.game.client.GameController;
 
 public class TestController extends GameController
 {

tests/src/java/com/threerings/parlor/TestManager.java

@@ -1,5 +1,5 @@
 //
-// $Id: TestManager.java,v 1.4 2004/08/27 02:21:02 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor;
 
-import com.threerings.parlor.game.GameManager;
+import com.threerings.parlor.game.server.GameManager;
 
 public class TestManager extends GameManager
 {