From 6634eb3fc977e5669baaf0b2b7836761c9c317a3 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 11 Oct 2001 21:08:22 +0000
Subject: [PATCH] Moved Parlor game stuff into parlor.game package instead of
 spreading it across parlor.client, parlor.server and parlor.data.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@437 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/micasa/lobby/LobbyConfig.java      | 4 ++--
 src/java/com/threerings/micasa/lobby/LobbyController.java  | 4 ++--
 .../com/threerings/parlor/client/InvitationHandler.java    | 4 ++--
 .../parlor/client/InvitationResponseObserver.java          | 4 ++--
 src/java/com/threerings/parlor/client/ParlorDirector.java  | 4 ++--
 src/java/com/threerings/parlor/client/ParlorService.java   | 4 ++--
 src/java/com/threerings/parlor/game/GameCodes.java         | 4 ++--
 src/java/com/threerings/parlor/game/GameConfig.java        | 4 ++--
 src/java/com/threerings/parlor/game/GameController.java    | 6 ++----
 src/java/com/threerings/parlor/game/GameManager.java       | 7 ++-----
 src/java/com/threerings/parlor/game/GameObject.dobj        | 4 ++--
 src/java/com/threerings/parlor/server/ParlorManager.java   | 5 +++--
 src/java/com/threerings/parlor/server/ParlorProvider.java  | 4 ++--
 tests/src/java/com/threerings/parlor/TestClient.java       | 4 ++--
 tests/src/java/com/threerings/parlor/TestConfig.java       | 4 ++--
 tests/src/java/com/threerings/parlor/TestController.java   | 4 ++--
 16 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/java/com/threerings/micasa/lobby/LobbyConfig.java b/src/java/com/threerings/micasa/lobby/LobbyConfig.java
index f992aa46b..378f322e0 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyConfig.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyConfig.java
@@ -1,5 +1,5 @@
 //
