Changeset 16838 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

Timestamp:

2020-08-03T22:06:40+02:00 (4 years ago)

Author:

simon04

Message:

see #19622 - Extract OsmPrimitiveImageProvider

File:

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

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

@@ -32 +32 @@
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
@@ -71 +70 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.OsmDataManager;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -100 +97 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.OsmPrimitiveImageProvider;
 import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -695 +693 @@
         protected Optional<ImageIcon> findIcon(String key, String value) {
             final Iterator<OsmPrimitive> osmPrimitiveIterator = sel.iterator();
-            final OsmPrimitive virtual = (osmPrimitiveIterator.hasNext() ? osmPrimitiveIterator.next().getType() : OsmPrimitiveType.NODE)
-                    .newInstance(0, false);
-            if (virtual instanceof INode) {
-                ((INode) virtual).setCoor(LatLon.ZERO);
-            }
-            virtual.put(key, value);
-            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();
-            }
+            final OsmPrimitiveType type = osmPrimitiveIterator.hasNext() ? osmPrimitiveIterator.next().getType() : OsmPrimitiveType.NODE;
+            return OsmPrimitiveImageProvider.getResource(key, value, type)
+                    .map(resource -> resource.getPaddedIcon(ImageProvider.ImageSizes.LARGEICON.getImageDimension()));
         }