Changeset 15948 in josm for trunk

Timestamp:

2020-02-27T19:52:44+01:00 (5 years ago)

Author:

simon04

Message:

see #18798, see #14088 - Add robustness for TagEditHelper.AbstractTagsDialog.findIcon

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -699 +699 @@
             }
             virtual.put(key, value);
-            final ImageIcon padded = ImageProvider.getPadded(virtual, ImageProvider.ImageSizes.LARGEICON.getImageDimension(),
-                    EnumSet.of(ImageProvider.GetPaddedOptions.NO_DEFAULT, ImageProvider.GetPaddedOptions.NO_DEPRECATED));
-            return Optional.ofNullable(padded);
+            try {
+                final ImageIcon padded = ImageProvider.getPadded(virtual, ImageProvider.ImageSizes.LARGEICON.getImageDimension(),
+                        EnumSet.of(ImageProvider.GetPaddedOptions.NO_DEFAULT, ImageProvider.GetPaddedOptions.NO_DEPRECATED));
+                return Optional.ofNullable(padded);
+            } catch (Exception e) {
+                Logging.warn("Failed to find icon for {0} {1}={2}", virtual.getType(), key, value);
+                Logging.warn(e);
+                return Optional.empty();
+            }
         }