Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2009-10-11T16:37:08+02:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r2173 r2273 109 109 String msg = ""; 110 110 switch(OsmPrimitiveType.from(primitive)) { 111 112 113 111 case NODE: msg = "Delete node {0}"; break; 112 case WAY: msg = "Delete way {0}"; break; 113 case RELATION:msg = "Delete relation {0}"; break; 114 114 } 115 115 … … 130 130 apiname = t.getAPIName(); 131 131 switch(t) { 132 133 134 132 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break; 133 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break; 134 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break; 135 135 } 136 136 } … … 185 185 return 1; 186 186 187 String role = new String();187 String role = ""; 188 188 for (RelationMember m : ref.getMembers()) { 189 189 if (m.getMember() == osm) { … … 399 399 } 400 400 Way w = (Way) primitive; 401 if (w. getId() == 0) { // new ways with id == 0 are fine,401 if (w.isNew()) { // new ways with id == 0 are fine, 402 402 continue; // process existing ways only 403 403 } … … 407 407 // nodes ... 408 408 for (Node n : wnew.getNodes()) { 409 if ( n.getId() != 0|| !primitivesToDelete.contains(n)) {409 if (!n.isNew() || !primitivesToDelete.contains(n)) { 410 410 nodesToKeep.add(n); 411 411 } … … 470 470 if (a != null) { 471 471 for (OsmPrimitive osm : primitivesToDelete) { 472 if (osm instanceof Node && osm.getId() != 0) {472 if (osm instanceof Node && !osm.isNew()) { 473 473 Node n = (Node) osm; 474 474 if (!a.contains(n.getCoor())) {
Note: See TracChangeset
for help on using the changeset viewer.