Changeset 6740 in josm

Timestamp:

2014-01-19T20:30:57+01:00 (11 years ago)

Author:

simon04

Message:

fix #9191 - MapCSS: Add option to include colour preferences of external styles

The syntax is the same as for the XML styles: name#123456

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/Cascade.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/ColorHelper.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (3 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -171 +172 @@
                 return c;
             if (HEX_COLOR_PATTERN.matcher((String) o).matches()) {
-                return Utils.hexToColor((String) o);
+                return ColorHelper.html2color((String) o);
             }
         }

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.LinkSelector;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
@@ -585 +586 @@
 {
     String val;
-    Token t;
+    Token t, t2;
     float f;
 }
 {
+        LOOKAHEAD(2)
+        t2=<IDENT> t=<HEXCOLOR>
+        { return Main.pref.getColor("mappaint." + (sheet == null ? "MapCSS" : sheet.title) + "." + t2.image, ColorHelper.html2color(t.image)); }
+    |
         t=<IDENT> { return new Keyword(t.image); }
     |
@@ -597 +602 @@
         f=ufloat() { return f; }
     |
-        t=<HEXCOLOR> { return Utils.hexToColor(t.image); }
+        t=<HEXCOLOR> { return ColorHelper.html2color(t.image); }
 }
 

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

@@ -21 +21 @@
         if (html.length() > 0 && html.charAt(0) == '#')
             html = html.substring(1);
+        if (html.length() == 3) {
+            return html2color(new String(
+                    new char[]{html.charAt(0), html.charAt(0), html.charAt(1), html.charAt(1), html.charAt(2), html.charAt(2)}));
+        }
         if (html.length() != 6 && html.length() != 8)
             return null;

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

@@ -630 +630 @@
 
     /**
-     * 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));
-    }
-
-    /**
      * Opens a HTTP connection to the given URL and sets the User-Agent property to JOSM's one.
      * @param httpURL The HTTP url to open (must use http:// or https://)

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.mappaint.MultiCascade
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
+import org.openstreetmap.josm.tools.ColorHelper
 import org.openstreetmap.josm.tools.Utils
 
@@ -81 +82 @@
         def mc3 = new MultiCascade()
         css.apply(mc3, getPrimitive("highway", "footway"), 1, null, false);
-        assert Utils.hexToColor("#FF6644").equals(mc3.getCascade("default").get("color", null, Color.class))
+        assert ColorHelper.html2color("#FF6644").equals(mc3.getCascade("default").get("color", null, Color.class))
     }
 
@@ -217 +218 @@
         assert mc.getCascade(Environment.DEFAULT_LAYER).get("text") == "15 - 1.5 - Foo"
     }
+
+    @Test
+    public void testColorNameTicket9191() throws Exception {
+        def e = new Environment(null, new MultiCascade(), Environment.DEFAULT_LAYER, null)
+        getParser("{color: testcolour1#88DD22}").declaration().get(0).execute(e)
+        def expected = new Color(0x88DD22)
+        assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
+        assert Main.pref.getDefaultColor("MapCSS.testcolour1") == expected
+    }
 }