Changeset 9265 in josm for trunk

Timestamp:

2016-01-02T18:34:21+01:00 (8 years ago)

Author:

simon04

Message:

see #7089 see #11968 - Obtain icons from presets for nodes/relations in selection/relation list/editor

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/presets/TaggingPresets.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MenuScroller;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -93 +96 @@
     }
 
+    public static Collection<TaggingPreset> getMatchingPresets(final OsmPrimitive primitive) {
+        return Utils.filter(getTaggingPresets(), new Predicate<TaggingPreset>() {
+            @Override
+            public boolean evaluate(TaggingPreset object) {
+                return object.evaluate(primitive);
+            }
+        });
+    }
+
     /**
      * Adds a list of tagging presets to the current list.

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -65 +65 @@
 import org.openstreetmap.josm.gui.mappaint.Range;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -1331 +1333 @@
                         return new ImageIcon(image);
                     }
+                }
+            }
+        }
+
+        // Check if the presets have icons for nodes/relations.
+        if (!OsmPrimitiveType.WAY.equals(primitive.getType())) {
+            for (final TaggingPreset preset : TaggingPresets.getMatchingPresets(primitive)) {
+                if (preset.getIcon() != null) {
+                    return preset.getIcon();
                 }
             }