Changeset 14281 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-09-30T00:46:01+02:00 (6 years ago)

Author:

Don-vip

Message:

see #12726 - accessors for undo/redo commands

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (2 diffs)
• actions/RedoAction.java (modified) (2 diffs)
• actions/UndoAction.java (modified) (2 diffs)
• data/UndoRedoHandler.java (modified) (3 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (3 diffs)

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

@@ -569 +569 @@
             if (addUndoRedo) {
                 UndoRedoHandler.getInstance().undo();
-                UndoRedoHandler.getInstance().redoCommands.clear();
+                UndoRedoHandler.getInstance().getRedoCommands().clear();
             }
         }
@@ -1601 +1601 @@
         if (addUndoRedo) {
             UndoRedoHandler ur = UndoRedoHandler.getInstance();
-            int i = Math.max(ur.commands.size() - cmdsCount, 0);
-            for (; i < ur.commands.size(); i++) {
-                cmds.add(ur.commands.get(i));
+            List<Command> commands = ur.getUndoCommands();
+            int i = Math.max(commands.size() - cmdsCount, 0);
+            for (; i < commands.size(); i++) {
+                cmds.add(commands.get(i));
             }
 

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

@@ -42 +42 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!UndoRedoHandler.getInstance().redoCommands.isEmpty());
+        setEnabled(UndoRedoHandler.getInstance().hasRedoCommands());
     }
 
     @Override
     public void commandChanged(int queueSize, int redoSize) {
-        if (UndoRedoHandler.getInstance().redoCommands.isEmpty()) {
+        if (!UndoRedoHandler.getInstance().hasRedoCommands()) {
             putValue(NAME, tr("Redo"));
             setTooltip(tr("Redo the last undone action."));
@@ -53 +53 @@
             putValue(NAME, tr("Redo ..."));
             setTooltip(tr("Redo {0}",
-                    UndoRedoHandler.getInstance().redoCommands.getFirst().getDescriptionText()));
+                    UndoRedoHandler.getInstance().getRedoCommands().getFirst().getDescriptionText()));
         }
     }

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

@@ -42 +42 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!UndoRedoHandler.getInstance().commands.isEmpty());
+        setEnabled(UndoRedoHandler.getInstance().hasUndoCommands());
     }
 
     @Override
     public void commandChanged(int queueSize, int redoSize) {
-        if (UndoRedoHandler.getInstance().commands.isEmpty()) {
+        if (!UndoRedoHandler.getInstance().hasUndoCommands()) {
             putValue(NAME, tr("Undo"));
             setTooltip(tr("Undo the last action."));
@@ -53 +53 @@
             putValue(NAME, tr("Undo ..."));
             setTooltip(tr("Undo {0}",
-                    UndoRedoHandler.getInstance().commands.getLast().getDescriptionText()));
+                    UndoRedoHandler.getInstance().getLastCommand().getDescriptionText()));
         }
     }

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

@@ -25 +25 @@
      *
      * @see #getLastCommand()
+     * @see #getUndoCommands()
      */
     public final LinkedList<Command> commands = new LinkedList<>();
+
     /**
      * The stack for redoing commands
+
+     * @see #getRedoCommands()
      */
     public final LinkedList<Command> redoCommands = new LinkedList<>();
@@ -232 +236 @@
 
     /**
+     * Returns all commands that were made on the dataset, that can be undone.
+     * @return all commands that were made on the dataset, that can be undone
+     * @since 14281
+     */
+    public LinkedList<Command> getUndoCommands() {
+        return new LinkedList<>(commands);
+    }
+
+    /**
+     * Returns all commands that were made and undone on the dataset, that can be redone.
+     * @return all commands that were made and undone on the dataset, that can be redone.
+     * @since 14281
+     */
+    public LinkedList<Command> getRedoCommands() {
+        return new LinkedList<>(redoCommands);
+    }
+
+    /**
      * Gets the last command that was executed on the command stack.
      * @return That command or <code>null</code> if there is no such command.
@@ -238 +260 @@
     public Command getLastCommand() {
         return commands.peekLast();
+    }
+
+    /**
+     * Determines if commands can be undone.
+     * @return {14281 true} if at least a command can be undone
+     * @since xxx
+     */
+    public boolean hasUndoCommands() {
+        return !commands.isEmpty();
+    }
+
+    /**
+     * Determines if commands can be redone.
+     * @return {@code true} if at least a command can be redone
+     * @since 14281
+     */
+    public boolean hasRedoCommands() {
+        return !redoCommands.isEmpty();
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -272 +272 @@
 
     private void buildUndoTree() {
-        List<Command> undoCommands = UndoRedoHandler.getInstance().commands;
+        List<Command> undoCommands = UndoRedoHandler.getInstance().getUndoCommands();
         undoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < undoCommands.size(); ++i) {
@@ -281 +281 @@
 
     private void buildRedoTree() {
-        List<Command> redoCommands = UndoRedoHandler.getInstance().redoCommands;
+        List<Command> redoCommands = UndoRedoHandler.getInstance().getRedoCommands();
         redoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < redoCommands.size(); ++i) {
@@ -290 +290 @@
 
     private void ensureTreesConsistency() {
-        List<Command> undoCommands = UndoRedoHandler.getInstance().commands;
-        List<Command> redoCommands = UndoRedoHandler.getInstance().redoCommands;
+        List<Command> undoCommands = UndoRedoHandler.getInstance().getUndoCommands();
+        List<Command> redoCommands = UndoRedoHandler.getInstance().getRedoCommands();
         if (redoTreeModel.getChildCount(redoRoot) > 0) {
             redoTree.scrollRowToVisible(0);