AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resource manager needs be constructed differently now that it loads

Browse Source 
resources via a URL.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@865 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-01-16 03:01:24 +00:00
parent 3562e9271b
commit 18e5f823ba
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/rsrc/config/resource/manager.properties
+6 -6
View File
@@ -1,15 +1,15 @@
# #
# $Id: manager.properties,v 1.4 2001/11/29 23:14:36 mdb Exp $ # $Id: manager.properties,v 1.5 2002/01/16 03:01:24 mdb Exp $
# #
# Test resource manager configuration # Test resource manager configuration
# configure the BundledTileSetRepository # configure the BundledTileSetRepository
resource.set.tilesets = rsrc/bundles/tiles/ground/bundle.jar:\ resource.set.tilesets = bundles/tiles/ground/bundle.jar:\
rsrc/bundles/tiles/objects/bundle.jar bundles/tiles/objects/bundle.jar
# configure the BundledComponentRepository # configure the BundledComponentRepository
resource.set.components = rsrc/bundles/components/pirate/metadata.jar:\ resource.set.components = bundles/components/pirate/metadata.jar:\
rsrc/bundles/components/pirate/components.jar bundles/components/pirate/components.jar
# used to test the BundledTileSetRepository # used to test the BundledTileSetRepository
resource.set.bundle_test = rsrc/media/tools/tile/bundle/bundle.jar resource.set.bundle_test = media/tools/tile/bundle/bundle.jar
tests/src/java/com/threerings/cast/builder/TestApp.java
+3 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: TestApp.java,v 1.10 2001/12/07 01:33:29 mdb Exp $ // $Id: TestApp.java,v 1.11 2002/01/16 03:01:24 mdb Exp $
package com.threerings.cast.builder; package com.threerings.cast.builder;
@@ -33,7 +33,8 @@ public class TestApp
_config = new Config(); _config = new Config();
MisoUtil.bindProperties(_config); MisoUtil.bindProperties(_config);
ResourceManager rmgr = new ResourceManager(null, "rsrc"); ResourceManager rmgr = new ResourceManager(
"rsrc", null, "config/resource/manager.properties");
ImageManager imgr = new ImageManager(rmgr, _frame); ImageManager imgr = new ImageManager(rmgr, _frame);
ComponentRepository crepo = ComponentRepository crepo =
tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
+3 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: BundledComponentRepositoryTest.java,v 1.4 2001/12/07 01:33:29 mdb Exp $ // $Id: BundledComponentRepositoryTest.java,v 1.5 2002/01/16 03:01:24 mdb Exp $
package com.threerings.cast.bundle; package com.threerings.cast.bundle;
@@ -22,7 +22,8 @@ public class BundledComponentRepositoryTest extends TestCase
public void runTest () public void runTest ()
{ {
try { try {
ResourceManager rmgr = new ResourceManager(null, "rsrc"); ResourceManager rmgr = new ResourceManager(
"rsrc", null, "config/resource/manager.properties");
ImageManager imgr = new ImageManager(rmgr, null); ImageManager imgr = new ImageManager(rmgr, null);
BundledComponentRepository repo = BundledComponentRepository repo =
new BundledComponentRepository(rmgr, imgr, "components"); new BundledComponentRepository(rmgr, imgr, "components");
tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
+3 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: BundledTileSetRepositoryTest.java,v 1.4 2001/12/07 01:33:29 mdb Exp $ // $Id: BundledTileSetRepositoryTest.java,v 1.5 2002/01/16 03:01:24 mdb Exp $
package com.threerings.media.tile.bundle; package com.threerings.media.tile.bundle;
@@ -20,7 +20,8 @@ public class BundledTileSetRepositoryTest extends TestCase
public void runTest () public void runTest ()
{ {
try { try {
ResourceManager rmgr = new ResourceManager(null, "rsrc"); ResourceManager rmgr = new ResourceManager(
"rsrc", null, "config/resource/manager.properties");
ImageManager imgr = new ImageManager(rmgr, null); ImageManager imgr = new ImageManager(rmgr, null);
BundledTileSetRepository repo = BundledTileSetRepository repo =
new BundledTileSetRepository(rmgr, imgr, "tilesets"); new BundledTileSetRepository(rmgr, imgr, "tilesets");
tests/src/java/com/threerings/miso/viewer/ViewerApp.java
+3 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: ViewerApp.java,v 1.23 2002/01/08 22:16:59 shaper Exp $ // $Id: ViewerApp.java,v 1.24 2002/01/16 03:01:24 mdb Exp $
package com.threerings.miso.viewer; package com.threerings.miso.viewer;
@@ -70,7 +70,8 @@ public class ViewerApp
// we don't need to configure anything // we don't need to configure anything
_config = new Config(); _config = new Config();
ResourceManager rmgr = new ResourceManager(null, "rsrc"); ResourceManager rmgr = new ResourceManager(
"rsrc", null, "config/resource/manager.properties");
ImageManager imgr = new ImageManager(rmgr, _frame); ImageManager imgr = new ImageManager(rmgr, _frame);
_tilemgr = new TileManager(imgr); _tilemgr = new TileManager(imgr);
_tilemgr.setTileSetRepository( _tilemgr.setTileSetRepository(