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

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index dbd39cc..f85f3a7 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -40,7 +40,7 @@ public class Template {
 
     // Instance Members that are only meaningful on root Template //////////////////////////////////////
 
-    private JSScope staticJSScope = null;   ///< the scope in which the static block is executed
+    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
 
 
@@ -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(""))
@@ -94,35 +96,32 @@ public class Template {
     }
 
     /** called before this template is applied or its static object can be externally referenced */
-    JSScope getStatic() throws JSExn {
-        if (staticJSScope == null) staticJSScope = new JSScope(null);
-        if (staticscript == null) return staticJSScope;
+    JSScope getStatic(XWT xwt) throws JSExn {
+        if (staticScope == null) staticScope = new PerInstantiationJSScope(null, xwt, null, null);
+        if (staticscript == null) return staticScope;
         JSFunction temp = staticscript;
         staticscript = null;
-        temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
-        return staticJSScope;
+        temp.cloneWithNewParentScope(staticScope).call(null, null, null, null, 0);
+        return staticScope;
     }
     
     /** Applies the template to Box b
      *  @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.log(Template.class, "WARNING: exception (below) thrown during application of template;");
-            Log.log(Template.class, "         setting visibility of target box to \"false\"");
-            Log.logJS(e);
+            throw e;
         }
     }
 
 
     private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-
-        getStatic();
+        getStatic(xwt);
 
         if (id != null) parentPis.putDollar(id, b);
         for(int i=0; i<preapply.size(); i++) {
@@ -131,31 +130,47 @@ public class Template {
             t.apply(b, xwt);
         }
 
-        PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticJSScope);
+        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);
 
-        for(int i=0; keys != null && i<keys.length; i++)
-            if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') {
-                Object rbox = pis.get(vals[i]);
-                if (rbox == null) Log.log(this, "unknown box id '"+vals[i]+"' referenced in XML attribute");
-                else b.putAndTriggerTraps(keys[i], rbox);
+        Object key, val;
+        for(int i=0; keys != null && i < keys.length; i++) {
+            if (keys[i] == null) continue;
+            key = keys[i];
+            val = vals[i];
+
+            if ("null".equals(val)) val = null;
+
+            if (val != null && val instanceof String && ((String)val).length() > 0) {
+                switch (((String)val).charAt(0)) {
+                    case '$':
+                        val = pis.get(val);
+                        if (val == null) throw new JSExn("unknown box id '"+vals[i]+"' referenced in XML attribute");
+                        break;
+                    case '.':
+                        val = resolveStringToResource(((String)val).substring(1), xwt, true);
+                }
             }
-            else if ("fill".equals(keys[i]) && ((String)vals[i]).indexOf('.') >= 0) {
-                b.putAndTriggerTraps("fill", resolveStringToResource((String)vals[i], xwt, true));
+
+            if (val != null && "redirect".equals(key)) {
+                val = pis.get("$"+val);
+                if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
             }
-            else if ("redirect".equals(keys[i])) {
-                if (vals[i] == null || "null".equals(vals[i])) b.putAndTriggerTraps("redirect", null);
-                Object rbox = pis.get("$"+vals[i]);
-                if (rbox == null) Log.log(this, "redirect target '"+vals[i]+"' not found");
-                else b.putAndTriggerTraps("redirect", rbox);
+
+            try {
+                b.putAndTriggerTraps(key, val);
+            } catch(JSExn e) {
+                e.addBacktrace(fileName + ":attr-" + key,0);
+                throw e;
             }
-            else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
+        }
     }
 
 
@@ -244,21 +259,6 @@ public class Template {
             // process attributes into Vecs, dealing with any XML Namespaces in the process
             ATTR: for (int i=0; i < c.getAttrLen(); i++) {
                 //#switch(c.getAttrKey(i))
-                case "font":
-                    keys.addElement(c.getAttrKey(i));
-                    if (c.getAttrUri(i) != null) vals.addElement(c.getAttrUri(i) + "." + c.getAttrVal(i));
-                    else vals.addElement(c.getAttrVal(i));
-                    continue ATTR;
-
-                case "fill":
-                    keys.addElement(c.getAttrKey(i));
-                    if (c.getAttrUri(i) != null && !c.getAttrVal(i).startsWith("#") && SVG.colors.get(c.getAttrVal(i)) == null)
-                        vals.addElement(c.getAttrUri(i) + "." + c.getAttrVal(i));
-                    else vals.addElement(c.getAttrVal(i));
-                    continue ATTR;
-
-                // process and do not add to box attributes
-
                 case "preapply":
                     String uri = c.getAttrUri(i); if (!uri.equals("")) uri += ".";
                     StringTokenizer tok = new StringTokenizer(c.getAttrVal(i).toString(), " ");
@@ -270,8 +270,10 @@ public class Template {
                     continue ATTR;
                 //#end
 
+                // treat value starting with '.' as resource reference
+                String uri = c.getAttrUri(i); if (!uri.equals("")) uri = '.' + uri;
                 keys.addElement(c.getAttrKey(i));
-                vals.addElement(c.getAttrVal(i));
+                vals.addElement((c.getAttrVal(i).startsWith(".") ? uri : "") + c.getAttrVal(i));
             }
 
             if (keys.size() == 0) return;
@@ -281,8 +283,6 @@ public class Template {
                 return ((String)a).compareTo((String)b);
             } });
 
-
-            // merge attributes into template
             t.keys = new String[keys.size()];
             t.vals = new Object[vals.size()];
             keys.copyInto(t.keys);
@@ -353,7 +353,7 @@ public class Template {
         public void characters(char[] ch, int start, int length) throws XML.Exn {
             // invoke the no-tab crusade
             for (int i=0; length >i; i++) if (ch[start+i] == '\t')
-                throw new XML.Exn("tabs are not allowed in XWT files", XML.Exn.SCHEMA, getLine(), getCol());
+                Log.error(Template.class, "tabs are not allowed in XWT files ("+getLine()+":"+getCol()+")");
 
             if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
                 if (t.content == null) {