Changeset 6740 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-01-19T20:30:57+01:00 (10 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/src/org/openstreetmap/josm/gui/mappaint

Files:

• Cascade.java (modified) (2 diffs)
• mapcss/MapCSSParser.jj (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); }
 }