AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved some bundle stuff into BundleUtil. Added methods to support

Browse Source 
post-parsing tileset validation.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@699 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-11-29 21:57:31 +00:00
parent eea46eb827
commit be5428a2f7
5 changed files with 104 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/bundle/BundleUtil.java
+38
View File
@@ -0,0 +1,38 @@
//
// $Id: BundleUtil.java,v 1.1 2001/11/29 21:57:31 mdb Exp $
package com.threerings.media.tile.bundle;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import com.threerings.resource.ResourceBundle;
/**
* Bundle related utility functions.
*/
public class BundleUtil
{
/** The path to the metadata resource that we will attempt to load
* from our resource set. */
public static final String METADATA_PATH = "tsbundles.dat";
/**
* Extracts and initializes a serialized tileset bundle instance from
* the supplied resource bundle.
*/
public static TileSetBundle extractBundle (ResourceBundle bundle)
throws IOException, ClassNotFoundException
{
// unserialize the tileset bundles array
InputStream tbin = bundle.getResource(METADATA_PATH);
ObjectInputStream oin = new ObjectInputStream(
new BufferedInputStream(tbin));
TileSetBundle tsb = (TileSetBundle)oin.readObject();
// initialize the bundle and add it to the list
tsb.init(bundle);
return tsb;
}
}
src/java/com/threerings/media/tile/bundle/BundledTileSetRepository.java
+3 -18
View File
@@ -1,12 +1,9 @@
//
// $Id: BundledTileSetRepository.java,v 1.3 2001/11/29 00:12:42 mdb Exp $
// $Id: BundledTileSetRepository.java,v 1.4 2001/11/29 21:57:31 mdb Exp $
package com.threerings.media.tile.bundle;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.Iterator;
@@ -31,10 +28,6 @@ import com.threerings.media.tile.TileSetRepository;
public class BundledTileSetRepository
implements TileSetRepository
{
/** The path to the metadata resource that we will attempt to load
* from our resource set. */
public static final String METADATA_PATH = "tsbundles.dat";
/**
* Constructs a repository which will obtain its resource set from the
* supplied resource manager.
@@ -64,17 +57,9 @@ public class BundledTileSetRepository
ArrayList tbundles = new ArrayList();;
for (int i = 0; i < rbundles.length; i++) {
try {
// unserialize the tileset bundles array
InputStream tbin = rbundles[i].getResource(METADATA_PATH);
ObjectInputStream oin = new ObjectInputStream(
new BufferedInputStream(tbin));
TileSetBundle tsb = (TileSetBundle)oin.readObject();
// initialize the bundle and add it to the list
tsb.init(rbundles[i]);
tbundles.add(tsb);
tbundles.add(BundleUtil.extractBundle(rbundles[i]));
} catch (Exception e) {
Log.warning("Unable to load tileset bundles from resource " +
Log.warning("Unable to load tileset bundle from resource " +
"bundle [rbundle=" + rbundles[i] +
", error=" + e + "].");
Log.logStackTrace(e);