X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=8d47f68e92396561a8bb64e885b53a0751f68924;hb=ef61babe77a94eba181c95a52c0069a612276dff;hp=1d3965507ca5745c7dbdc348fa50899245e288bf;hpb=66088da8711e9855d6328732bbcce8788301a8bc;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 1d39655..8d47f68 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -6,6 +6,7 @@ import java.util.zip.*;
 import java.util.*;
 import java.lang.*;
 import org.xwt.js.*;
+import org.xwt.translators.*;
 import org.xwt.util.*;
 
 /**
@@ -112,15 +113,14 @@ public class Template {
         } 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.info(Template.class, "WARNING: exception (below) thrown during application of template;");
+            Log.info(Template.class, "         setting visibility of target box to \"false\"");
             Log.logJS(e);
         }
     }
 
 
     private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-
         getStatic();
 
         if (id != null) parentPis.putDollar(id, b);
@@ -139,20 +139,32 @@ public class Template {
 
         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 ("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);
+
+            if (val != null && "redirect".equals(key)) {
+                val = pis.get("$"+val);
+                if (val == null) throw new JSExn("redirect target '"+vals[i]+"' not found");
             }
-            else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
+
+            b.putAndTriggerTraps(key, val);
+        }
     }
 
 
@@ -176,7 +188,7 @@ public class Template {
         Template t = null;          ///< the template we're currently working on
 
         /** parse an XML input stream, building a Template tree off of <tt>root</tt> */
-        void parseit(InputStream is, Template root) throws XML.XMLException, IOException {
+        void parseit(InputStream is, Template root) throws XML.Exn, IOException {
             state = STATE_INITIAL;
             nameOfHeaderNodeBeingProcessed = null;
             nodeStack.setSize(0);
@@ -184,32 +196,37 @@ public class Template {
             parse(new InputStreamReader(is)); 
         }
 
-        public void startElement(XML.Element c) throws XML.SchemaException {
+        public void startElement(XML.Element c) throws XML.Exn {
             switch(state) {
             case STATE_INITIAL:
-                if (!"xwt".equals(c.localName)) throw new XML.SchemaException("root element was not <xwt>");
-                if (c.len != 0) throw new XML.SchemaException("root element must not have attributes");
+                if (!"xwt".equals(c.getLocalName()))
+                    throw new XML.Exn("root element was not <xwt>", XML.Exn.SCHEMA, getLine(), getCol());
+                if (c.getAttrLen() != 0)
+                    throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
                 state = STATE_IN_XWT_NODE;
                 return;
 
             case STATE_IN_XWT_NODE:
-                if (nameOfHeaderNodeBeingProcessed != null) throw new XML.SchemaException("can't nest header nodes");
-                nameOfHeaderNodeBeingProcessed = c.localName;
-                if (c.localName.equals("doc")) {
+                if (nameOfHeaderNodeBeingProcessed != null)
+                    throw new XML.Exn("can't nest header nodes", XML.Exn.SCHEMA, getLine(), getCol());
+                nameOfHeaderNodeBeingProcessed = c.getLocalName();
+                //#switch(c.getLocalName())
+                case "doc":
                     // FEATURE
-                } else if (c.localName.equals("static")) {
+                    return;
+                case "static":
                     if (t.staticscript != null)
-                        throw new XML.SchemaException("the <static> header node may not appear more than once");
-                    if (c.len > 0)
-                        throw new XML.SchemaException("the <static> node may not have attributes");
-                } else if (c.localName.equals("template")) {
+                        throw new XML.Exn("the <static> header node may only appear once", XML.Exn.SCHEMA, getLine(), getCol());
+                    if (c.getAttrLen() > 0)
+                        throw new XML.Exn("the <static> node may not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
+                    return;
+                case "template":
                     t.startLine = getLine();
                     state = STATE_IN_TEMPLATE_NODE;
                     processBodyElement(c);
-                } else {
-                    throw new XML.SchemaException("unrecognized header node \"" + c.localName + "\"");
-                }
-                return;
+                    return;
+                //#end
+                throw new XML.Exn("unrecognized header node \"" + c.getLocalName() + "\"", XML.Exn.SCHEMA, getLine(), getCol());
 
             case STATE_IN_TEMPLATE_NODE:
                 // push the last node we were in onto the stack
@@ -217,64 +234,56 @@ public class Template {
                 // instantiate a new node, and set its fileName/importlist/preapply
                 Template t2 = new Template(t.r);
                 t2.startLine = getLine();
-                if (!c.localName.equals("box") && !c.localName.equals("template"))
-                    t2.preapply.addElement((c.uri == null ? "" : (c.uri + ".")) + c.localName);
+                if (!c.getLocalName().equals("box") && !c.getLocalName().equals("template"))
+                    t2.preapply.addElement((c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName());
                 // make the new node the current node
                 t = t2;
                 processBodyElement(c);
                 return;
 
             case STATE_FINISHED_TEMPLATE_NODE:
-                throw new XML.SchemaException("no elements may appear after the <template> node");
+                throw new XML.Exn("no elements may appear after the <template> node", XML.Exn.SCHEMA, getLine(), getCol());
             }
         }        
 
         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) 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(), " ");
+            Vec keys = new Vec(c.getAttrLen());
+            Vec vals = new Vec(c.getAttrLen());
+
+            // 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 "preapply":
+                    String uri = c.getAttrUri(i); if (!uri.equals("")) uri += ".";
+                    StringTokenizer tok = new StringTokenizer(c.getAttrVal(i).toString(), " ");
                     while(tok.hasMoreTokens()) t.preapply.addElement(uri + tok.nextToken());
+                    continue ATTR;
 
-                    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]);
-            }
-            t.keys = new String[h.size()];
-            t.vals = new Object[h.size()];
-
-            Vec v = new Vec(h.size(), c.keys);
-            v.sort(new Vec.CompareFunc() { public int compare(Object a, Object b) { return ((String)a).compareTo((String)b); } });
-            for(int i=0; i<h.size(); i++) {
-                if (c.keys[i].equals("thisbox")) {
-                    for(int j=i; j>0; j--) { t.keys[j] = t.keys[j - 1]; t.vals[j] = t.vals[j - 1]; }
-                    t.keys[0] = (String)v.elementAt(i);
-                    t.vals[0] = h.get(t.keys[0]);
-                } else {
-                    t.keys[i] = (String)v.elementAt(i);
-                    t.vals[i] = h.get(t.keys[i]);
-                }
+                case "id":
+                    t.id = c.getAttrVal(i).toString().intern();
+                    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).startsWith(".") ? uri : "") + c.getAttrVal(i));
             }
 
