Changeset 12053 in josm

Timestamp:

2017-05-03T18:12:48+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #6447: Ensure that only move commands in same layer are combined.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• MoveAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/MoveAction.java

@@ -137 +137 @@
 
         ds.beginUpdate();
-        if (c instanceof MoveCommand && ds.equals(((MoveCommand) c).getAffectedDataSet())
+        if (c instanceof MoveCommand && ds.equals(c.getAffectedDataSet())
                 && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
             ((MoveCommand) c).moveAgain(distx, disty);

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

@@ -711 +711 @@
             return false;
         }
-        Command c = getLastCommand();
+        Command c = getLastCommandInDataset(ds);
         if (mode == Mode.MOVE) {
             if (startEN == null) return false; // fix #8128
@@ -784 +784 @@
      */
     private void useLastMoveCommandIfPossible() {
-        Command c = getLastCommand();
-        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(getLayerManager().getEditDataSet().getSelected());
+        DataSet dataSet = getLayerManager().getEditDataSet();
+        Command c = getLastCommandInDataset(dataSet);
+        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(dataSet.getSelected());
         if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
             // old command was created with different base point of movement, we need to recalculate it
@@ -794 +795 @@
     /**
      * Obtain command in undoRedo stack to "continue" when dragging
+     * @param ds The data set the command needs to be in.
      * @return last command
      */
-    private static Command getLastCommand() {
-        Command c = !Main.main.undoRedo.commands.isEmpty()
-                ? Main.main.undoRedo.commands.getLast() : null;
-        if (c instanceof SequenceCommand) {
-            c = ((SequenceCommand) c).getLastCommand();
-        }
-        return c;
+    private Command getLastCommandInDataset(DataSet ds) {
+        LinkedList<Command> commands = Main.main.undoRedo.commands;
+        if (!commands.isEmpty()) {
+            Command lastCommand = commands.getLast();
+            if (lastCommand instanceof SequenceCommand) {
+                lastCommand = ((SequenceCommand) lastCommand).getLastCommand();
+            }
+            if (ds.equals(lastCommand.getAffectedDataSet())) {
+                return lastCommand;
+            }
+        }
+        return null;
     }
 
@@ -898 +905 @@
             Collection<OsmPrimitive> selection = ds.getSelectedNodesAndWays();
             Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
-            Command c = getLastCommand();
+            Command c = getLastCommandInDataset(ds);
             ds.beginUpdate();
-            if (c instanceof MoveCommand
-                && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
+            if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
                 Node selectedNode = selNodes.iterator().next();
                 EastNorth selectedEN = selectedNode.getEastNorth();