Changeset 4918 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

Timestamp:

2012-02-11T18:56:53+01:00 (14 years ago)

Author:

simon04

Message:

fix #7370 - Refactor Command.getDescription

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (5 diffs)

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

@@ -19 +19 @@
 import java.util.Set;
 import java.util.Map.Entry;
+import javax.swing.Icon;
 
 import javax.swing.JLabel;
@@ -149 +150 @@
     }
 
-    @Override public JLabel getDescription() {
-        if (toDelete.size() == 1) {
+    private Set<OsmPrimitiveType> getTypesToDelete() {
+        Set<OsmPrimitiveType> typesToDelete = new HashSet<OsmPrimitiveType>();
+        for (OsmPrimitive osm : toDelete) {
+            typesToDelete.add(OsmPrimitiveType.from(osm));
+        }
+        return typesToDelete;
+    }
+
+    @Override
+    public String getDescriptionText() {
+           if (toDelete.size() == 1) {
             OsmPrimitive primitive = toDelete.iterator().next();
             String msg = "";
@@ -159 +169 @@
             }
 
-            return new JLabel(tr(msg, primitive.getDisplayName(DefaultNameFormatter.getInstance())),
-                    ImageProvider.get(OsmPrimitiveType.from(primitive)), JLabel.HORIZONTAL);
+            return tr(msg, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
         } else {
-            Set<OsmPrimitiveType> typesToDelete = new HashSet<OsmPrimitiveType>();
-            for (OsmPrimitive osm : toDelete) {
-                typesToDelete.add(OsmPrimitiveType.from(osm));
-            }
+            Set<OsmPrimitiveType> typesToDelete = getTypesToDelete();
             String msg = "";
-            String apiname = "object";
             if (typesToDelete.size() > 1) {
                 msg = trn("Delete {0} object", "Delete {0} objects", toDelete.size(), toDelete.size());
             } else {
                 OsmPrimitiveType t = typesToDelete.iterator().next();
-                apiname = t.getAPIName();
                 switch(t) {
                 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
@@ -179 +183 @@
                 }
             }
-            return  new JLabel(msg, ImageProvider.get("data", apiname), JLabel.HORIZONTAL);
+            return msg;
+        }
+    }
+
+    @Override
+    public Icon getDescriptionIcon() {
+        if (toDelete.size() == 1) {
+            return ImageProvider.get(OsmPrimitiveType.from(toDelete.iterator().next()));
+        }
+        Set<OsmPrimitiveType> typesToDelete = getTypesToDelete();
+        if (typesToDelete.size() > 1) {
+            return ImageProvider.get("data", "object");
+        } else {
+            return ImageProvider.get(typesToDelete.iterator().next());
         }
     }
@@ -190 +207 @@
             for (final OsmPrimitive osm : toDelete) {
                 children.add(new PseudoCommand() {
-                    @Override public JLabel getDescription() {
-                        return new JLabel(
-                                tr("Deleted ''{0}''",
-                                        osm.getDisplayName(DefaultNameFormatter.getInstance())),
-                                        ImageProvider.get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL);
+
+                    @Override public String getDescriptionText() {
+                        return tr("Deleted ''{0}''", osm.getDisplayName(DefaultNameFormatter.getInstance()));
                     }
+
+                    @Override public Icon getDescriptionIcon() {
+                        return ImageProvider.get(OsmPrimitiveType.from(osm));
+                    }
+
                     @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
                         return Collections.singleton(osm);