From 7ddd442d689173189ccc7460cd2b744c4d76160b Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Wed, 28 May 2008 01:56:07 +0000
Subject: [PATCH] Break createResourceBundle out of resolveResourceSet such
 that subclasses might make their own types of resource bundles

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@513 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 .../threerings/resource/ResourceManager.java  | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java
index a8e5bc7a..b4742204 100644
--- a/src/java/com/threerings/resource/ResourceManager.java
+++ b/src/java/com/threerings/resource/ResourceManager.java
@@ -24,9 +24,6 @@ package com.threerings.resource;
 import java.awt.EventQueue;
 import java.awt.image.BufferedImage;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -37,7 +34,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -47,7 +43,6 @@ import java.util.regex.Pattern;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.MemoryCacheImageInputStream;
@@ -665,7 +660,7 @@ public class ResourceManager
      */
     public ResourceBundle[] getResourceSet (String name)
     {
-        return (ResourceBundle[])_sets.get(name);
+        return _sets.get(name);
     }
 
     /**
@@ -705,20 +700,7 @@ public class ResourceManager
         List<ResourceBundle> set = new ArrayList<ResourceBundle>();
         StringTokenizer tok = new StringTokenizer(definition, ":");
         while (tok.hasMoreTokens()) {
-            String path = tok.nextToken().trim();
-            if (setType.equals(FILE_SET_TYPE)) {
-                FileResourceBundle bundle =
-                    new FileResourceBundle(getResourceFile(path), true, _unpack);
-                set.add(bundle);
-                if (bundle.isUnpacked() && bundle.sourceIsReady()) {
-                    continue;
-                }
-                dlist.add(bundle);
-            } else if (setType.equals(NETWORK_SET_TYPE)) {
-                NetworkResourceBundle bundle =
-                    new NetworkResourceBundle(_networkRootPath, path, getResourceList());
-                set.add(bundle);
-            }
+            set.add(createResourceBundle(setType, tok.nextToken().trim(), dlist));
         }
 
         // convert our array list into an array and stick it in the table
@@ -731,6 +713,26 @@ public class ResourceManager
         }
     }
 
+    /** 
+     * Creates a ResourceBundle based on the supplied definition information.
+     */
+    protected ResourceBundle createResourceBundle (String setType, String path,
+        List<ResourceBundle> dlist)
+    {
+        if (setType.equals(FILE_SET_TYPE)) {
+            FileResourceBundle bundle = new FileResourceBundle(getResourceFile(path), true,
+                _unpack);
+            if (!bundle.isUnpacked() || !bundle.sourceIsReady()) {
+                dlist.add(bundle);
+            }
+            return bundle;
+        } else if (setType.equals(NETWORK_SET_TYPE)) {
+            return new NetworkResourceBundle(_networkRootPath, path, getResourceList());
+        } else {
+            throw new IllegalArgumentException("Unknown set type: " + setType);
+        }
+    }
+
     /**
      * Loads an image from the supplied file. Supports {@link FastImageIO} files and formats
      * supported by {@link ImageIO} and will load the appropriate one based on the useFastIO param.
@@ -874,7 +876,7 @@ public class ResourceManager
     protected ResourceBundle[] _default = new ResourceBundle[0];
 
     /** A table of our resource sets. */
-    protected HashMap _sets = new HashMap();
+    protected HashMap<String, ResourceBundle[]> _sets = new HashMap<String, ResourceBundle[]>();
 
     /** Locale to search for locale-specific resources, if any. */
     protected String _localePrefix = null;