2003/10/28 10:10:17

[org.ibex.core.git] / src / org / xwt / Res.java

diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java
index 3f34f82..54bebcb 100644 (file)
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -101,6 +101,7 @@ public abstract class Res extends JS {
     public static class HTTP extends CachedRes {
         private String url;
         HTTP(String url) { this.url = url; }
+        public String getDescriptiveName() { return url; }
         public InputStream _getInputStream(String path) throws IOException {
             return new org.xwt.HTTP(url + path).GET(); }
     }
@@ -109,6 +110,7 @@ public abstract class Res extends JS {
     public static class ByteArray extends Res {
         private byte[] bytes;
         ByteArray(byte[] bytes) { this.bytes = bytes; }
+        public String getDescriptiveName() { return "byte[]"; }
         public InputStream getInputStream(String path) throws IOException {
             if (!"".equals(path)) throw new JS.Exn("can't get subresources of a byte[] resource");
             return new ByteArrayInputStream(bytes);
@@ -119,6 +121,7 @@ public abstract class Res extends JS {
     public static class File extends Res {
         private String path;
         File(String path) { this.path = path; }
+        public String getDescriptiveName() { return "file://" + path; }
         public InputStream getInputStream(String rest) throws IOException {
             return new FileInputStream((path + rest).replace('/', java.io.File.separatorChar)); }
     }
@@ -127,9 +130,11 @@ public abstract class Res extends JS {
     public static class Zip extends Res {
         private Res parent;
         Zip(Res parent) { this.parent = parent; }
+        public String getDescriptiveName() { return parent.getDescriptiveName() + "!"; }
         public InputStream getInputStream(String path) throws IOException {
             if (path.startsWith("/")) path = path.substring(1);
-            ZipInputStream zis = new ZipInputStream(parent.getInputStream());
+            InputStream pis = parent.getInputStream();
+            ZipInputStream zis = new ZipInputStream(pis);
             ZipEntry ze = zis.getNextEntry();
             while(ze != null && !ze.getName().equals(path)) ze = zis.getNextEntry();
             if (ze == null) throw new JS.Exn("requested file (" + path + ") not found in archive");
@@ -186,6 +191,7 @@ public abstract class Res extends JS {
         final Res watchee;
         JS.Callable callback;
         ProgressWatcher(Res watchee, JS.Callable callback) { this.watchee = watchee; this.callback = callback; }
+        public String getDescriptiveName() { return watchee.getDescriptiveName(); }
         public InputStream getInputStream(String s) throws IOException {
             final InputStream is = watchee.getInputStream(s);
             return new FilterInputStream(is) {