Changeset 18724 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2023-05-10T19:37:19+02:00 (19 months ago)

Author:

taylor.smock

Message:

Fix #22808: Add bulk removal method to DataSet

This fixes an issue where selecting a large number of objects that will be
removed after pasting them will cause a massive number of events to be fired.

File:

• trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) (2 diffs)

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

@@ -18 +18 @@
 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;
 
@@ -128 +129 @@
         }
         // 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);
     }