-// $Id: LobbyConfig.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
+// $Id: LobbyConfig.java,v 1.4 2001/10/11 21:08:21 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
@@ -12,7 +12,7 @@ import com.samskivert.util.StringUtil;
 
 import com.threerings.crowd.data.PlaceConfig;
 
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 public class LobbyConfig extends PlaceConfig
 {
diff --git a/src/java/com/threerings/micasa/lobby/LobbyController.java b/src/java/com/threerings/micasa/lobby/LobbyController.java
index 886637a82..1c25a947d 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyController.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyController.java
@@ -1,5 +1,5 @@
 //
-// $Id: LobbyController.java,v 1.5 2001/10/11 04:13:33 mdb Exp $
+// $Id: LobbyController.java,v 1.6 2001/10/11 21:08:21 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
@@ -10,7 +10,7 @@ import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.client.*;
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 import com.threerings.micasa.Log;
 import com.threerings.micasa.util.MiCasaContext;
diff --git a/src/java/com/threerings/parlor/client/InvitationHandler.java b/src/java/com/threerings/parlor/client/InvitationHandler.java
index e9920bb97..14e3fcaa6 100644
--- a/src/java/com/threerings/parlor/client/InvitationHandler.java
+++ b/src/java/com/threerings/parlor/client/InvitationHandler.java
@@ -1,9 +1,9 @@
 //
-// $Id: InvitationHandler.java,v 1.1 2001/10/01 05:07:13 mdb Exp $
+// $Id: InvitationHandler.java,v 1.2 2001/10/11 21:08:21 mdb Exp $
 
 package com.threerings.parlor.client;
 
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 /**
  * A client entity that wishes to handle invitations received by other
diff --git a/src/java/com/threerings/parlor/client/InvitationResponseObserver.java b/src/java/com/threerings/parlor/client/InvitationResponseObserver.java
index fcc7348c2..8f8df9d65 100644
--- a/src/java/com/threerings/parlor/client/InvitationResponseObserver.java
+++ b/src/java/com/threerings/parlor/client/InvitationResponseObserver.java
@@ -1,9 +1,9 @@
 //
-// $Id: InvitationResponseObserver.java,v 1.4 2001/10/01 06:19:15 mdb Exp $
+// $Id: InvitationResponseObserver.java,v 1.5 2001/10/11 21:08:21 mdb Exp $
 
 package com.threerings.parlor.client;
 
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 /**
  * A client entity that wishes to generate invitations for games must
diff --git a/src/java/com/threerings/parlor/client/ParlorDirector.java b/src/java/com/threerings/parlor/client/ParlorDirector.java
index a89689a7c..39ef2f882 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.10 2001/10/11 04:07:51 mdb Exp $
+// $Id: ParlorDirector.java,v 1.11 2001/10/11 21:08:21 mdb Exp $
 
 package com.threerings.parlor.client;
 
@@ -10,7 +10,7 @@ import com.samskivert.util.HashIntMap;
 import com.threerings.presents.client.InvocationReceiver;
 
 import com.threerings.parlor.Log;
-import com.threerings.parlor.data.GameConfig;
+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 a458e602f..a63ab5f75 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.6 2001/10/11 04:07:51 mdb Exp $
+// $Id: ParlorService.java,v 1.7 2001/10/11 21:08:21 mdb Exp $
 
 package com.threerings.parlor.client;
 
@@ -7,7 +7,7 @@ import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationDirector;
 
 import com.threerings.parlor.Log;
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 /**
  * This class provides an interface to the various parlor services that
diff --git a/src/java/com/threerings/parlor/game/GameCodes.java b/src/java/com/threerings/parlor/game/GameCodes.java
index d455ca25b..869f723b9 100644
--- a/src/java/com/threerings/parlor/game/GameCodes.java
+++ b/src/java/com/threerings/parlor/game/GameCodes.java
@@ -1,7 +1,7 @@
 //
-// $Id: GameCodes.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
+// $Id: GameCodes.java,v 1.3 2001/10/11 21:08:21 mdb Exp $
 
-package com.threerings.parlor.client;
+package com.threerings.parlor.game;
 
 import com.threerings.presents.client.InvocationCodes;
 
diff --git a/src/java/com/threerings/parlor/game/GameConfig.java b/src/java/com/threerings/parlor/game/GameConfig.java
index f3bc85b07..56c89aeac 100644
--- a/src/java/com/threerings/parlor/game/GameConfig.java
+++ b/src/java/com/threerings/parlor/game/GameConfig.java
@@ -1,7 +1,7 @@
 //
-// $Id: GameConfig.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
+// $Id: GameConfig.java,v 1.7 2001/10/11 21:08:21 mdb Exp $
 
-package com.threerings.parlor.data;
+package com.threerings.parlor.game;
 
 import java.io.IOException;
 import java.io.DataInputStream;
diff --git a/src/java/com/threerings/parlor/game/GameController.java b/src/java/com/threerings/parlor/game/GameController.java
index 9e6935733..d3fb4e0bc 100644
--- a/src/java/com/threerings/parlor/game/GameController.java
+++ b/src/java/com/threerings/parlor/game/GameController.java
@@ -1,7 +1,7 @@
 //
-// $Id: GameController.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
+// $Id: GameController.java,v 1.7 2001/10/11 21:08:21 mdb Exp $
 
-package com.threerings.parlor.client;
+package com.threerings.parlor.game;
 
 import java.awt.event.ActionEvent;
 
@@ -14,8 +14,6 @@ import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.Log;
-import com.threerings.parlor.data.GameConfig;
-import com.threerings.parlor.data.GameObject;
 import com.threerings.parlor.util.ParlorContext;
 
 /**
diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/GameManager.java
index 73ec643de..488b81523 100644
--- a/src/java/com/threerings/parlor/game/GameManager.java
+++ b/src/java/com/threerings/parlor/game/GameManager.java
@@ -1,7 +1,7 @@
 //
-// $Id: GameManager.java,v 1.7 2001/10/11 04:07:51 mdb Exp $
+// $Id: GameManager.java,v 1.8 2001/10/11 21:08:21 mdb Exp $
 
-package com.threerings.parlor.server;
+package com.threerings.parlor.game;
 
 import com.threerings.presents.dobj.MessageEvent;
 
@@ -12,10 +12,7 @@ import com.threerings.crowd.server.CrowdServer;
 import com.threerings.crowd.server.CrowdServer;
 
 import com.threerings.parlor.Log;
-import com.threerings.parlor.client.GameCodes;
 import com.threerings.parlor.client.ParlorCodes;
-import com.threerings.parlor.data.GameConfig;
-import com.threerings.parlor.data.GameObject;
 
 /**
  * The game manager handles the server side management of a game. It
diff --git a/src/java/com/threerings/parlor/game/GameObject.dobj b/src/java/com/threerings/parlor/game/GameObject.dobj
index 0af1cc9bf..f4495c5c9 100644
--- a/src/java/com/threerings/parlor/game/GameObject.dobj
+++ b/src/java/com/threerings/parlor/game/GameObject.dobj
@@ -1,7 +1,7 @@
 //
-// $Id: GameObject.dobj,v 1.3 2001/10/11 04:07:51 mdb Exp $
+// $Id: GameObject.dobj,v 1.4 2001/10/11 21:08:21 mdb Exp $
 
-package com.threerings.parlor.data;
+package com.threerings.parlor.game;
 
 import com.threerings.crowd.data.PlaceObject;
 
diff --git a/src/java/com/threerings/parlor/server/ParlorManager.java b/src/java/com/threerings/parlor/server/ParlorManager.java
index 9e88fd111..54ebcb43b 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.8 2001/10/11 04:07:51 mdb Exp $
+// $Id: ParlorManager.java,v 1.9 2001/10/11 21:08:22 mdb Exp $
 
 package com.threerings.parlor.server;
 
@@ -14,7 +14,8 @@ import com.threerings.crowd.server.CrowdServer;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.client.ParlorCodes;
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
+import com.threerings.parlor.game.GameManager;
 
 /**
  * The parlor manager is responsible for the parlor services in
diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java
index 813fa8839..add941678 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.6 2001/10/11 04:07:51 mdb Exp $
+// $Id: ParlorProvider.java,v 1.7 2001/10/11 21:08:22 mdb Exp $
 
 package com.threerings.parlor.server;
 
@@ -10,7 +10,7 @@ import com.threerings.crowd.server.CrowdServer;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.client.ParlorCodes;
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 /**
  * The parlor provider handles the server side of the various Parlor
diff --git a/tests/src/java/com/threerings/parlor/TestClient.java b/tests/src/java/com/threerings/parlor/TestClient.java
index a4d69b4e3..0c606a9be 100644
--- a/tests/src/java/com/threerings/parlor/TestClient.java
+++ b/tests/src/java/com/threerings/parlor/TestClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: TestClient.java,v 1.3 2001/10/11 04:07:51 mdb Exp $
+// $Id: TestClient.java,v 1.4 2001/10/11 21:08:22 mdb Exp $
 
 package com.threerings.parlor.test;
 
@@ -15,7 +15,7 @@ import com.threerings.crowd.client.*;
 
 import com.threerings.parlor.Log;
 import com.threerings.parlor.client.*;
-import com.threerings.parlor.data.*;
+import com.threerings.parlor.game.*;
 import com.threerings.parlor.util.ParlorContext;
 
 public class TestClient
diff --git a/tests/src/java/com/threerings/parlor/TestConfig.java b/tests/src/java/com/threerings/parlor/TestConfig.java
index e32e3fb0a..a2a24fd95 100644
--- a/tests/src/java/com/threerings/parlor/TestConfig.java
+++ b/tests/src/java/com/threerings/parlor/TestConfig.java
@@ -1,5 +1,5 @@
 //
-// $Id: TestConfig.java,v 1.1 2001/10/03 03:45:44 mdb Exp $
+// $Id: TestConfig.java,v 1.2 2001/10/11 21:08:22 mdb Exp $
 
 package com.threerings.parlor.test;
 
@@ -7,7 +7,7 @@ import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.threerings.parlor.data.GameConfig;
+import com.threerings.parlor.game.GameConfig;
 
 public class TestConfig extends GameConfig
 {
diff --git a/tests/src/java/com/threerings/parlor/TestController.java b/tests/src/java/com/threerings/parlor/TestController.java
index c103221a4..9490aa74b 100644
--- a/tests/src/java/com/threerings/parlor/TestController.java
+++ b/tests/src/java/com/threerings/parlor/TestController.java
@@ -1,10 +1,10 @@
 //
-// $Id: TestController.java,v 1.3 2001/10/11 04:07:51 mdb Exp $
+// $Id: TestController.java,v 1.4 2001/10/11 21:08:22 mdb Exp $
 
 package com.threerings.parlor.test;
 
 import com.threerings.crowd.client.PlaceView;
-import com.threerings.parlor.client.GameController;
+import com.threerings.parlor.game.GameController;
 
 public class TestController extends GameController
 {