Changeset 5577 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-11-12T21:38:11+01:00 (12 years ago)

Author:

bastiK

Message:

fixed #8187 - eval(#colour) doesn't result in #colour value suitable for color

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/mappaint/Cascade.java (modified) (4 diffs)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -22 +24 @@
     protected Map<String, Object> prop = new HashMap<String, Object>();
 
+    private final static Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})");
+
     public <T> T get(String key, T def, Class<T> klass) {
         return get(key, def, klass, false);
@@ -28 +32 @@
     /**
      * Get value for the given key
+     * @param <T> the expected type
      * @param key the key
      * @param def default value, can be null
@@ -165 +170 @@
         if (o instanceof Keyword)
             return CSSColors.get(((Keyword) o).val);
+        if (o instanceof String) {
+            Color c = CSSColors.get((String) o);
+            if (c != null)
+                return c;
+            if (HEX_COLOR_PATTERN.matcher((String) o).matches()) {
+                return Utils.hexToColor((String) o);
+            }
+        }
         return null;
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.LinkSelector;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 public class MapCSSParser {
@@ -553 +554 @@
         f=ufloat() { return f; }
     |
-        t=<HEXCOLOR>
-            {
-                String clr = t.image.substring(1);
-                if (clr.length() == 3) {
-                    clr = new String(new char[] {clr.charAt(0),clr.charAt(0),clr.charAt(1),clr.charAt(1),clr.charAt(2),clr.charAt(2)});
-                }
-                if (clr.length() != 6)
-                    throw new AssertionError();
-                return new Color(Integer.parseInt(clr, 16));
-            }
+        t=<HEXCOLOR> { return Utils.hexToColor(t.image); }
 }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -546 +546 @@
         };
     }
+
+    /**
+     * Convert Hex String to Color.
+     * @param s Must be of the form "#34a300" or "#3f2", otherwise throws Exception.
+     * Upper/lower case does not matter.
+     * @return The corresponding color.
+     */
+    static public Color hexToColor(String s) {
+        String clr = s.substring(1);
+        if (clr.length() == 3) {
+            clr = new String(new char[] {
+                clr.charAt(0), clr.charAt(0), clr.charAt(1), clr.charAt(1), clr.charAt(2), clr.charAt(2)
+            });
+        }
+        if (clr.length() != 6)
+            throw new IllegalArgumentException();
+        return new Color(Integer.parseInt(clr, 16));
+    }
+
 }