Split the runtime-adjustment functionality of ImageManager out. In order to preserve backwards compatibility, the complete functionality including runtime-adjustment can be found in ImageManager which now extends BaseImageManager. The bulk of functionality is now in BaseImageManager and anyone who wants an image manager without the RuntimeAdjustment bits (it uses ClientPrefs and thus isn't friendly in server-land) should use that directly.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@433 ed5b42cb-e716-0410-a449-f6a68f950b19

src/java/com/threerings/cast/bundle/BundledComponentRepository.java

@@ -40,10 +40,10 @@ import com.threerings.resource.FileResourceBundle;
 import com.threerings.resource.ResourceBundle;
 import com.threerings.resource.ResourceManager;
 
+import com.threerings.media.image.BaseImageManager;
 import com.threerings.media.image.BufferedMirage;
 import com.threerings.media.image.Colorization;
 import com.threerings.media.image.ImageDataProvider;
-import com.threerings.media.image.ImageManager;
 import com.threerings.media.image.ImageUtil;
 import com.threerings.media.image.Mirage;
 
@@ -85,7 +85,7 @@ public class BundledComponentRepository
      * resource bundles.
      */
     public BundledComponentRepository (
-        ResourceManager rmgr, ImageManager imgr, String name)
+        ResourceManager rmgr, BaseImageManager imgr, String name)
         throws IOException
     {
         // keep this guy around
@@ -261,7 +261,7 @@ public class BundledComponentRepository
         /**
          * Constructs an instance that will obtain image data from the specified resource bundle.
          */
-        public ResourceBundleProvider (ImageManager imgr, ResourceBundle bundle)
+        public ResourceBundleProvider (BaseImageManager imgr, ResourceBundle bundle)
         {
             super(imgr, (String)null);
             _dprov = this;
@@ -486,7 +486,7 @@ public class BundledComponentRepository
             return _set.getTile(getTileIndex(orient, index));
         }
 
-        public Mirage getTileMirage(int orient, int index) {
+        public Mirage getTileMirage (int orient, int index) {
             return _set.getTileMirage(getTileIndex(orient, index));
         }
 
@@ -508,7 +508,7 @@ public class BundledComponentRepository
     }
 
     /** We use the image manager to decode and cache images. */
-    protected ImageManager _imgr;
+    protected BaseImageManager _imgr;
 
     /** A table of action sequences. */
     protected HashMap _actions;