X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTemplate.java;h=2dbaa3b5116660342ad6242d2574d6c700e2c0ce;hb=0f94de16d032aa04fcfa50056f7964de2fcd2d58;hp=a4cf6867ac2a8fa307966f30d117a24b8da19779;hpb=1ab599d574a6739e6d1c6685fb65bfddf20137ea;p=org.ibex.core.git

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index a4cf686..2dbaa3b 100644
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -58,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);
@@ -125,7 +126,7 @@ public class Template {
         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.numchildren), kid);
+            b.putAndTriggerTraps(JS.N(b.treeSize()), kid);
         }
 
         if (script != null) script.cloneWithNewParentScope(pis).call(null, null, null, null, 0);
@@ -212,16 +213,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].equals("font")) c.vals[i] = c.uris[i] + "." + c.vals[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")) {
-                    String uri = c.uris[i];
+                    // 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]);