X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FRes.java;h=20858e60107cdfeb56f34f5b2cb750122a3b9c2a;hb=d1db5780c2fe79cf7acaa71508358d410aec7b96;hp=402f2d635d4db8f759b958c6ca2a998731d2e4da;hpb=8ea2f2734a60f0c4fa9c82083469165283a8b810;p=org.ibex.core.git

diff --git a/src/org/xwt/Res.java b/src/org/xwt/Res.java
index 402f2d6..20858e6 100644
--- a/src/org/xwt/Res.java
+++ b/src/org/xwt/Res.java
@@ -7,28 +7,33 @@ import java.util.zip.*;
 import org.xwt.js.*;
 import org.xwt.util.*;
 
-// FIXME: ByteStream fileName property
 /** base class for XWT resources */
 public abstract class Res extends JS {
 
-    public final InputStream getInputStream() throws IOException { return getInputStream(""); }
+    public String getDescriptiveName() { return "FIXME"; }
 
-    public Res graft(Object newResource) { throw new JS.Exn("cannot graft onto this resource"); }
+    /** if this Res corresponds to a Template, it is cached here */
+    Template t = null;
 
+    /** cache of subresources so that the equality operator works on them */
     private Hash refCache = null;
+
+    /** returns an InputStream containing the Resource's contents */
+    public InputStream getInputStream() throws IOException { return getInputStream(""); }
+    public abstract InputStream getInputStream(String path) throws IOException;
+
+    /** graft newResource in place of this resource on its parent */
+    public Res graft(Object newResource) { throw new JS.Exn("cannot graft onto this resource"); }
+
+    /** if the path of this resource does not end with extension, return a new one wit it appended */
+    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 get(Object key) {
         if ("".equals(key)) {
-            try {
-                Res who = this;
-                //who = addExtension(".xwt");
-                // FIXME: cache templates by the Res that created them, not their nodename
-                Template.buildTemplate(who.getInputStream(), "Resource");
-                // FIXME: return the static here
-                return null;
-            } catch (IOException e) {
-                Log.logJS(this, e);
-                return null;
-            }
+            Template t = Template.getTemplate(addExtension(".xwt"));
+            return t == null ? null : t.getStatic();
         }
         Object ret = refCache == null ? null : refCache.get(key);
         if (ret != null) return ret;
@@ -38,12 +43,6 @@ public abstract class Res extends JS {
         return ret;
     }
 
-    public void put(Object key, Object val) { throw new JS.Exn("cannot put to a resource"); } 
-    public Object[] keys() { throw new JS.Exn("cannot enumerate a resource"); } 
-
-    public abstract InputStream getInputStream(String path) throws IOException;
-    //public abstract Res addExtension(String extension);
-
     public static Res stringToRes(String url) {
         if (url.indexOf('!') != -1)
             return (Res)(new Zip(stringToRes(url.substring(0, url.lastIndexOf('!')))).get(url.substring(url.lastIndexOf('!') + 1)));
@@ -61,12 +60,23 @@ public abstract class Res extends JS {
         public InputStream getInputStream(String path) throws IOException { return new org.xwt.HTTP(url + path).GET(); }
     }
 
+    /** byte arrays */
+    public static class ByteArray extends Res {
+        private byte[] bytes;
+        ByteArray(byte[] bytes) { this.bytes = bytes; }
+        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);
+        }
+    }
+
     // FIXME: dangerous
     /** a file */
     public static class File extends Res {
         private String path;
         File(String path) { this.path = path; }
-        public InputStream getInputStream(String rest) throws IOException { return new FileInputStream((path + rest).replace('/', java.io.File.separatorChar)); }
+        public InputStream getInputStream(String rest) throws IOException {
+            return new FileInputStream((path + rest).replace('/', java.io.File.separatorChar)); }
     }
 
     /** wrap a Res around a preexisting InputStream */
@@ -84,10 +94,11 @@ public abstract class Res extends JS {
         private Res parent;
         Zip(Res parent) { this.parent = parent; }
         public InputStream getInputStream(String path) throws IOException {
+            if (path.startsWith("/")) path = path.substring(1);
             ZipInputStream zis = new ZipInputStream(parent.getInputStream());
             ZipEntry ze = zis.getNextEntry();
             while(ze != null && !ze.getName().equals(path)) ze = zis.getNextEntry();
-            if (ze == null) throw new JS.Exn("zip file not found in archive");
+            if (ze == null) throw new JS.Exn("requested file not found in archive");
             return zis;
         }
     }
@@ -97,6 +108,9 @@ public abstract class Res extends JS {
         Res parent;
         Object key;
         Ref(Res parent, Object key) { this.parent = parent; this.key = key; }
+        public Res addExtension(String extension) {
+            return (key instanceof String && ((String)key).endsWith(extension)) ? this : new Ref(parent, key + extension);
+        }
         public InputStream getInputStream(String path) throws IOException {
             return parent.getInputStream("/" + key + path);
         }
@@ -108,14 +122,11 @@ public abstract class Res extends JS {
         Res graftee;
         Object replaced_key;
         Object replaced_val;
-        Graft(Res graftee, Object key, Object val) {
-            this.graftee = graftee; replaced_key = key; replaced_val = val; }
+        Graft(Res graftee, Object key, Object val) { this.graftee = graftee; replaced_key = key; replaced_val = val; }
         public boolean equals(Object o) { return (this == o || graftee.equals(o)); }
         public int hashCode() { return graftee.hashCode(); }
         public InputStream getInputStream(String s) throws IOException { return graftee.getInputStream(s); }
-        public Object get(Object key) {
-            return replaced_key.equals(key) ? replaced_val : graftee.get(key);
-        }
+        public Object get(Object key) { return replaced_key.equals(key) ? replaced_val : graftee.get(key); }
     }
 
     /** unpacks a Microsoft CAB file (possibly embedded in another file; we scan for 'MSCF' */