2002/06/17 07:01:40

darcs-hash:20040130064815-2ba56-bb7e064c9e2090c8f9ba3b50b73507bdb662b738.gz

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index e2eb037..74eceee 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -208,14 +208,11 @@ public class Template {
 
         for(int i=0; keys != null && i<keys.length; i++)
             if (keys[i] == null) { }
-            else if (keys[i].equals("border") || keys[i].equals("image")) {
-                if (vals[i].startsWith("http://") || vals[i].startsWith("https://")) {
-                    b.put(keys[i], null, s.substring(0, s.length() - 4));
-                } else {
-                    String s = Resources.resolve(vals[i].toString() + ".png", importlist);
-                    if (s != null) b.put(keys[i], null, s.substring(0, s.length() - 4));
-                    else if (Log.on) Log.log(this, "unable to resolve image " + vals[i].toString() + " referenced in attributes of " + nodeName); 
-                }
+            else if (keys[i].equals("border") || keys[i].equals("image") &&
+                     !vals[i].toString().startsWith("http://") && !vals[i].toString().startsWith("https://")) {
+                String s = Resources.resolve(vals[i].toString() + ".png", importlist);
+                if (s != null) b.put(keys[i], null, s.substring(0, s.length() - 4));
+                else if (Log.on) Log.log(this, "unable to resolve image " + vals[i].toString() + " referenced in attributes of " + nodeName); 
             }
             else b.put(keys[i], null, vals[i]);