Changeset 12071 in josm for trunk

Timestamp:

2017-05-06T15:13:47+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #14736: Make removePrimitve(Primitive) do a full removal including dataset locking

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -575 +575 @@
             if (primitive == null)
                 return;
-            clearSelection(primitiveId);
-            super.removePrimitive(primitive);
-            allPrimitives.remove(primitive);
-            primitive.setDataset(null);
+            removePrimitiveImpl(primitive);
+            firePrimitivesRemoved(Collections.singletonList(primitive), false);
+        } finally {
+            endUpdate();
+        }
+    }
+
+    private void removePrimitiveImpl(OsmPrimitive primitive) {
+        clearSelection(primitive.getPrimitiveId());
+        super.removePrimitive(primitive);
+        allPrimitives.remove(primitive);
+        primitive.setDataset(null);
+    }
+
+    @Override
+    protected void removePrimitive(OsmPrimitive primitive) {
+        beginUpdate();
+        try {
+            removePrimitiveImpl(primitive);
             firePrimitivesRemoved(Collections.singletonList(primitive), false);
         } finally {
@@ -1253 +1268 @@
                     primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
             if (!toCleanUp.isEmpty()) {
+                // We unselect them in advance to not fire a selection change for every primitive
                 clearSelection(toCleanUp.stream().map(OsmPrimitive::getPrimitiveId));
                 for (OsmPrimitive primitive : toCleanUp) {
-                    allPrimitives.remove(primitive);
-                    removePrimitive(primitive);
-                    primitive.setDataset(null);
+                    removePrimitiveImpl(primitive);
                 }
                 firePrimitivesRemoved(toCleanUp, false);