X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=f85f3a7ae8a4289da67f007af80fc28f389a5446;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hp=00aedd09328b8975c3ed575df1469c0fc37300f6;hpb=fa49b56b41be191e83bcf8222381fee2c4e0355b;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 00aedd0..f85f3a7 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -49,44 +49,46 @@ 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 Res r;                   ///< the resource we came from
+    private final Stream r;                   ///< the resource we came from
 
 
     // Static data/methods ///////////////////////////////////////////////////////////////////
 
-    public static Template getTemplate(Res r) throws JSExn {
+    // FIXME need to provide the XWT object too
+    public static Template getTemplate(Stream r) throws JSExn {
         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;
-        } catch (Exception e) { throw new JSExn(e.toString());
+        } catch (Exception e) {
+            throw new JSExn("Error reading template stream: " + r + "\n" + e.toString());
         }
     }
 
-    public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
+    public static Stream resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) throws JSExn {
         // URL
         if (str.indexOf("://") != -1) {
-            if (permitAbsolute) return (Res)xwt.url2res(str);
+            if (permitAbsolute) return (Stream)xwt.url2res(str);
             throw new JSExn("absolute URL " + str + " not permitted here");
         }
 
         // root-relative
-        Res ret = xwt.rr;
+        Stream ret = xwt.rr;
         while(str.indexOf('.') != -1) {
             String path = str.substring(0, str.indexOf('.'));
             str = str.substring(str.indexOf('.') + 1);
-            ret = (Res)ret.get(path);
+            ret = (Stream)ret.get(path);
         }
-        ret = (Res)ret.get(str);
+        ret = (Stream)ret.get(str);
         return ret;
     }
 
 
     // Methods to apply templates ////////////////////////////////////////////////////////
 
-    private Template(Res r) {
+    private Template(Stream r) {
         this.r = r;
         String f = r.toString();
         if (f != null && !f.equals(""))
@@ -107,15 +109,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) {
+    void apply(Box b, XWT xwt) throws JSExn {
         try {
             apply(b, xwt, null);
         } catch (JSExn e) {
             b.clear(b.VISIBLE);
             b.mark_for_repack();
-            Log.info(Template.class, "WARNING: exception (below) thrown during application of template;");
-            Log.info(Template.class, "         setting visibility of target box to \"false\"");
-            JS.log(e);
+            throw e;
         }
     }
 
@@ -131,10 +131,11 @@ public class Template {
         }
 
         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);
-            b.putAndTriggerTraps(JS.N(b.treeSize()), kid);
+            b.putAndTriggerTraps(b.get("numchildren"), kid);
         }
 
         if (script != null) script.cloneWithNewParentScope(pis).call(null, null, null, null, 0);
@@ -163,7 +164,12 @@ public class Template {
                 if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
             }
 
-            b.putAndTriggerTraps(key, val);
+            try {
+                b.putAndTriggerTraps(key, val);
+            } catch(JSExn e) {
+                e.addBacktrace(fileName + ":attr-" + key,0);
+                throw e;
+            }
         }
     }