2003/12/26 00:06:07

darcs-hash:20040130074316-0c9ea-fe3f99dc1c40f3ed29a0cba631f00dfa5eebfd03.gz

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 8538d39..c4cb039 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -38,9 +38,6 @@ public class Picture {
                 try {
                     in = r.getInputStream();
                 } catch (IOException e) {
-                    e.printStackTrace();
-                    Log.log(Picture.class, e);
-                    
                     in = null;
                     if (r instanceof Res.Ref) {
                         // add extensions to the resource, looking for the image

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index dbd39cc..c9ac138 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -121,7 +121,6 @@ public class Template {
 
 
     private void apply(Box b, XWT xwt, PerInstantiationJSScope parentPis) throws JSExn {
-
         getStatic();
 
         if (id != null) parentPis.putDollar(id, b);
@@ -140,22 +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);
-            }
-            else if ("fill".equals(keys[i]) && ((String)vals[i]).indexOf('.') >= 0) {
-                b.putAndTriggerTraps("fill", resolveStringToResource((String)vals[i], xwt, true));
+        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 ("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);
+        }
     }
 
 
@@ -244,21 +253,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 +264,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 +277,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);