Added support for adding a new bundle on the fly.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2666 542714f4-19e9-0310-aa3c-eee0fc999fb1

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

@@ -1,5 +1,5 @@
 //
-// $Id: BundledTileSetRepository.java,v 1.12 2003/06/18 05:48:45 mdb Exp $
+// $Id: BundledTileSetRepository.java,v 1.13 2003/06/19 01:12:32 ray Exp $
 
 package com.threerings.media.tile.bundle;
 
@@ -79,22 +79,8 @@ public class BundledTileSetRepository
 
         // iterate over the resource bundles in the set, loading up the
         // tileset bundles in each resource bundle
-        ArrayList tbundles = new ArrayList();
         for (int i = 0; i < rbundles.length; i++) {
-            try {
+            addBundle(idmap, namemap, rbundles[i]);
-                // unserialize our tileset bundle
-                TileSetBundle tsb = BundleUtil.extractBundle(rbundles[i]);
-                // initialize it and add it to the list
-                tsb.init(rbundles[i]);
-                addBundle(idmap, namemap, tsb);
-
-            } catch (Exception e) {
-                Log.warning("Unable to load tileset bundle '" +
-                            BundleUtil.METADATA_PATH + "' from resource " +
-                            "bundle [rbundle=" + rbundles[i] +
-                            ", error=" + e + "].");
-                Log.logStackTrace(e);
-            }
         }
 
         // fill in our bundles array and wake up any waiters
@@ -105,6 +91,37 @@ public class BundledTileSetRepository
         }
     }
 
+    /**
+     * Registers the bundle with the tileset repository, overriding any
+     * bundle with the same id or name.
+     */
+    public void addBundle (ResourceBundle bundle)
+    {
+        addBundle(_idmap, _namemap, bundle);
+    }
+
+    /**
+     * Extracts the tileset bundle from the supplied resource bundle
+     * and registers it.
+     */
+    protected void addBundle (HashIntMap idmap, HashMap namemap,
+        ResourceBundle bundle)
+    {
+        try {
+            TileSetBundle tsb = BundleUtil.extractBundle(bundle);
+            // initialize it and add it to the list
+            tsb.init(bundle);
+            addBundle(idmap, namemap, tsb);
+
+        } catch (Exception e) {
+            Log.warning("Unable to load tileset bundle '" +
+                        BundleUtil.METADATA_PATH + "' from resource " +
+                        "bundle [rbundle=" + bundle +
+                        ", error=" + e + "].");
+            Log.logStackTrace(e);
+        }
+    }
+
     /**
      * Adds the tilesets in the supplied bundle to our tileset mapping
      * tables. Any tilesets with the same name or id will be overwritten.