Changeset 12071 in josm
- Timestamp:
- 2017-05-06T15:13:47+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r12069 r12071 575 575 if (primitive == null) 576 576 return; 577 clearSelection(primitiveId); 578 super.removePrimitive(primitive); 579 allPrimitives.remove(primitive); 580 primitive.setDataset(null); 577 removePrimitiveImpl(primitive); 578 firePrimitivesRemoved(Collections.singletonList(primitive), false); 579 } finally { 580 endUpdate(); 581 } 582 } 583 584 private void removePrimitiveImpl(OsmPrimitive primitive) { 585 clearSelection(primitive.getPrimitiveId()); 586 super.removePrimitive(primitive); 587 allPrimitives.remove(primitive); 588 primitive.setDataset(null); 589 } 590 591 @Override 592 protected void removePrimitive(OsmPrimitive primitive) { 593 beginUpdate(); 594 try { 595 removePrimitiveImpl(primitive); 581 596 firePrimitivesRemoved(Collections.singletonList(primitive), false); 582 597 } finally { … … 1253 1268 primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew())); 1254 1269 if (!toCleanUp.isEmpty()) { 1270 // We unselect them in advance to not fire a selection change for every primitive 1255 1271 clearSelection(toCleanUp.stream().map(OsmPrimitive::getPrimitiveId)); 1256 1272 for (OsmPrimitive primitive : toCleanUp) { 1257 allPrimitives.remove(primitive); 1258 removePrimitive(primitive); 1259 primitive.setDataset(null); 1273 removePrimitiveImpl(primitive); 1260 1274 } 1261 1275 firePrimitivesRemoved(toCleanUp, false);
Note:
See TracChangeset
for help on using the changeset viewer.