Apparently only yohoho ever uses the runtimeadjust stuff, so we don't care about backwards compatibility and this naming scheme is better. We now have ClientImageManager and ImageManager.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@434 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -34,7 +34,7 @@ import javax.swing.JPanel;
|
||||
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
import com.threerings.util.DirectionCodes;
|
||||
import com.threerings.util.DirectionUtil;
|
||||
@@ -123,7 +123,7 @@ public class CharSpriteViz extends JPanel
|
||||
ResourceManager rmgr = new ResourceManager("rsrc");
|
||||
rmgr.initBundles(
|
||||
null, "config/resource/manager.properties", null);
|
||||
ImageManager imgr = new ImageManager(rmgr, frame);
|
||||
ClientImageManager imgr = new ClientImageManager(rmgr, frame);
|
||||
ComponentRepository crepo =
|
||||
new BundledComponentRepository(rmgr, imgr, "components");
|
||||
CharacterManager charmgr = new CharacterManager(imgr, crepo);
|
||||
|
||||
@@ -26,7 +26,7 @@ import javax.swing.JFrame;
|
||||
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.cast.CharacterManager;
|
||||
@@ -45,7 +45,7 @@ public class TestApp
|
||||
ResourceManager rmgr = new ResourceManager("rsrc");
|
||||
rmgr.initBundles(
|
||||
null, "config/resource/manager.properties", null);
|
||||
ImageManager imgr = new ImageManager(rmgr, _frame);
|
||||
ClientImageManager imgr = new ClientImageManager(rmgr, _frame);
|
||||
|
||||
ComponentRepository crepo =
|
||||
new BundledComponentRepository(rmgr, imgr, "components");
|
||||
|
||||
@@ -25,7 +25,7 @@ import java.awt.Component;
|
||||
import java.util.Iterator;
|
||||
|
||||
import com.threerings.cast.ComponentClass;
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import junit.framework.Test;
|
||||
@@ -44,7 +44,7 @@ public class BundledComponentRepositoryTest extends TestCase
|
||||
ResourceManager rmgr = new ResourceManager("rsrc");
|
||||
rmgr.initBundles(
|
||||
null, "config/resource/manager.properties", null);
|
||||
ImageManager imgr = new ImageManager(rmgr, (Component)null);
|
||||
ClientImageManager imgr = new ClientImageManager(rmgr, (Component)null);
|
||||
BundledComponentRepository repo =
|
||||
new BundledComponentRepository(rmgr, imgr, "components");
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import javax.swing.*;
|
||||
import com.samskivert.swing.HGroupLayout;
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.tile.TileManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
@@ -43,7 +43,7 @@ public class TestIconManager
|
||||
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
|
||||
ResourceManager rmgr = new ResourceManager("rsrc");
|
||||
ImageManager imgr = new ImageManager(rmgr, frame);
|
||||
ClientImageManager imgr = new ClientImageManager(rmgr, frame);
|
||||
TileManager tmgr = new TileManager(imgr);
|
||||
IconManager iconmgr = new IconManager(
|
||||
tmgr, "rsrc/config/media/iconmgr.properties");
|
||||
|
||||
@@ -24,7 +24,7 @@ package com.threerings.media.tile.bundle;
|
||||
import java.awt.Component;
|
||||
import java.util.Iterator;
|
||||
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import junit.framework.Test;
|
||||
@@ -44,7 +44,7 @@ public class BundledTileSetRepositoryTest extends TestCase
|
||||
rmgr.initBundles(
|
||||
null, "config/resource/manager.properties", null);
|
||||
BundledTileSetRepository repo = new BundledTileSetRepository(
|
||||
rmgr, new ImageManager(rmgr, (Component)null), "tilesets");
|
||||
rmgr, new ClientImageManager(rmgr, (Component)null), "tilesets");
|
||||
Iterator sets = repo.enumerateTileSets();
|
||||
while (sets.hasNext()) {
|
||||
sets.next();
|
||||
|
||||
@@ -39,7 +39,7 @@ import com.samskivert.swing.VGroupLayout;
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.media.Log;
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.image.ImageUtil;
|
||||
|
||||
/**
|
||||
@@ -53,7 +53,7 @@ public class TraceViz
|
||||
// create the frame and image manager
|
||||
_frame = new JFrame();
|
||||
_frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
ImageManager imgr = new ImageManager(null, _frame);
|
||||
ClientImageManager imgr = new ClientImageManager(null, _frame);
|
||||
|
||||
// set up the content panel
|
||||
JPanel content = (JPanel)_frame.getContentPane();
|
||||
|
||||
@@ -34,7 +34,7 @@ import com.samskivert.util.Config;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.FrameManager;
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.util.LinePath;
|
||||
import com.threerings.media.util.Path;
|
||||
|
||||
@@ -94,7 +94,7 @@ public class ScrollingTestApp
|
||||
ResourceManager rmgr = new ResourceManager("rsrc");
|
||||
rmgr.initBundles(
|
||||
null, "config/resource/manager.properties", null);
|
||||
ImageManager imgr = new ImageManager(rmgr, _frame);
|
||||
ClientImageManager imgr = new ClientImageManager(rmgr, _frame);
|
||||
_tilemgr = new MisoTileManager(rmgr, imgr);
|
||||
_tilemgr.setTileSetRepository(
|
||||
new BundledTileSetRepository(rmgr, imgr, "tilesets"));
|
||||
|
||||
@@ -32,7 +32,7 @@ import com.samskivert.swing.util.SwingUtil;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.FrameManager;
|
||||
import com.threerings.media.image.ImageManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.tile.bundle.BundledTileSetRepository;
|
||||
|
||||
import com.threerings.cast.CharacterManager;
|
||||
@@ -87,7 +87,7 @@ public class ViewerApp
|
||||
ResourceManager rmgr = new ResourceManager("rsrc");
|
||||
rmgr.initBundles(
|
||||
null, "config/resource/manager.properties", null);
|
||||
ImageManager imgr = new ImageManager(rmgr, _frame);
|
||||
ClientImageManager imgr = new ClientImageManager(rmgr, _frame);
|
||||
_tilemgr = new MisoTileManager(rmgr, imgr);
|
||||
_tilemgr.setTileSetRepository(
|
||||
new BundledTileSetRepository(rmgr, imgr, "tilesets"));
|
||||
|
||||
Reference in New Issue
Block a user