Changeset 1826 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-07-24T11:19:32+02:00 (15 years ago)

Author:

stoecker

Message:

fixed exception

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (1 diff)

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

@@ -90 +90 @@
 
         String cname = null;
+        String apiname = null;
         String cnamem = null;
         for (OsmPrimitive osm : toDelete) {
             if (cname == null) {
+                apiname = OsmPrimitiveType.from(osm).getAPIName();
                 cname = OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular();
-                cnamem = OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular();
+                cnamem = OsmPrimitiveType.from(osm).getLocalizedDisplayNamePlural();
             } else if (!cname.equals(OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular())) {
-                cname = "object";
+                apiname = "object";
+                cname = trn("object", "objects", 1);
                 cnamem = trn("object", "objects", 2);
             }
         }
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(tr("Delete {0} {1}", toDelete.size(), trn(
-                cname, cnamem, toDelete.size())), ImageProvider.get("data", cname), JLabel.HORIZONTAL));
+                cname, cnamem, toDelete.size())), ImageProvider.get("data", apiname), JLabel.HORIZONTAL));
         for (OsmPrimitive osm : toDelete) {
             root.add(new DefaultMutableTreeNode(