-            for(int i=0; i<t.keys.length; i++) {
-                if (t.keys[i].equals("id")) {
-                    t.id = t.vals[i].toString().intern();
-                    t.keys[i] = null;
-                    continue;
-                }
+            if (keys.size() == 0) return;
+
+            // sort the attributes lexicographically
+            Vec.sort(keys, vals, new Vec.CompareFunc() { public int compare(Object a, Object b) {
+                return ((String)a).compareTo((String)b);
+            } });
 
+            t.keys = new String[keys.size()];
+            t.vals = new Object[vals.size()];
+            keys.copyInto(t.keys);
+            vals.copyInto(t.vals);
+
+            // convert attributes to appropriate types and intern strings
+            for(int i=0; i<t.keys.length; i++) {
                 t.keys[i] = t.keys[i].intern();
 
                 String valString = t.vals[i].toString();
@@ -311,7 +320,7 @@ public class Template {
             return thisscript;
         }
 
-        public void endElement(XML.Element c) throws XML.SchemaException, IOException {
+        public void endElement(XML.Element c) throws XML.Exn, IOException {
             if (state == STATE_IN_XWT_NODE) {
                 if ("static".equals(nameOfHeaderNodeBeingProcessed) && t.content != null) t.staticscript = parseScript(true);
                 nameOfHeaderNodeBeingProcessed = null;
@@ -335,10 +344,10 @@ public class Template {
             }
          }
 
-        public void characters(char[] ch, int start, int length) throws XML.SchemaException {
+        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.SchemaException(
-                t.fileName+ ":" + getLine() + "," + getCol() + ": tabs are not allowed in XWT files");
+            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());
 
             if ("static".equals(nameOfHeaderNodeBeingProcessed) || state == STATE_IN_TEMPLATE_NODE) {
                 if (t.content == null) {
@@ -348,12 +357,12 @@ public class Template {
 
                 t.content.append(ch, start, length);
 
-            } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) {
-                throw new XML.SchemaException("header node <" + nameOfHeaderNodeBeingProcessed + "> cannot have text content");
+            } else if (nameOfHeaderNodeBeingProcessed != null && state != STATE_FINISHED_TEMPLATE_NODE) { throw new XML.Exn(
+                "header node <" +nameOfHeaderNodeBeingProcessed+ "> cannot have text content", XML.Exn.SCHEMA, getLine(), getCol());
             }
         }
 
-        public void whitespace(char[] ch, int start, int length) throws XML.SchemaException { }
+        public void whitespace(char[] ch, int start, int length) throws XML.Exn { }
     }
 
     private static class PerInstantiationJSScope extends JSScope {