Changeset 5118 in josm for trunk/src/org

Timestamp:

2012-03-25T20:18:20+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #7534 - ID# shown twice in pre-upload Validation window

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.util;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -8 +7 @@
 import javax.swing.JLabel;
 
-import org.openstreetmap.josm.Main;
 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;
@@ -46 +43 @@
     public void visit(Node n) {
         name = n.getDisplayName(DefaultNameFormatter.getInstance());
-        addId(n);
         icon = ImageProvider.get("data", "node");
         className = "node";
@@ -59 +55 @@
     public void visit(Way w) {
         name = w.getDisplayName(DefaultNameFormatter.getInstance());
-        addId(w);
         icon = ImageProvider.get("data", "way");
         className = "way";
@@ -70 +65 @@
     public void visit(Relation e) {
         name = e.getDisplayName(DefaultNameFormatter.getInstance());
-        addId(e);
         icon = ImageProvider.get("data", "relation");
         className = "relation";
@@ -79 +73 @@
         return new JLabel(name, icon, JLabel.HORIZONTAL);
     }
-
-    private void addId(OsmPrimitive osm) {
-        if (Main.pref.getBoolean("osm-primitives.showid")) {
-            name += tr(" [id: {0}]", osm.getId());
-        }
-    }
 }