Changeset 10927 in josm for trunk

Timestamp:

2016-09-01T20:00:55+02:00 (8 years ago)

Author:

simon04

Message:

see #13217 - Only one location for deprecated icon names

Location:

trunk

Files:

• scripts/TagInfoExtract.groovy (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (1 diff)

trunk/scripts/TagInfoExtract.groovy

@@ -128 +128 @@
             def image = c.get("icon-image")
             if (image) {
-                if (image instanceof IconReference) {
-                    if (image.iconName != "misc/deprecated.svg")
-                        return find_image_url(image.iconName)
+                if (image instanceof IconReference && !image.isDeprecatedIcon()) {
+                    return find_image_url(image.iconName)
                 }
             }

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

@@ -111 +111 @@
         public String toString() {
             return "IconReference{" + "iconName='" + iconName + "' source='" + source.getDisplayString() + "'}";
+        }
+
+        /**
+         * Determines whether this icon represents a deprecated icon
+         * @return whether this icon represents a deprecated icon
+         * @since 10927
+         */
+        public boolean isDeprecatedIcon() {
+            return DEPRECATED_IMAGE_NAMES.contains(iconName);
         }
     }