Ticket #22808: 22808.3.patch

src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -127 +128 @@
             createdPrimitives = PurgeCommand.topoSort(createdPrimitives);
         }
         // reversed order, see #14620
-        for (int i = createdPrimitives.size() - 1; i >= 0; i--) {
-            OsmPrimitive osm = createdPrimitives.get(i);
-            Optional<PrimitiveData> previous = preExistingData.stream()
-                    .filter(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId())).findAny();
-            if (previous.isPresent()) {
-                osm.load(previous.get());
-            } else {
-                ds.removePrimitive(osm);
-            }
-        }
+        final List<PrimitiveId> toRemove = new ArrayList<>(this.createdPrimitives.size());
+        ds.update(() -> {
+                    for (int i = createdPrimitives.size() - 1; i >= 0; i--) {
+                        OsmPrimitive osm = createdPrimitives.get(i);
+                        Optional<PrimitiveData> previous = preExistingData.stream()
+                                .filter(pd -> pd.getPrimitiveId().equals(osm.getPrimitiveId())).findAny();
+                        if (previous.isPresent()) {
+                            osm.load(previous.get());
+                        } else {
+                            toRemove.add(osm);
+                        }
+                    }
+                });
+        ds.removePrimitives(toRemove);
     }
 
     @Override

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

@@ -5 +5 @@
 
 import java.awt.geom.Area;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -564 +565 @@
         });
     }
 
+    /**
+     * Removes primitives from the dataset. This method only removes the
+     * primitives form the respective collection of primitives managed
+     * by this dataset, i.e. from {@code store.nodes}, {@code store.ways}, or
+     * {@code store.relations}. References from other primitives to this
+     * primitive are left unchanged.
+     *
+     * @param primitiveIds the ids of the primitive
+     * @throws IllegalStateException if the dataset is read-only
+     * @since xxx
+     */
+    public void removePrimitives(PrimitiveId... primitiveIds) {
+        this.removePrimitives(Arrays.asList(primitiveIds));
+    }
+
+    /**
+     * Removes primitives from the dataset. This method only removes the
+     * primitives form the respective collection of primitives managed
+     * by this dataset, i.e. from {@code store.nodes}, {@code store.ways}, or
+     * {@code store.relations}. References from other primitives to this
+     * primitive are left unchanged.
+     *
+     * @param primitiveIds the ids of the primitive
+     * @throws IllegalStateException if the dataset is read-only
+     * @since xxx
+     */
+    public void removePrimitives(Collection<PrimitiveId> primitiveIds) {
+        checkModifiable();
+        final List<PrimitiveId> selected = new ArrayList<>();
+        update(() -> {
+            clearSelection(primitiveIds);
+            final List<OsmPrimitive> removed = new ArrayList<>(primitiveIds.size());
+            for (PrimitiveId primitiveId : primitiveIds) {
+                OsmPrimitive primitive = this.getPrimitiveByIdChecked(primitiveId);
+                if (primitive == null) {
+                    continue;
+                } else if (primitive.isSelected()) {
+                    selected.add(primitive);
+                }
+                this.removePrimitiveFromStorage(primitive);
+                removed.add(primitive);
+            }
+            firePrimitivesRemoved(removed, false);
+        });
+        if (!selected.isEmpty()) {
+            throw new DataIntegrityProblemException("Primitives were re-selected by a selection listener: "
+            + selected.stream().map(PrimitiveId::toString).collect(Collectors.joining(", ")));
+        }
+    }
+
     private void removePrimitiveImpl(OsmPrimitive primitive) {
         clearSelection(primitive.getPrimitiveId());
         if (primitive.isSelected()) {
             throw new DataIntegrityProblemException("Primitive was re-selected by a selection listener: " + primitive);
         }
+        this.removePrimitiveFromStorage(primitive);
+    }
+
+    private void removePrimitiveFromStorage(OsmPrimitive primitive) {
         store.removePrimitive(primitive);
         allPrimitives.remove(primitive);
         primitive.setDataset(null);