Changeset 2414 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2009-11-08T19:55:39+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r2333 r2414 55 55 */ 56 56 public DeleteCommand(Collection<? extends OsmPrimitive> data) throws IllegalArgumentException { 57 if (data == null) 57 if (data == null) 58 58 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty")); 59 59 if (data.isEmpty()) 60 throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection")); 60 throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection")); 61 61 this.toDelete = data; 62 62 } … … 101 101 public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{ 102 102 super(layer); 103 if (data == null) 103 if (data == null) 104 104 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty")); 105 105 if (data.isEmpty()) 106 throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection")); 106 throw new IllegalArgumentException(tr("At least one object to delete requird, got empty collection")); 107 107 this.toDelete = data; 108 108 } … … 160 160 String msg = ""; 161 161 switch(OsmPrimitiveType.from(primitive)) { 162 163 164 162 case NODE: msg = "Delete node {0}"; break; 163 case WAY: msg = "Delete way {0}"; break; 164 case RELATION:msg = "Delete relation {0}"; break; 165 165 } 166 166 … … 181 181 apiname = t.getAPIName(); 182 182 switch(t) { 183 184 185 183 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break; 184 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break; 185 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break; 186 186 } 187 187 } … … 316 316 return null; 317 317 318 BackreferencedDataSet backreferences = new BackreferencedDataSet(layer.data); 319 backreferences.build(); 320 318 BackreferencedDataSet backreferences = new BackreferencedDataSet(); 321 319 Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection); 322 320 Collection<Way> waysToBeChanged = new HashSet<Way>(); -
trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java
r2198 r2414 178 178 public boolean executeCommand() { 179 179 if (backreferenceDataSet == null) { 180 backreferenceDataSet = new BackreferencedDataSet(getLayer().data); 181 backreferenceDataSet.build(); 180 backreferenceDataSet = new BackreferencedDataSet(); 182 181 } 183 182 HashSet<OsmPrimitive> hive = new HashSet<OsmPrimitive>();
Note: See TracChangeset
for help on using the changeset viewer.