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

Timestamp:

2009-10-11T16:37:08+02:00 (16 years ago)

Author:

jttt

Message:

Replace testing for id <= 0 with isNew() method

File:

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

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

@@ -109 +109 @@
             String msg = "";
             switch(OsmPrimitiveType.from(primitive)) {
-                case NODE: msg = "Delete node {0}"; break;
-                case WAY: msg = "Delete way {0}"; break;
-                case RELATION:msg = "Delete relation {0}"; break;
+            case NODE: msg = "Delete node {0}"; break;
+            case WAY: msg = "Delete way {0}"; break;
+            case RELATION:msg = "Delete relation {0}"; break;
             }
 
@@ -130 +130 @@
             apiname = t.getAPIName();
             switch(t) {
-                case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
-                case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
-                case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
+            case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
+            case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
+            case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
             }
         }
@@ -185 +185 @@
             return 1;
 
-        String role = new String();
+        String role = "";
         for (RelationMember m : ref.getMembers()) {
             if (m.getMember() == osm) {
@@ -399 +399 @@
             }
             Way w = (Way) primitive;
-            if (w.getId() == 0) { // new ways with id == 0 are fine,
+            if (w.isNew()) { // new ways with id == 0 are fine,
                 continue; // process existing ways only
             }
@@ -407 +407 @@
             // nodes ...
             for (Node n : wnew.getNodes()) {
-                if (n.getId() != 0 || !primitivesToDelete.contains(n)) {
+                if (!n.isNew() || !primitivesToDelete.contains(n)) {
                     nodesToKeep.add(n);
                 }
@@ -470 +470 @@
         if (a != null) {
             for (OsmPrimitive osm : primitivesToDelete) {
-                if (osm instanceof Node && osm.getId() != 0) {
+                if (osm instanceof Node && !osm.isNew()) {
                     Node n = (Node) osm;
                     if (!a.contains(n.getCoor())) {