Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.*;
-
-import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -62 +64 @@
 
     @Override public MutableTreeNode description() {
-        NameVisitor v = new NameVisitor();
-        relation.visit(v);
-        return new DefaultMutableTreeNode(new JLabel(tr("Remove relation member {0} {1}", tr(v.className), v.name), v.icon, JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(
+                new JLabel(
+                        tr("Remove relation member {0} {1}",
+                                OsmPrimitiveType.from(relation).getLocalizedDisplayNameSingular(),
+                                new PrimitiveNameFormatter().getName(relation)
+                        ),
+                        ImageProvider.get(OsmPrimitiveType.from(relation)),
+                        JLabel.HORIZONTAL
+                )
+        );
     }
 }