2003/10/07 20:37:25

[org.ibex.core.git] / src / org / xwt / Template.java

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 338771d..207f859 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -128,8 +128,8 @@ public class Template {
 
         for(int i=0; keys != null && i<keys.length; i++)
             if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.put(keys[i], pis.get(vals[i]));
-            else if (keys[i].equals("image")) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
-            else b.put(keys[i], vals[i]);
+            else if ("image".equals(keys[i])) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
+            else if (keys[i] != null) b.put(keys[i], vals[i]);
     }
 
 
@@ -350,8 +350,6 @@ public class Template {
             this.myStatic = myStatic;
         }
         public boolean isTransparent() { return true; }
-        public boolean has(Object key) { return false; }
-        public void declare(String s) { super.declare(s); }
         public Object get(Object key) {
             if (key.equals("xwt")) return xwt;
             if (key.equals("static")) return myStatic;