Changeset 6774 in josm for trunk

Timestamp:

2014-01-29T22:15:06+01:00 (11 years ago)

Author:

simon04

Message:

fix #9633 - MapCSS: allow (named) colours with alpha

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -877 +877 @@
         String colStr = specName != null ? get("color."+specName) : "";
         if (colStr.isEmpty()) {
-            colStr = get("color." + colKey, ColorHelper.color2html(def));
+            colStr = get("color." + colKey, ColorHelper.color2html(def, true));
         }
         if (colStr != null && !colStr.isEmpty()) {
@@ -893 +893 @@
 
     synchronized public boolean putColor(String colKey, Color val) {
-        return put("color."+colKey, val != null ? ColorHelper.color2html(val) : null);
+        return put("color."+colKey, val != null ? ColorHelper.color2html(val, true) : null);
     }
 

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

@@ -52 +52 @@
 |   < REGEX: "/" <REGEX_CHAR_WITHOUT_STAR> ( <REGEX_CHAR_WITHOUT_STAR> | "*" )*  "/" >
 |   < #H: ["0"-"9","a"-"f","A"-"F"] >
-|   < HEXCOLOR: "#" ( <H><H><H><H><H><H> | <H><H><H> ) >
+|   < HEXCOLOR: "#" ( <H><H><H><H><H><H><H><H> | <H><H><H><H><H><H> | <H><H><H> ) >
 |   < S: ( " " | "\t" | "\n" | "\r" | "\f" )+ >
 |   < STAR: "*" >

trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy

@@ -2 +2 @@
 
 import org.openstreetmap.josm.Main
+
+import java.awt.Color
 
 class PreferencesTest extends GroovyTestCase {
@@ -10 +12 @@
 
     void testColorName() {
-        Main.pref.getColorName("color.layer {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx") == "{5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx"
+        assert Main.pref.getColorName("color.layer {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx") == "color.layer {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx"
+    }
+
+    void testColorAlpha() {
+        assert Main.pref.getColor("foo", new Color(0x12345678, true)).alpha == 0x12
+        assert Main.pref.putColor("bar", new Color(0x12345678, true))
+        assert Main.pref.getColor("bar", null).alpha == 0x12
+    }
+
+    void testColorNameAlpha() {
+        assert Main.pref.getColor("foo", "bar", new Color(0x12345678, true)).alpha == 0x12
+        assert Main.pref.getDefaultColor("foo") == new Color(0x34, 0x56, 0x78, 0x12)
+        assert Main.pref.getDefaultColor("foo").alpha == 0x12
     }
 }

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

@@ -225 +225 @@
         def expected = new Color(0x88DD22)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
-        assert Main.pref.getDefaultColor("MapCSS.testcolour1") == expected
+        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour1") == expected
+    }
+
+    @Test
+    public void testColorNameTicket9191Alpha() throws Exception {
+        def e = new Environment(null, new MultiCascade(), Environment.DEFAULT_LAYER, null)
+        getParser("{color: testcolour2#12345678}").declaration().get(0).execute(e)
+        def expected = new Color(0x12, 0x34, 0x56, 0x78)
+        assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
+        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour2") == expected
+    }
+
+    @Test
+    public void testColorParsing() throws Exception {
+        assert ColorHelper.html2color("#12345678") == new Color(0x12, 0x34, 0x56, 0x78)
     }
 }