Changeset 5577 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)

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); }
 }