Changeset 15668 in josm

Timestamp:

2020-01-10T00:02:42+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18540 - use correct primitive icons in validator dialog

File:

• trunk/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -41 +42 @@
     public Icon icon;
 
-    private static final Icon nodeIcon = ImageProvider.get("data", "node");
-    private static final Icon wayIcon = ImageProvider.get("data", "way");
-    private static final Icon relIcon = ImageProvider.get("data", "relation");
+    protected void setIcon(OsmPrimitive p) {
+        icon = ImageProvider.get(p.getDisplayType());
+    }
 
     /**
@@ -51 +52 @@
     public void visit(Node n) {
         name = n.getDisplayName(DefaultNameFormatter.getInstance());
-        icon = nodeIcon;
+        setIcon(n);
         className = "node";
         classNamePlural = trn("node", "nodes", 2);
@@ -63 +64 @@
     public void visit(Way w) {
         name = w.getDisplayName(DefaultNameFormatter.getInstance());
-        icon = wayIcon;
+        setIcon(w);
         className = "way";
         classNamePlural = trn("way", "ways", 2);
@@ -71 +72 @@
     public void visit(Relation e) {
         name = e.getDisplayName(DefaultNameFormatter.getInstance());
-        icon = relIcon;
+        setIcon(e);
         className = "relation";
         classNamePlural = trn("relation", "relations", 2);