Changeset 35842 in osm

Timestamp:

2021-11-02T07:40:02+01:00 (3 years ago)

Author:

GerdP

Message:

fix #21491: Split Object (Alt+X) action sometimes adds multiple commands to stack
If multiple commands were generated, combine them into a single "Split Object" command

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java (modified) (6 diffs)

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

@@ -90 +90 @@
         List<Relation> selectedRelations = new ArrayList<>(ds.getSelectedRelations());
 
-        Relation selectedMultipolygon = null;
         Way selectedWay = null;
         Way splitWay = null;
@@ -119 +118 @@
 
         if ((selectedRelations.size() == 1) && selectedRelations.get(0).isMultipolygon()) {
-            selectedMultipolygon = selectedRelations.get(0);
-        }
-
-        if (selectedMultipolygon != null) {
+            Relation selectedMultipolygon = selectedRelations.get(0);
             if (splitWay == null) {
                 showWarningNotification(tr("Splitting multipolygons requires a split way to be selected"));
@@ -261 +257 @@
             SplitWayCommand result = SplitWayCommand.splitWay(
                     selectedWay, wayChunks, Collections.<OsmPrimitive>emptyList());
-            UndoRedoHandler.getInstance().add(result);
-            if (splitWay != null)
-                UndoRedoHandler.getInstance().add(new DeleteCommand(splitWay));
+            if (splitWay != null) {
+                result.executeCommand();
+                DeleteCommand delCmd = new DeleteCommand(splitWay);
+                delCmd.executeCommand();
+                UndoRedoHandler.getInstance().add(new SplitObjectCommand(Arrays.asList(result, delCmd)), false);
+            } else {
+                UndoRedoHandler.getInstance().add(result);
+            }
             getLayerManager().getEditDataSet().setSelected(result.getNewSelection());
         }
+
     }
 
@@ -326 +328 @@
                 }
             }
-
-            for (Command mpSplitCommand : commands) {
-                UndoRedoHandler.getInstance().add(mpSplitCommand, false);
-            }
+            if (commands.size() > 1)
+                UndoRedoHandler.getInstance().add(new SplitObjectCommand(commands), false);
+            else
+                UndoRedoHandler.getInstance().add(commands.iterator().next(), false);
 
             mpRelation.getDataSet().setSelected(mpRelations);
@@ -501 +503 @@
                 mpCreationCommands.add(new ChangeMembersCommand(mpRelation, mpMembers));
                 mpCreationCommands.add(new AddCommand(mpRelation.getDataSet(), newMpRelation));
-
-                SequenceCommand sequenceCommand = new SequenceCommand(mpRelation.getDataSet(), "Split Multipolygon", mpCreationCommands, false);
-                sequenceCommand.executeCommand();
-                commands.add(sequenceCommand);
+                mpCreationCommands.forEach(Command::executeCommand);
+                commands.addAll(mpCreationCommands);
 
                 mpRelations.add(newMpRelation);
@@ -595 +595 @@
         .setIcon(JOptionPane.WARNING_MESSAGE).show();
     }
+
+    private static class SplitObjectCommand extends SequenceCommand {
+        SplitObjectCommand(Collection<Command> sequenz) {
+            super(tr("Split Object"), sequenz, true);
+            setSequenceComplete(true);
+        }
+    }
 }