From 79066da9a688b7eba468d3a517660f086aa1e410 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 8 Nov 2001 02:59:17 +0000 Subject: [PATCH] Package jockeying related to moving everything into the test directory. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@605 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/whirled/data/DummyScene.java | 7 +++---- src/java/com/threerings/whirled/server/WhirledServer.java | 4 ++-- .../whirled/server/persist/DummySceneRepository.java | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/java/com/threerings/whirled/data/DummyScene.java b/src/java/com/threerings/whirled/data/DummyScene.java index abdba2f46..23f272726 100644 --- a/src/java/com/threerings/whirled/data/DummyScene.java +++ b/src/java/com/threerings/whirled/data/DummyScene.java @@ -1,10 +1,9 @@ // -// $Id: DummyScene.java,v 1.6 2001/11/08 02:07:36 mdb Exp $ +// $Id: DummyScene.java,v 1.7 2001/11/08 02:59:17 mdb Exp $ -package com.threerings.whirled; +package com.threerings.whirled.data; import com.threerings.crowd.data.PlaceConfig; -import com.threerings.whirled.data.Scene; public class DummyScene implements Scene { @@ -35,7 +34,7 @@ public class DummyScene implements Scene public PlaceConfig getPlaceConfig () { - return new TestConfig(); + return null; } protected int _sceneId; diff --git a/src/java/com/threerings/whirled/server/WhirledServer.java b/src/java/com/threerings/whirled/server/WhirledServer.java index e5dc0ae6e..c9f9ffab5 100644 --- a/src/java/com/threerings/whirled/server/WhirledServer.java +++ b/src/java/com/threerings/whirled/server/WhirledServer.java @@ -1,5 +1,5 @@ // -// $Id: WhirledServer.java,v 1.7 2001/10/11 04:07:54 mdb Exp $ +// $Id: WhirledServer.java,v 1.8 2001/11/08 02:59:17 mdb Exp $ package com.threerings.whirled.server; @@ -11,7 +11,7 @@ import com.threerings.crowd.server.CrowdServer; import com.threerings.whirled.Log; import com.threerings.whirled.server.persist.SceneRepository; -import com.threerings.whirled.test.DummySceneRepository; +import com.threerings.whirled.server.persist.DummySceneRepository; /** * The whirled server extends the crowd server and provides access to diff --git a/src/java/com/threerings/whirled/server/persist/DummySceneRepository.java b/src/java/com/threerings/whirled/server/persist/DummySceneRepository.java index 129ad52df..b8cd21195 100644 --- a/src/java/com/threerings/whirled/server/persist/DummySceneRepository.java +++ b/src/java/com/threerings/whirled/server/persist/DummySceneRepository.java @@ -1,13 +1,13 @@ // -// $Id: DummySceneRepository.java,v 1.5 2001/11/08 02:07:36 mdb Exp $ +// $Id: DummySceneRepository.java,v 1.6 2001/11/08 02:59:17 mdb Exp $ -package com.threerings.whirled; +package com.threerings.whirled.server.persist; import com.samskivert.io.PersistenceException; import com.threerings.whirled.Log; +import com.threerings.whirled.data.DummyScene; import com.threerings.whirled.data.Scene; -import com.threerings.whirled.server.persist.SceneRepository; import com.threerings.whirled.util.NoSuchSceneException; /**