Changeset 3967 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml

Timestamp:

2011-03-09T16:01:54+01:00 (13 years ago)

Author:

bastiK

Message:

MapCSS: an identifier literal at the right side of a declaration is now parsed as Keyword and not as String. This means 'color: "blue";' does not work any longer, but you have to write 'color: blue;'. This is useful for future extensions.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
+import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.Range;
@@ -288 +289 @@
                     if (icon.annotate != null) {
                         if (icon.annotate) {
-                            def.put("text", "auto");
+                            def.put("text", Keyword.AUTO);
                         } else {
                             def.remove("text");
@@ -352 +353 @@
             if (p.area != null) {
                 def.putOrClear("fill-color", p.area.color);
-                def.putOrClear("text-position", "center");
-                def.putOrClear("text", "auto");
+                def.putOrClear("text-position", Keyword.CENTER);
+                def.putOrClear("text", Keyword.AUTO);
                 def.remove("fill-image");
             }