2002/06/17 06:46:18

darcs-hash:20040130064813-2ba56-c45d575f3e96f8b05a8ef98d34812ba7d8275cce.gz

diff --git a/CHANGES b/CHANGES
index c4100c4..0dbdfb5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -195,3 +195,5 @@
 
 16-Jun megacz Resources.java: eliminated some annoying warning messages
 
+16-Jun megacz Template.java: fixed erroneous attribute checks for numbers and image/border
+

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 7ff09ce..e2eb037 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -209,9 +209,13 @@ 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")) {
-                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); 
+                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 b.put(keys[i], null, vals[i]);
 
@@ -526,11 +530,8 @@ public class Template {
                     boolean periodUsed = false;
                     for(int j=0; j<valString.length(); j++)
                         if (j == 0 && valString.charAt(j) == '-') {
-                        } else if (valString.charAt(j) == '.' && !periodUsed && j != valString.length() - 1)
+                        } else if (valString.charAt(j) == '.' && !periodUsed && j != valString.length() - 1) {
                             periodUsed = true;
-                        else if (valString.charAt(j) == '0' && (j == 0 || (j == 1 && valString.charAt(0) == '-'))) {
-                            hasNonNumeral = true;
-                            break;
                         } else if (!Character.isDigit(valString.charAt(j))) {
                             hasNonNumeral = true;
                             break;