Changeset 10926 in josm for trunk

Timestamp:

2016-09-01T16:30:34+02:00 (8 years ago)

Author:

michael2402

Message:

fix #13506 - Do not show deprecated.svg icon in add/edit tag dialog

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (2 diffs)

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

@@ -54 +54 @@
              "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5";
 
+    private static final Collection<String> DEPRECATED_IMAGE_NAMES = Arrays.asList(
+            "presets/misc/deprecated.svg",
+            "misc/deprecated.png");
+
     private static ElemStyles styles = new ElemStyles();
 
@@ -203 +207 @@
                         MapImage mapImage = ((NodeElement) style).mapImage;
                         if (mapImage != null) {
-                            if (includeDeprecatedIcon || mapImage.name == null || !"misc/deprecated.png".equals(mapImage.name)) {
+                            if (includeDeprecatedIcon || mapImage.name == null || !DEPRECATED_IMAGE_NAMES.contains(mapImage.name)) {
                                 return new ImageIcon(mapImage.getImage(false));
                             } else {