Changeset 5383 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2012-07-30T19:53:01+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7671 - Show last N used tags in "Add key/value" dialog for selecting with a single click

LRU tags are shown in reverse order (most recent first).

This can be customized by setting the property properties.recently-added-tags to an integer between 1 and 9.
This can be disabled by setting the same property to a number lesser or equal to 0.

Keyboard shortcuts Ctrl+1 to Ctrl+9 are available in the context of the "Add property" dialog only.

File:

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

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

@@ -11 +11 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -19 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
@@ -118 +122 @@
                 .setArchive(source.zipIcons)
                 .setOptional(true).get();
+    }
+    
+    public static ImageIcon getNodeIcon(Tag tag) {
+        return getNodeIcon(tag, true);
+    }
+    
+    public static ImageIcon getNodeIcon(Tag tag, boolean includeDeprecatedIcon) {
+        if (tag != null) {
+            Node virtualNode = new Node();
+            virtualNode.put(tag.getKey(), tag.getValue());
+            StyleList styleList = getStyles().generateStyles(virtualNode, 0, null, false).a;
+            if (styleList != null) {
+                for (Iterator<ElemStyle> it = styleList.iterator(); it.hasNext(); ) {
+                    ElemStyle style = it.next();
+                    if (style instanceof NodeElemStyle) {
+                        MapImage mapImage = ((NodeElemStyle) style).mapImage;
+                        if (mapImage != null) {
+                            if (includeDeprecatedIcon || mapImage.name == null || !mapImage.name.equals("misc/deprecated.png")) {
+                                return new ImageIcon(mapImage.getImage());
+                            } else {
+                                return null; // Deprecated icon found but not wanted
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return null;
     }