Changeset 14134 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

Timestamp:

2018-08-11T23:33:58+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main*.undoRedo - make UndoRedoHandler a singleton

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) (7 diffs)

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

@@ -40 +40 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.PseudoCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandAddedEvent;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueCleanedEvent;
@@ -237 +238 @@
             listener.updateEnabledState();
         }
-        MainApplication.undoRedo.addCommandQueuePreciseListener(this);
+        UndoRedoHandler.getInstance().addCommandQueuePreciseListener(this);
     }
 
@@ -255 +256 @@
         undoTreeModel.setRoot(undoRoot);
         redoTreeModel.setRoot(redoRoot);
-        MainApplication.undoRedo.removeCommandQueuePreciseListener(this);
+        UndoRedoHandler.getInstance().removeCommandQueuePreciseListener(this);
     }
 
@@ -270 +271 @@
 
     private void buildUndoTree() {
-        List<Command> undoCommands = MainApplication.undoRedo.commands;
+        List<Command> undoCommands = UndoRedoHandler.getInstance().commands;
         undoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < undoCommands.size(); ++i) {
@@ -279 +280 @@
 
     private void buildRedoTree() {
-        List<Command> redoCommands = MainApplication.undoRedo.redoCommands;
+        List<Command> redoCommands = UndoRedoHandler.getInstance().redoCommands;
         redoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < redoCommands.size(); ++i) {
@@ -288 +289 @@
 
     private void ensureTreesConsistency() {
-        List<Command> undoCommands = MainApplication.undoRedo.commands;
-        List<Command> redoCommands = MainApplication.undoRedo.redoCommands;
+        List<Command> undoCommands = UndoRedoHandler.getInstance().commands;
+        List<Command> redoCommands = UndoRedoHandler.getInstance().redoCommands;
         if (redoTreeModel.getChildCount(redoRoot) > 0) {
             redoTree.scrollRowToVisible(0);
@@ -505 +506 @@
             case UNDO:
                 int numUndo = ((DefaultMutableTreeNode) undoTreeModel.getRoot()).getChildCount() - idx;
-                MainApplication.undoRedo.undo(numUndo);
+                UndoRedoHandler.getInstance().undo(numUndo);
                 break;
             case REDO:
                 int numRedo = idx+1;
-                MainApplication.undoRedo.redo(numRedo);
+                UndoRedoHandler.getInstance().redo(numRedo);
                 break;
             }