2003/11/22 07:48:52

darcs-hash:20040130074203-0c9ea-359caceab2f75db12ffa206afd078d153486694f.gz

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index a4cf686..2921cde 100644 (file)
--- 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);
@@ -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]);

diff --git a/src/org/xwt/util/XML.java b/src/org/xwt/util/XML.java
index 099acce..e652f38 100644 (file)
--- a/src/org/xwt/util/XML.java
+++ b/src/org/xwt/util/XML.java
@@ -452,21 +452,19 @@ public abstract class XML
                 current.defaultUri = v;
             }
         } else {
-            // check to see if attribute is a repeat
-            for (int i=0; current.len > i; i++) if (n.equals(current.keys[i])) throw new WFCException(
-                "attribute name '"+n+"' may not appear more than once in the same element tag", getLine(), getCol()
-            );
-
             // find attribute uri
             if (p == null) {
-                u = current.uri;
+                for (Element e = current; e != null && u == null; e = e.prev) { u = e.uri; }
             } else {
-                for (Element e = current; e != null && u == null; e = e.prev) {
-                    u = (String)e.urimap.get(p);
-                }
+                for (Element e = current; e != null && u == null; e = e.prev) { u = (String)e.urimap.get(p); }
                 if (u == null) current.addError(new NCException("undefined attribute prefix '"+current.prefix+"'", getLine(), getCol()));
             }
 
+            // check to see if attribute is a repeat
+            for (int i=0; current.len > i; i++) if (n.equals(current.keys[i]) && u.equals(current.uris[i])) throw new WFCException(
+                "attribute name '"+n+"' may not appear more than once in the same element tag", getLine(), getCol()
+            );
+
             // add attribute to the attribute arrays
             if (current.len == current.keys.length) current.morekeys();
             current.keys[current.len] = n;
@@ -851,7 +849,11 @@ public abstract class XML
 
         /** empty out the arrays */
         void clear() {
-            for (int i=0; len > i; i++) { keys[i] = null; vals[i] = null; uris[i] = null; }; len = 0;
+            if (keys.length != vals.length || vals.length != uris.length) {
+                keys = new String[10]; vals = new String[10]; uris = new String[10];
+            } else {
+                for (int i=0; keys.length > i; i++) { keys[i] = null; vals[i] = null; uris[i] = null; }; len = 0;
+            }
             errors = new XMLException[] {};
         }