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

src/java/com/threerings/media/tile/IMImageProvider.java

@@ -24,7 +24,7 @@ package com.threerings.media.tile;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 
-import com.threerings.media.image.BaseImageManager;
+import com.threerings.media.image.ImageManager;
 import com.threerings.media.image.Colorization;
 import com.threerings.media.image.ImageDataProvider;
 import com.threerings.media.image.Mirage;
@@ -35,13 +35,13 @@ import com.threerings.media.image.Mirage;
  */
 public class IMImageProvider implements ImageProvider
 {
-    public IMImageProvider (BaseImageManager imgr, ImageDataProvider dprov)
+    public IMImageProvider (ImageManager imgr, ImageDataProvider dprov)
     {
         _imgr = imgr;
         _dprov = dprov;
     }
 
-    public IMImageProvider (BaseImageManager imgr, String rset)
+    public IMImageProvider (ImageManager imgr, String rset)
     {
         _imgr = imgr;
         _rset = rset;
@@ -59,12 +59,12 @@ public class IMImageProvider implements ImageProvider
         return _imgr.getMirage(getImageKey(path), bounds, zations);
     }
 
-    protected final BaseImageManager.ImageKey getImageKey (String path)
+    protected final ImageManager.ImageKey getImageKey (String path)
     {
         return (_dprov == null) ? _imgr.getImageKey(_rset, path) : _imgr.getImageKey(_dprov, path);
     }
 
-    protected BaseImageManager _imgr;
+    protected ImageManager _imgr;
     protected ImageDataProvider _dprov;
     protected String _rset;
 }

src/java/com/threerings/media/tile/ImageProvider.java

@@ -25,12 +25,12 @@ import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 
 import com.threerings.media.image.Colorization;
-import com.threerings.media.image.ImageManager;
+import com.threerings.media.image.ClientImageManager;
 import com.threerings.media.image.Mirage;
 
 /**
  * Provides a generic interface via which tileset images may be loaded. In most cases, a running
- * application will want to obtain images via the {@link ImageManager}, but in some circumstances a
+ * application will want to obtain images via the {@link ClientImageManager}, but in some circumstances a
  * simpler image provider may be desirable to avoid the overhead of the image manager
  * infrastructure when simple image loading is all that is desired.
  */

src/java/com/threerings/media/tile/TileManager.java

@@ -28,7 +28,7 @@ import java.util.HashMap;
 import com.samskivert.io.PersistenceException;
 
 import com.threerings.media.Log;
-import com.threerings.media.image.BaseImageManager;
+import com.threerings.media.image.ImageManager;
 
 /**
  * The tile manager provides a simplified interface for retrieving and
@@ -55,7 +55,7 @@ public class TileManager
      * @param imgr the image manager via which the tile manager will
      * decode and cache images.
      */
-    public TileManager (BaseImageManager imgr)
+    public TileManager (ImageManager imgr)
     {
         _imgr = imgr;
         _defaultProvider = new IMImageProvider(_imgr, (String)null);
@@ -242,7 +242,7 @@ public class TileManager
     }
 
     /** The entity through which we decode and cache images. */
-    protected BaseImageManager _imgr;
+    protected ImageManager _imgr;
 
     /** A cache of tilesets that have been loaded by hand. */
     protected HashMap _handcache = new HashMap();

src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java

@@ -30,7 +30,7 @@ import com.threerings.resource.ResourceBundle;
 import com.threerings.resource.ResourceManager;
 
 import com.threerings.media.Log;
-import com.threerings.media.image.BaseImageManager;
+import com.threerings.media.image.ImageManager;
 import com.threerings.media.tile.IMImageProvider;
 import com.threerings.media.tile.NoSuchTileSetException;
 import com.threerings.media.tile.TileSet;
@@ -57,7 +57,7 @@ public class BundledTileSetRepository
      * loading our tile data.
      */
     public BundledTileSetRepository (final ResourceManager rmgr,
-                                     final BaseImageManager imgr,
+                                     final ImageManager imgr,
                                      final String name)
     {
         _imgr = imgr;
@@ -222,7 +222,7 @@ public class BundledTileSetRepository
     }
 
     /** The image manager via which we load our images. */
-    protected BaseImageManager _imgr;
+    protected ImageManager _imgr;
 
     /** A mapping from tileset id to tileset. */
     protected HashIntMap _idmap;