From aacdc439a59cbb52d45b4ac50b6121f884f603ed Mon Sep 17 00:00:00 2001
From: Matt Jensen <matt@threerings.net>
Date: Thu, 22 Jan 2009 01:48:35 +0000
Subject: [PATCH] A couple changes to allow for a custom resource bundle.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@761 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/java/com/threerings/resource/ResourceManager.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java
index 79651859..469d9890 100644
--- a/src/java/com/threerings/resource/ResourceManager.java
+++ b/src/java/com/threerings/resource/ResourceManager.java
@@ -851,7 +851,7 @@ public class ResourceManager
     /**
      * Creates an appropriate bundle for fetching resources from the network.
      */
-    protected NetworkResourceBundle createNetworkResourceBundle(
+    protected ResourceBundle createNetworkResourceBundle(
         String root, String path, HashSet<String> rsrcList)
     {
         return new NetworkResourceBundle(root, path, rsrcList);
@@ -872,7 +872,11 @@ public class ResourceManager
         return ImageIO.read(file);
     }
 
-    protected static BufferedImage loadImage (InputStream iis, boolean useFastIO)
+    /**
+     * Loads an image from the given input stream. Supports formats supported by {@link ImageIO}
+     * as well as {@link FastImageIO} based on the useFastIO param.
+     */
+    public static BufferedImage loadImage (InputStream iis, boolean useFastIO)
         throws IOException
     {
         if (iis == null) {