Changeset 12316 in josm for trunk/src/org

Timestamp:

2017-06-04T20:59:41+02:00 (7 years ago)

Author:

michael2402

Message:

Add a method to undo/redo to get the last command.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MoveAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• data/UndoRedoHandler.java (modified) (2 diffs)

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

@@ -133 +133 @@
         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
 
-        Command c = !Main.main.undoRedo.commands.isEmpty()
-        ? Main.main.undoRedo.commands.getLast() : null;
+        Command c = Main.main.undoRedo.getLastCommand();
 
         ds.beginUpdate();

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

@@ -1323 +1323 @@
         public void actionPerformed(ActionEvent e) {
             Main.main.undoRedo.undo();
-            Command lastCmd = Main.main.undoRedo.commands.peekLast();
+            Command lastCmd = Main.main.undoRedo.getLastCommand();
             if (lastCmd == null) return;
             Node n = null;

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

@@ -809 +809 @@
      */
     private static 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;
+        Command lastCommand = Main.main.undoRedo.getLastCommand();
+        if (lastCommand instanceof SequenceCommand) {
+            lastCommand = ((SequenceCommand) lastCommand).getLastCommand();
+        }
+        if (lastCommand != null && ds.equals(lastCommand.getAffectedDataSet())) {
+            return lastCommand;
+        } else {
+            return null;
+        }
     }
 

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -29 +29 @@
     /**
      * All commands that were made on the dataset. Don't write from outside!
+     *
+     * @see #getLastCommand()
      */
     public final LinkedList<Command> commands = new LinkedList<>();
@@ -43 +45 @@
     public UndoRedoHandler() {
         Main.getLayerManager().addLayerChangeListener(this);
+    }
+
+    /**
+     * Gets the last command that was executed on the command stack.
+     * @return That command or <code>null</code> if there is no such command.
+     * @since #12316
+     */
+    public Command getLastCommand() {
+        return commands.peekLast();
     }