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

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/actions

Files:

• JoinAreasAction.java (modified) (2 diffs)
• RedoAction.java (modified) (2 diffs)
• UndoAction.java (modified) (2 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()));
         }
     }