Changeset 3967 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

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/NodeElemStyle.java (modified) (3 diffs)

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

@@ -121 +121 @@
 
     }
-    
+
     public static final NodeElemStyle SIMPLE_NODE_ELEMSTYLE;
     static {
@@ -171 +171 @@
         if (te != null) {
             HorizontalTextAlignment hAlign = HorizontalTextAlignment.RIGHT;
-            String hAlignStr = c.get("text-anchor-horizontal", null, String.class);
-            if (equal(hAlignStr, "left")) {
+            Keyword hAlignKW = c.get("text-anchor-horizontal", Keyword.RIGHT, Keyword.class);
+            if (equal(hAlignKW.val, "left")) {
                 hAlign = HorizontalTextAlignment.LEFT;
-            } else if (equal(hAlignStr, "center")) {
+            } else if (equal(hAlignKW.val, "center")) {
                 hAlign = HorizontalTextAlignment.CENTER;
-            } else if (equal(hAlignStr, "right")) {
+            } else if (equal(hAlignKW.val, "right")) {
                 hAlign = HorizontalTextAlignment.RIGHT;
             }
             VerticalTextAlignment vAlign = VerticalTextAlignment.BOTTOM;
-            String vAlignStr = c.get("text-anchor-vertical", null, String.class);
+            String vAlignStr = c.get("text-anchor-vertical", Keyword.BOTTOM, Keyword.class).val;
             if (equal(vAlignStr, "above")) {
                 vAlign = VerticalTextAlignment.ABOVE;
@@ -203 +203 @@
 
         SymbolShape shape;
-        String shapeStr = c.get("symbol-shape", null, String.class);
-        if (equal(shapeStr, "square")) {
+        Keyword shapeKW = c.get("symbol-shape", null, Keyword.class);
+        if (shapeKW == null)
+            return null;
+        if (equal(shapeKW, "square")) {
             shape = SymbolShape.SQUARE;
-        } else if (equal(shapeStr, "circle")) {
+        } else if (equal(shapeKW, "circle")) {
             shape = SymbolShape.CIRCLE;
         } else