X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=3626eecee5c3e90fb6baa9af71bebe42c63ba8b4;hb=163ff4c57ec557bb8615f80e875f045cdfbad696;hp=69af74a416de57ac4d79acef1b9d22f731106e53;hpb=75b9e1e72f6067e59a1e5312c91d20d05ec8a927;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 69af74a..3626eec 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -33,7 +33,7 @@ public class Template {
     private Vec children = new Vec();     ///< during XML parsing, this holds the list of currently-parsed children; null otherwise
     private int numunits = -1;            ///< see numUnits(); -1 means that this value has not yet been computed
 
-    private JSFunction script = null;       ///< the script on this node
+    private JS script = null;       ///< the script on this node
     private String fileName = "unknown";  ///< the filename this node came from; used only for debugging
     private Vec preapply = new Vec();     ///< templates that should be preapplied (in the order of application)
 
@@ -41,7 +41,7 @@ public class Template {
     // Instance Members that are only meaningful on root Template //////////////////////////////////////
 
     private JSScope staticScope = null;   ///< the scope in which the static block is executed
-    private JSFunction staticscript = null;  ///< the script on the static node of this template, null already performed
+    private JS staticscript = null;  ///< the script on the static node of this template, null already performed
 
 
     // Only used during parsing /////////////////////////////////////////////////////////////////
@@ -49,59 +49,53 @@ public class Template {
     private StringBuffer content = null;   ///< during XML parsing, this holds partially-read character data; null otherwise
     private int content_start = 0;         ///< line number of the first line of <tt>content</tt>
     private int startLine = -1;            ///< the line number that this element starts on
-    private final Stream r;                   ///< the resource we came from
+    private XWT xwt;
 
 
     // Static data/methods ///////////////////////////////////////////////////////////////////
 
-    // FIXME need to provide the XWT object too
-    public static Template getTemplate(Stream r) throws JSExn {
+    public Template(InputStream is, XWT xwt) {
+        this.xwt = xwt;
         try {
-            r = r.addExtension(".xwt");
-            if (r.t != null) return r.t;
-            r.t = new Template(r);
-            new TemplateHelper().parseit(r.getInputStream(), r.t);
-            return r.t;
+            new TemplateHelper().parseit(is, this);
         } catch (Exception e) {
-            throw new JSExn("Error reading template stream: " + r + "\n" + e.toString());
+            throw new RuntimeException(e.toString());
         }
     }
 
-    public static Stream resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
+    public Template(XWT xwt) {
+        this.xwt = xwt;
+    }
+
+    public static JS resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
         // URL
+        /* FIXME
         if (str.indexOf("://") != -1) {
             if (permitAbsolute) return (Stream)xwt.url2res(str);
             throw new JSExn("absolute URL " + str + " not permitted here");
         }
-
+        */
         // root-relative
-        Stream ret = xwt.rr;
+        JS ret = (JS)xwt.getAndTriggerTraps("");
         while(str.indexOf('.') != -1) {
             String path = str.substring(0, str.indexOf('.'));
             str = str.substring(str.indexOf('.') + 1);
-            ret = (Stream)ret.get(path);
+            ret = (JS)ret.get(path);
         }
-        ret = (Stream)ret.get(str);
+        ret = (JS)ret.get(str);
         return ret;
     }
 
 
     // Methods to apply templates ////////////////////////////////////////////////////////
 
-    private Template(Stream r) {
-        this.r = r;
-        String f = r.toString();
-        if (f != null && !f.equals(""))
-            fileName = f.substring(f.lastIndexOf('/')+1, f.endsWith(".xwt") ? f.length() - 4 : f.length());
-    }
-
     /** called before this template is applied or its static object can be externally referenced */
-    JSScope getStatic(XWT xwt) throws JSExn {
+    JSScope getStatic() throws JSExn {
         if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null);
         if (staticscript == null) return staticScope;
-        JSFunction temp = staticscript;
+        JS temp = staticscript;
         staticscript = null;
-        temp.cloneWithNewParentScope(staticScope).call(null, null, null, null, 0);
+        JS.cloneWithNewParentScope(temp, staticScope).call(null, null, null, null, 0);
         return staticScope;
     }
     
@@ -109,9 +103,13 @@ public class Template {
      *  @param pboxes a vector of all box parents on which to put $-references
      *  @param ptemplates a vector of the fileNames to recieve private references on the pboxes
      */
-    void apply(Box b, XWT xwt) throws JSExn {
+    void apply(Box b) throws JSExn {
         try {
-            apply(b, xwt, null);
+            apply(b, null);
+        } catch (IOException e) {
+            b.clear(b.VISIBLE);
+            b.mark_for_repack();
+            throw new JSExn(e.toString());
         } catch (JSExn e) {
             b.clear(b.VISIBLE);
             b.mark_for_repack();
@@ -119,26 +117,25 @@ public class Template {
         }
     }
 
-
-    private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-        getStatic(xwt);
+    private void apply(Box b, PerInstantiationJSScope parentPis) throws JSExn, IOException {
+        getStatic();
 
         if (id != null) parentPis.putDollar(id, b);
         for(int i=0; i<preapply.size(); i++) {
-            Template t = getTemplate(resolveStringToResource((String)preapply.elementAt(i), xwt, false));
+            Template t = new Template(Stream.getInputStream(resolveStringToResource((String)preapply.elementAt(i), xwt, false)), xwt);
             if (t == null) throw new RuntimeException("unable to resolve resource " + preapply.elementAt(i));
-            t.apply(b, xwt);
+            t.apply(b);
         }
 
         PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticScope);
 
         for (int i=0; children != null && i<children.size(); i++) {
             Box kid = new Box();
-            ((Template)children.elementAt(i)).apply(kid, xwt, pis);
+            ((Template)children.elementAt(i)).apply(kid, pis);
             b.putAndTriggerTraps(b.get("numchildren"), kid);
         }
 
-        if (script != null) script.cloneWithNewParentScope(pis).call(null, null, null, null, 0);
+        if (script != null) JS.cloneWithNewParentScope(script, pis).call(null, null, null, null, 0);
 
         Object key, val;
         for(int i=0; keys != null && i < keys.length; i++) {
@@ -238,7 +235,7 @@ public class Template {
                 // push the last node we were in onto the stack
                 nodeStack.addElement(t);
                 // instantiate a new node, and set its fileName/importlist/preapply
-                Template t2 = new Template(t.r);
+                Template t2 = new Template(t.xwt);
                 t2.startLine = getLine();
                 if (!c.getLocalName().equals("box") && !c.getLocalName().equals("template"))
                     t2.preapply.addElement((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName());
@@ -314,11 +311,11 @@ public class Template {
             }
         }
 
-        private JSFunction parseScript(boolean isstatic) throws IOException {
-            JSFunction thisscript = null;
+        private JS parseScript(boolean isstatic) throws IOException {
+            JS thisscript = null;
             String contentString = t.content.toString();
             if (contentString.trim().length() > 0)
-                thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
+                thisscript = JS.fromReader(t.fileName + (isstatic ? "._" : ""),
                                                    t.content_start,
                                                    new StringReader(contentString));
             t.content = null;
@@ -389,7 +386,7 @@ public class Template {
         public Object get(Object key) throws JSExn {
             if (super.has(key)) return super.get(key);
             if (key.equals("xwt")) return xwt;
-            if (key.equals("")) return xwt.rr;
+            if (key.equals("")) return xwt.get("");
             if (key.equals("static")) return myStatic;
             return super.get(key);
         }