Changeset 5342 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

Timestamp:

2012-07-15T14:59:10+02:00 (12 years ago)

Author:

Don-vip

Message:

mappaint: fix "real width" painting, broken since r5212 because of a typo error on "real-width" key. Introduction of a StyleKeys interface centralizing key definitions at the same place to avoid same mistake in the future.

File:

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

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

@@ -9 +9 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
+import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 
-abstract public class Instruction {
+abstract public class Instruction implements StyleKeys {
 
     public abstract void execute(Environment env);
@@ -35 +36 @@
             if (val instanceof Expression.LiteralExpression) {
                 Object litValue = ((Expression.LiteralExpression) val).evaluate(null);
-                if (key.equals("text")) {
+                if (key.equals(TEXT)) {
                     /* Special case for declaration 'text: ...'
                      * 
@@ -72 +73 @@
                 value = val;
             }
-            if (key.equals("icon-image") || key.equals("fill-image") || key.equals("pattern-image")) {
+            if (key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals("pattern-image")) {
                 if (value instanceof String) {
                     value = new IconReference((String) value, env.source);