X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=4cbf5e46a745777fc2007085fa82b9cdf1f07cb1;hb=a060cc5025b58e8d3e319aefa6ae44fe7c6182ad;hp=bd57bf9878fbc07605e28b0e9b28ff42fd95981f;hpb=8c1756ef3fd42cc2f324baf47e13a83f51045efe;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index bd57bf9..4cbf5e4 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -47,7 +47,6 @@ 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 content_lines = 0;         ///< number of lines in <tt>content</tt>
     private int startLine = -1;            ///< the line number that this element starts on
     private final Res r;                   ///< the resource we came from
 
@@ -59,7 +58,8 @@ public class Template {
             r = r.addExtension(".xwt");
             if (r.t != null) return r.t;
             r.t = new Template(r);
-            new TemplateHelper().parseit(r.getInputStream(), r.t);
+            try { new TemplateHelper().parseit(r.getInputStream(), r.t); }
+            catch (FileNotFoundException e) { Log.log(Template.class, "template not found: "+r); }
             return r.t;
         } catch (Exception e) {
             if (Log.on) Log.log(r.t == null ? "null" : r.t.fileName, e);
@@ -70,8 +70,11 @@ public class Template {
     public static Res resolveStringToResource(String str, XWT xwt, boolean permitAbsolute) {
         // URL
         if (str.indexOf("://") != -1) {
-            // FIXME
-            //if (permitAbsolute) return Res.fromString(str);
+            try {
+                if (permitAbsolute) return (Res)xwt.callMethod("res.url", str, null, null, null, 1);
+            } catch (JSExn jse) {
+                throw new Error("this should never happen");
+            }
             Log.log(Template.class, "absolute URL " + str + " not permitted here");
             return null;
         }
@@ -90,7 +93,12 @@ public class Template {
 
     // Methods to apply templates ////////////////////////////////////////////////////////
 
-    private Template(Res r) { this.r = r; }
+    private Template(Res 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() {
@@ -98,7 +106,11 @@ public class Template {
         if (staticscript == null) return staticJSScope;
         JSFunction temp = staticscript;
         staticscript = null;
-        temp.cloneWithNewParentJSScope(staticJSScope).call(null, null, null, null, 0);
+        try {
+            temp.cloneWithNewParentScope(staticJSScope).call(null, null, null, null, 0);
+        } catch (JSExn jse) {
+            throw new Error("this should never happen");
+        }
         return staticJSScope;
     }
     
@@ -106,8 +118,8 @@ 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) { apply(b, xwt, null); }
-    void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) {
+    void apply(Box b, XWT xwt) throws JSExn { apply(b, xwt, null); }
+    void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
 
         getStatic();
 
@@ -120,17 +132,27 @@ public class Template {
 
         PerInstantiationJSScope pis = new PerInstantiationJSScope(b, xwt, parentPis, staticJSScope);
         for (int i=0; children != null && i<children.size(); i++) {
-            Box kid = new BoxTree();
+            Box kid = new Box();
             ((Template)children.elementAt(i)).apply(kid, xwt, pis);
-            b.putAndTriggerJSTraps(JS.N(b.numchildren), kid);
+            b.putAndTriggerTraps(JS.N(b.treeSize()), kid);
         }
 
-        if (script != null) script.cloneWithNewParentJSScope(pis).call(null, null, null, null, 0);
+        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) == '$') b.putAndTriggerJSTraps(keys[i], pis.get(vals[i]));
-            else if ("image".equals(keys[i])) b.putAndTriggerJSTraps("image", resolveStringToResource((String)vals[i], xwt, true));
-            else if (keys[i] != null) b.putAndTriggerJSTraps(keys[i], vals[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");
+                else b.putAndTriggerTraps(keys[i], rbox);
+            }
+            else if ("image".equals(keys[i])) b.putAndTriggerTraps("image", resolveStringToResource((String)vals[i], xwt, true));
+            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);
+            }
+            else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
     }
 
 
@@ -209,24 +231,23 @@ public class Template {
 
         private void processBodyElement(XML.Element c) {
             Hash h = new Hash(c.len * 2, 3);
+
+            // WARNING: c.keys.length != c.len; USE c.len
             for(int i=0; i<c.len; i++) {
-                if (c.keys[i] == null) continue;
-                if (c.keys[i].endsWith(":image")) {
-                    String uri = (String)c.urimap.get(c.keys[i].substring(0, c.keys[i].indexOf(':')));
-                    c.keys[i] = c.keys[i].substring(c.keys[i].lastIndexOf(':') + 1);
-                    c.vals[i] = uri + "." + c.vals[i];
-                }                    
-                if ((c.keys[i].equals("preapply") || c.keys[i].endsWith(":preapply")) && c.localName.equals("template")) {
-                    String uri = "";
-                    if (c.keys[i].endsWith(":preapply")) {
-                        uri = "." + c.urimap.get(c.keys[i].substring(0, c.keys[i].indexOf(':')));
-                        c.keys[i] = c.keys[i].substring(c.keys[i].lastIndexOf(':') + 1);
-                    }
+                if (c.keys[i] == null) throw new RuntimeException("XML parser returned a null key position="+i);
+                if (c.keys[i].equals("font") && c.uris[i] != null) c.vals[i] = c.uris[i] + "." + c.vals[i];
+                if (c.keys[i].equals("preapply")) {
+                    // process preapply and 'remove' from array
+                    String uri = c.uris[i] == null ? "" : c.uris[i] + '.';
                     StringTokenizer tok = new StringTokenizer(c.vals[i].toString(), " ");
                     while(tok.hasMoreTokens()) t.preapply.addElement(uri + tok.nextToken());
-                    c.keys[i] = c.keys[c.keys.length - 1];
-                    c.vals[i] = c.vals[c.vals.length - 1];
-                    i--;
+
+                    if (i < c.len - 1) { // not the last attribute
+                        c.keys[i] = c.keys[c.len - 1];
+                        c.vals[i] = c.vals[c.len - 1];
+                        c.uris[i] = c.uris[c.len - 1];
+                    }
+                    c.len--; i--;
                     continue;
                 }
                 h.put(c.keys[i], c.vals[i]);
@@ -283,14 +304,15 @@ public class Template {
             try {
                 String contentString = t.content.toString();
                 if (contentString.trim().length() > 0)
-                    thisscript = JS.parse(t.fileName + (isstatic ? "._" : ""), t.content_start, new StringReader(contentString));
+                    thisscript = JSFunction.fromReader(t.fileName + (isstatic ? "._" : ""),
+                                                       t.content_start,
+                                                       new StringReader(contentString));
             } catch (IOException ioe) {
                 if (Log.on) Log.log(this, "  ERROR: " + ioe.getMessage());
                 thisscript = null;
             }
             t.content = null;
             t.content_start = 0;
-            t.content_lines = 0;
             return thisscript;
         }
 
@@ -311,6 +333,9 @@ public class Template {
                     t = (Template)nodeStack.lastElement();
                     nodeStack.setSize(nodeStack.size() - 1);
                     t.children.addElement(oldt);
+
+                    int oldt_lines = getLine() - oldt.startLine;
+                    for (int i=0; oldt_lines > i; i++) t.content.append('\n');
                 }
             }
          }
@@ -323,12 +348,10 @@ public class Template {
             if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
                 if (t.content == null) {
                     t.content_start = getLine();
-                    t.content_lines = 0;
                     t.content = new StringBuffer();
                 }
 
                 t.content.append(ch, start, length);
-                t.content_lines++;
 
             } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) {
                 throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content");
@@ -342,24 +365,24 @@ public class Template {
         XWT xwt = null;
         PerInstantiationJSScope parentBoxPis = null;
         JSScope myStatic = null;
-        void putDollar(String key, Box target) {
+        void putDollar(String key, Box target) throws JSExn {
             if (parentBoxPis != null) parentBoxPis.putDollar(key, target);
             declare("$" + key);
             put("$" + key, target);
         }
-        public PerInstantiationJSScope(JSScope parentJSScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
-            super(parentJSScope);
+        public PerInstantiationJSScope(JSScope parentScope, XWT xwt, PerInstantiationJSScope parentBoxPis, JSScope myStatic) {
+            super(parentScope);
             this.parentBoxPis = parentBoxPis;
             this.xwt = xwt;
             this.myStatic = myStatic;
         }
-        public Object get(Object key) {
+        public Object get(Object key) throws JSExn {
             if (super.has(key)) return super.get(key);
             if (key.equals("xwt")) return xwt;
             if (key.equals("static")) return myStatic;
             return super.get(key);
         }
-        public void put(Object key, Object val) {
+        public void put(Object key, Object val) throws JSExn {
             if (super.has(key)) super.put(key, val);
             else super.put(key, val);
         }