Changeset 7382 in josm for trunk/src/org

Timestamp:

2014-08-13T14:36:08+02:00 (10 years ago)

Author:

bastiK

Message:

fix [7378]

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

@@ -36 +36 @@
             this.key = key;
             this.isSetInstruction = isSetInstruction;
-            if (val instanceof Keyword) {
-                if ("none".equals(((Keyword) val).val)) {
-                    this.val = null;
-                } else {
-                    this.val = val;
-                }
-            } else if (val instanceof LiteralExpression) {
+            if (val instanceof LiteralExpression) {
                 Object litValue = ((LiteralExpression) val).evaluate(null);
-                if (key.equals(TEXT)) {
+                if (litValue instanceof Keyword) {
+                    if ("none".equals(((Keyword) litValue).val)) {
+                        this.val = null;
+                    } else {
+                        this.val = val;
+                    }
+                } else if (key.equals(TEXT)) {
                     /* Special case for declaration 'text: ...'
                      *