Formatting pass

1 files changed, 127 insertions, 140 deletions

diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/URLResourceReader.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/URLResourceReader.java
index 9133a8d..8694564 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/URLResourceReader.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/URLResourceReader.java
@@ -47,7 +47,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * ====================================================================
- */ 
+ */
 
 package net.wotonomy.foundation.internal;
 
@@ -61,147 +61,134 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 /**
- * This implementation of URL Resource Reader assumes 2 types
- * of base urls. A base url that ends with / is considered a
- * resource folder, whereas a resource that does not end with
- * / is considered a zip/jar resource folder.
+ * This implementation of URL Resource Reader assumes 2 types of base urls. A
+ * base url that ends with / is considered a resource folder, whereas a resource
+ * that does not end with / is considered a zip/jar resource folder.
  *
- * If the resource folder happens is a zip/jar archive, the
- * entries are always cached.
- * For non-zip base urls, one could specify whether or not it should
- * be cached.
+ * If the resource folder happens is a zip/jar archive, the entries are always
+ * cached. For non-zip base urls, one could specify whether or not it should be
+ * cached.
  *
  * @author Harish Prabandham
  */
-public class URLResourceReader  {
-    private Hashtable resourceCache = new Hashtable();
-    private boolean iszip = true;
-    private URL url = null;
-    private boolean cache = true;
-
-    /**
-     * Creates a new URLResourceReader object. You can either give
-     * the URL of the zip/jar file or a base url where to
-     * look for additional resources. If the url ends with
-     * "/" then it is assumed to be  a Base URL. 
-     * @param The base url to look for the resources.
-     * @param If the base url is not a zip/jar, then true indicates
-     * that entries should be cached, false otherwise.
-     */
-    public URLResourceReader(URL baseurl, boolean cache) throws IOException {
-        this.url = baseurl;
-        this.cache = cache;
-        this.iszip = !url.getFile().endsWith("/");
-        if(this.iszip)
-            this.cache = true;
-        initialize();
-    }
-
-    /**
-     * equivalent to URLResourceReader(baseurl, false)
-     */
-    public URLResourceReader(URL baseurl) throws IOException {
-        this(baseurl, false);
-    }
-
-    /**
-     * Creates a new URLResourceReader object with the given
-     * input stream. The stream is assumed to be a zip/jar
-     * stream.
-     */
-    public URLResourceReader(InputStream is) throws IOException {
-        init(is);
-    }
-
-    private void initialize() throws IOException {
-        if(iszip) {
-            InputStream is = url.openStream();
-            init(is);
-            is.close();
-        }
-    }
-
-    private byte[] readFully(InputStream is) throws IOException {
-        byte[] buf = new byte[1024];
-        int num = 0;
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-
-        while( (num = is.read(buf)) != -1) {
-            bout.write(buf, 0, num);
-        }
-
-        return bout.toByteArray();
-    }
-
-    private void init(InputStream is) throws IOException {
-        ZipInputStream zstream = new ZipInputStream(is);
-        ZipEntry entry;
-        
-        while( (entry = zstream.getNextEntry()) != null) {
-            byte[] entryData = readFully(zstream);
-            if(cache)
-                resourceCache.put(entry.getName(), entryData);
-            zstream.closeEntry();
-        }
-        
-        zstream.close();
-    }
-
-    /**
-     * Returns an Enumeration of all "known" resource names.
-     */
-    public Enumeration getResourceNames() {
-        return resourceCache.keys();
-    }
-
-    /**
-     * Returns an array of bytes read for this resource if the
-     * resource exists. This method blocks until the resource
-     * has been fully read. If the resource does not exist,
-     * this method returns null.
-     */
-    public byte[] getResource(String  resource) {
-        // lookup the data in the cache...
-        byte[] data = (byte[]) resourceCache.get(resource);
-        if(data != null) {
-            return data;
-        }
-
-        // if the data was to come from a zip file that we
-        // already read fully & cached , then it is probably
-        // not there.
-        if(iszip) {
-            return null;
-        }
-
-        // Now the only choice left is to make a url connection.
-        try {
-            URL realURL = new URL(url.getProtocol(), url.getHost(),
-                                  url.getFile() + resource);
-            data = readFully(realURL.openStream());
-            // add it to cache if needed...
-            if(cache)
-                resourceCache.put(resource, data);
-            return data;
-        } catch(Exception e) {
-            return null;
-        }
-    }
-
-    public void close() {
-        resourceCache.clear();
-        resourceCache = null;
-    }
-
-    public String toString() {
-	return url.toString();
-    }
+public class URLResourceReader {
+	private Hashtable resourceCache = new Hashtable();
+	private boolean iszip = true;
+	private URL url = null;
+	private boolean cache = true;
+
+	/**
+	 * Creates a new URLResourceReader object. You can either give the URL of the
+	 * zip/jar file or a base url where to look for additional resources. If the url
+	 * ends with "/" then it is assumed to be a Base URL.
+	 * 
+	 * @param The base url to look for the resources.
+	 * @param If  the base url is not a zip/jar, then true indicates that entries
+	 *            should be cached, false otherwise.
+	 */
+	public URLResourceReader(URL baseurl, boolean cache) throws IOException {
+		this.url = baseurl;
+		this.cache = cache;
+		this.iszip = !url.getFile().endsWith("/");
+		if (this.iszip)
+			this.cache = true;
+		initialize();
+	}
+
+	/**
+	 * equivalent to URLResourceReader(baseurl, false)
+	 */
+	public URLResourceReader(URL baseurl) throws IOException {
+		this(baseurl, false);
+	}
+
+	/**
+	 * Creates a new URLResourceReader object with the given input stream. The
+	 * stream is assumed to be a zip/jar stream.
+	 */
+	public URLResourceReader(InputStream is) throws IOException {
+		init(is);
+	}
+
+	private void initialize() throws IOException {
+		if (iszip) {
+			InputStream is = url.openStream();
+			init(is);
+			is.close();
+		}
+	}
+
+	private byte[] readFully(InputStream is) throws IOException {
+		byte[] buf = new byte[1024];
+		int num = 0;
+		ByteArrayOutputStream bout = new ByteArrayOutputStream();
+
+		while ((num = is.read(buf)) != -1) {
+			bout.write(buf, 0, num);
+		}
+
+		return bout.toByteArray();
+	}
+
+	private void init(InputStream is) throws IOException {
+		ZipInputStream zstream = new ZipInputStream(is);
+		ZipEntry entry;
+
+		while ((entry = zstream.getNextEntry()) != null) {
+			byte[] entryData = readFully(zstream);
+			if (cache)
+				resourceCache.put(entry.getName(), entryData);
+			zstream.closeEntry();
+		}
+
+		zstream.close();
+	}
+
+	/**
+	 * Returns an Enumeration of all "known" resource names.
+	 */
+	public Enumeration getResourceNames() {
+		return resourceCache.keys();
+	}
+
+	/**
+	 * Returns an array of bytes read for this resource if the resource exists. This
+	 * method blocks until the resource has been fully read. If the resource does
+	 * not exist, this method returns null.
+	 */
+	public byte[] getResource(String resource) {
+		// lookup the data in the cache...
+		byte[] data = (byte[]) resourceCache.get(resource);
+		if (data != null) {
+			return data;
+		}
+
+		// if the data was to come from a zip file that we
+		// already read fully & cached , then it is probably
+		// not there.
+		if (iszip) {
+			return null;
+		}
+
+		// Now the only choice left is to make a url connection.
+		try {
+			URL realURL = new URL(url.getProtocol(), url.getHost(), url.getFile() + resource);
+			data = readFully(realURL.openStream());
+			// add it to cache if needed...
+			if (cache)
+				resourceCache.put(resource, data);
+			return data;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	public void close() {
+		resourceCache.clear();
+		resourceCache = null;
+	}
+
+	public String toString() {
+		return url.toString();
+	}
 }
-
-
-
-
-
-
-
-