2003/11/03 05:28:32

[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..399476b 100644 (file)
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -22,8 +22,10 @@ public abstract class Res extends JS {
     public Res getParent() { return null; }
 
     /** an InputStream that makes sure it is not in the MessageQueue when blocked on a read */
+    // FIXME
     private static class BackgroundInputStream extends FilterInputStream {
         BackgroundInputStream(InputStream i) { super(i); }
+    /*
         private void suspend() throws IOException {
             if (!ThreadMessage.suspendThread())
                 throw new IOException("attempt to perform background-only operation in a foreground thread");
@@ -41,6 +43,7 @@ public abstract class Res extends JS {
             try { return super.read(b, off, len); }
             finally { resume(); }
         }
+    */
     }
 
     /** returns an InputStream containing the Resource's contents */
@@ -54,7 +57,7 @@ public abstract class Res extends JS {
     public Res addExtension(String extension) { return new Ref(this, extension); }
 
     public Object[] keys() { throw new JS.Exn("cannot enumerate a resource"); } 
-    public void put(Object key, Object val) { throw new JS.Exn("cannot put to a resource"); } 
+    public Object put(Object key, Object val) { throw new JS.Exn("cannot put to a resource"); } 
     public Object get(Object key) {
         if ("".equals(key)) {
             Template t = Template.getTemplate(addExtension(".xwt"));
@@ -101,6 +104,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 +113,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 +124,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 +133,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");
@@ -137,6 +145,16 @@ public abstract class Res extends JS {
         }
     }
 
+    /** the Builtin resource */
+    public static class Builtin extends Res {
+       public Builtin() { };
+       public String getDescriptiveName() { return "[builtin]"; }
+       public InputStream getInputStream(String path) throws IOException {
+           if (!path.equals("")) throw new IOException("the builtin resource has no subresources");
+           return Platform.getBuiltinInputStream();
+       }
+    }
+
     /** what you get when you reference a subresource */
     public static class Ref extends Res {
         Res parent;
@@ -144,7 +162,9 @@ public abstract class Res extends JS {
         Ref(Res parent, Object key) { this.parent = parent; this.key = key; }
         public String getDescriptiveName() {
             String pdn = parent.getDescriptiveName();
-            return pdn.equals("") ? key.toString() : (pdn + "." + key.toString());
+           if (pdn.equals("")) return key.toString();
+           if (!pdn.endsWith("!")) pdn += ".";
+           return pdn + key.toString();
         }
         public Res addExtension(String extension) {
             return (key instanceof String && ((String)key).endsWith(extension)) ? this : new Ref(parent, key + extension);
@@ -184,8 +204,9 @@ public abstract class Res extends JS {
     /** shadow resource which replaces the graft */
     public static class ProgressWatcher extends Res {
         final Res watchee;
-        JS.Callable callback;
-        ProgressWatcher(Res watchee, JS.Callable callback) { this.watchee = watchee; this.callback = callback; }
+        JS.CompiledFunction callback;
+        ProgressWatcher(Res watchee, JS.CompiledFunction 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) {
@@ -198,12 +219,12 @@ public abstract class Res extends JS {
                     public int read(byte[] b, int off, int len) throws IOException {
                         int ret = super.read(b, off, len);
                         if (ret != 1) bytesDownloaded += ret;
-                        ThreadMessage.newthread(new JS.Callable() { public Object call(JS.Array a) {
+                        Scheduler.add(new Scheduler.Task() { public void perform() {
                             JS.Array args = new JS.Array();
                             args.addElement(new Integer(bytesDownloaded));
                             args.addElement(new Integer(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0));
-                            callback.call(args);
-                            return null;
+                            // FIXME
+                            //new JS.Context(callback, null, args).resume();
                         } });
                         return ret;
                     }