Changeset 7014 in josm for trunk

Timestamp:

2014-04-27T15:57:23+02:00 (10 years ago)

Author:

Don-vip

Message:

MapCSS: drop deprecated pattern-image support

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (2 diffs)
• LinePatternElemStyle.java (deleted)
• mapcss/Instruction.java (modified) (1 diff)

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

@@ -323 +323 @@
             if (osm instanceof Way) {
                 addIfNotNull(sl, AreaElemStyle.create(c));
-                addIfNotNull(sl, LinePatternElemStyle.create(env));
                 addIfNotNull(sl, RepeatImageElemStyle.create(env));
                 addIfNotNull(sl, LineElemStyle.createLine(env));
@@ -341 +340 @@
                 if (((Relation)osm).isMultipolygon()) {
                     addIfNotNull(sl, AreaElemStyle.create(c));
-                    addIfNotNull(sl, LinePatternElemStyle.create(env));
                     addIfNotNull(sl, RepeatImageElemStyle.create(env));
                     addIfNotNull(sl, LineElemStyle.createLine(env));

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

@@ -75 +75 @@
                 value = val;
             }
-            if (key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals("pattern-image") || key.equals(REPEAT_IMAGE)) {
+            if (key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals(REPEAT_IMAGE)) {
                 if (value instanceof String) {
                     value = new IconReference((String) value, env.source);