diff --git a/src/java/com/threerings/miso/client/SceneRepository.java b/src/java/com/threerings/miso/client/SceneRepository.java deleted file mode 100644 index adcc09396..000000000 --- a/src/java/com/threerings/miso/client/SceneRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -// -// $Id: SceneRepository.java,v 1.2 2001/08/15 00:00:51 mdb Exp $ - -package com.threerings.miso.scene; - -import java.io.IOException; - -/** - * The SceneRepository interface manages persistent scene storage. - */ -public interface SceneRepository -{ - /** - * Loads and returns the scene object with the specified id. - * - * @param fname the full pathname to the file. - * - * @return the scene object. - */ - public Scene loadScene (String fname) throws IOException; -} diff --git a/src/java/com/threerings/miso/client/SceneRepositoryImpl.java b/src/java/com/threerings/miso/client/SceneRepositoryImpl.java deleted file mode 100644 index 51c9839bb..000000000 --- a/src/java/com/threerings/miso/client/SceneRepositoryImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -// -// $Id: SceneRepositoryImpl.java,v 1.2 2001/08/09 00:01:58 shaper Exp $ - -package com.threerings.miso.scene; - -import com.samskivert.util.Config; -import com.threerings.miso.tile.TileManager; - -public abstract class SceneRepositoryImpl implements SceneRepository -{ - /** - * Initialize the SceneRepository with the given config and tile - * manager objects. The root scene directory is read from the - * given config object, and the tile manager is used to obtain - * tiles when constructing scene objects from files. - * - * @param config the config object. - * @param tilemgr the tile manager object. - */ - public void init (Config config, TileManager tilemgr) - { - _config = config; - _tilemgr = tilemgr; - } - - /** The config object. */ - protected Config _config; - - /** The tile manager from which the scenes obtain their tiles. */ - protected TileManager _tilemgr; -} diff --git a/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java b/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java index 9bef2dcd5..cd4c203c7 100644 --- a/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java +++ b/src/java/com/threerings/miso/tools/xml/XMLSceneRepository.java @@ -1,5 +1,5 @@ // -// $Id: XMLSceneRepository.java,v 1.5 2001/08/09 00:01:58 shaper Exp $ +// $Id: XMLSceneRepository.java,v 1.6 2001/08/15 00:10:58 mdb Exp $ package com.threerings.miso.scene.xml; @@ -9,16 +9,15 @@ import java.util.ArrayList; import com.samskivert.util.Config; import com.threerings.miso.Log; import com.threerings.miso.scene.Scene; -import com.threerings.miso.scene.SceneRepositoryImpl; import com.threerings.miso.tile.TileManager; /** - * The XMLFileSceneRepository provides a mechanism for reading scenes - * from and writing scenes to XML files. These files will comprise - * the template scene files from which actual runtime game scenes will - * be constructed. + * The XMLFileSceneRepository provides a mechanism for + * reading scenes from and writing scenes to XML files. These files will + * comprise the template scene files from which actual runtime game scenes + * will be constructed. */ -public class XMLFileSceneRepository extends SceneRepositoryImpl +public class XMLFileSceneRepository { /** * Initialize the XMLFileSceneRepository with the given config and @@ -29,7 +28,9 @@ public class XMLFileSceneRepository extends SceneRepositoryImpl */ public void init (Config config, TileManager tilemgr) { - super.init(config, tilemgr); + // keep these for later + _config = config; + _tilemgr = tilemgr; // get path-related information _sep = System.getProperty("file.separator", "/"); @@ -81,11 +82,11 @@ public class XMLFileSceneRepository extends SceneRepositoryImpl _writer.saveScene(scene, path); } - /** The config key for the root scene directory. */ - protected static final String CFG_SROOT = "miso.sceneroot"; + /** The config object. */ + protected Config _config; - /** The default root scene directory path. */ - protected static final String DEF_SROOT = "rsrc/scenes"; + /** The tile manager from which the scenes obtain their tiles. */ + protected TileManager _tilemgr; /** The main program absolute root directory. */ protected String _root; @@ -101,4 +102,10 @@ public class XMLFileSceneRepository extends SceneRepositoryImpl /** The writer object for writing scenes to files. */ protected XMLSceneWriter _writer; + + /** The config key for the root scene directory. */ + protected static final String CFG_SROOT = "miso.sceneroot"; + + /** The default root scene directory path. */ + protected static final String DEF_SROOT = "rsrc/scenes"; } diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java index d05f1854d..7d0ac9119 100644 --- a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java +++ b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java @@ -1,5 +1,5 @@ // -// $Id: ViewerApp.java,v 1.4 2001/08/15 00:00:51 mdb Exp $ +// $Id: ViewerApp.java,v 1.5 2001/08/15 00:10:58 mdb Exp $ package com.threerings.miso.viewer; @@ -10,7 +10,7 @@ import com.samskivert.swing.util.SwingUtil; import com.samskivert.util.Config; import com.threerings.miso.Log; -import com.threerings.miso.scene.SceneRepository; +import com.threerings.miso.scene.xml.XMLFileSceneRepository; import com.threerings.miso.tile.TileManager; import com.threerings.miso.util.MisoUtil; import com.threerings.miso.viewer.util.ViewerContext; @@ -79,7 +79,7 @@ public class ViewerApp return _tilemgr; } - public SceneRepository getSceneRepository () + public XMLFileSceneRepository getSceneRepository () { return _screpo; } @@ -110,7 +110,7 @@ public class ViewerApp protected Config _config; /** The scene repository. */ - protected SceneRepository _screpo; + protected XMLFileSceneRepository _screpo; /** The tile manager object. */ protected TileManager _tilemgr; diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java b/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java index a705d7f11..4b447eac0 100644 --- a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java +++ b/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java @@ -1,5 +1,5 @@ // -// $Id: ViewerSceneViewPanel.java,v 1.8 2001/08/15 00:00:51 mdb Exp $ +// $Id: ViewerSceneViewPanel.java,v 1.9 2001/08/15 00:10:58 mdb Exp $ package com.threerings.miso.viewer; @@ -13,7 +13,7 @@ import com.threerings.media.sprite.*; import com.threerings.miso.Log; import com.threerings.miso.scene.*; -import com.threerings.miso.scene.SceneRepository; +import com.threerings.miso.scene.xml.XMLFileSceneRepository; import com.threerings.miso.util.*; import com.threerings.miso.viewer.util.ViewerContext; @@ -49,7 +49,7 @@ public class ViewerSceneViewPanel extends SceneViewPanel */ protected void prepareStartingScene () { - SceneRepository screpo = _ctx.getSceneRepository(); + XMLFileSceneRepository screpo = _ctx.getSceneRepository(); // get the starting scene filename Config config = _ctx.getConfig(); diff --git a/tests/src/java/com/threerings/miso/viewer/util/ViewerContext.java b/tests/src/java/com/threerings/miso/viewer/util/ViewerContext.java index 645b46990..638f82711 100644 --- a/tests/src/java/com/threerings/miso/viewer/util/ViewerContext.java +++ b/tests/src/java/com/threerings/miso/viewer/util/ViewerContext.java @@ -1,11 +1,11 @@ // -// $Id: ViewerContext.java,v 1.2 2001/08/15 00:00:52 mdb Exp $ +// $Id: ViewerContext.java,v 1.3 2001/08/15 00:10:59 mdb Exp $ package com.threerings.miso.viewer.util; import com.samskivert.util.Context; -import com.threerings.miso.scene.SceneRepository; +import com.threerings.miso.scene.xml.XMLFileSceneRepository; import com.threerings.miso.util.MisoContext; /** @@ -17,5 +17,5 @@ public interface ViewerContext extends MisoContext, Context /** * Returns the scene repository that we can use to get scenes. */ - public SceneRepository getSceneRepository (); + public XMLFileSceneRepository getSceneRepository (); }