Changeset 19227 in josm for trunk/src

Timestamp:

2024-09-19T15:38:39+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #20908: IllegalStateException: JOSM expected to find primitive in dataset after undoing a Parallel mode action

The test acts (roughly) like a user would, and performs click and drags via a new
utility class (MapModeUtils) which has various methods for performing mouse
actions on the map view.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -13 +13 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -18 +19 @@
 import java.util.EnumSet;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -287 +289 @@
         // Since the created way is left selected, we need to unselect again here
         if (pWays != null && pWays.getWays() != null) {
-            getLayerManager().getEditDataSet().clearSelection(pWays.getWays());
+            final List<Way> ways = new ArrayList<>(pWays.getWays());
+            ways.removeIf(w -> w.getDataSet() == null);
+            getLayerManager().getEditDataSet().clearSelection(ways);
             pWays = null;
         }