Changeset 36130 in osm for applications

Timestamp:

2023-09-07T15:32:08+02:00 (10 months ago)

Author:

taylor.smock

Message:

Fix #23159: utilsplugin2 Split Object command could cause DataIntegrityProblemException when the split way was part of a relation

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (modified) (5 diffs)
• test/unit/org (added)
• test/unit/org/openstreetmap (added)
• test/unit/org/openstreetmap/josm (added)
• test/unit/org/openstreetmap/josm/plugins (added)
• test/unit/org/openstreetmap/josm/plugins/utilsplugin2 (added)
• test/unit/org/openstreetmap/josm/plugins/utilsplugin2/actions (added)
• test/unit/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectActionTest.java (added)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java

@@ -47 +47 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -52 +53 @@
 /**
  * Splits a closed way (polygon) into two closed ways or a multipolygon into two separate multipolygons.
- *
+ * <p>
  * The closed ways are just split at the selected nodes (which must be exactly two).
  * The nodes remain in their original order.
- *
+ * <p>
  * This is similar to SplitWayAction with the addition that the split ways are closed
  * immediately.
@@ -74 +75 @@
     /**
      * Called when the action is executed.
-     *
+     * <p>
      * This method performs an expensive check whether the selection clearly defines one
      * of the split actions outlined above, and if yes, calls the splitObject method.
@@ -259 +260 @@
             if (splitWay != null) {
                 result.executeCommand();
-                DeleteCommand delCmd = new DeleteCommand(splitWay);
+                Command delCmd = DeleteCommand.delete(Collections.singletonList(splitWay));
                 delCmd.executeCommand();
                 UndoRedoHandler.getInstance().add(new SplitObjectCommand(Arrays.asList(result, delCmd)), false);
@@ -337 +338 @@
 
         } catch (IllegalArgumentException e) {
+            Logging.trace(e);
             // Changes were already undone in splitMultipolygonAtWay
             showWarningNotification(e.getMessage());