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

Timestamp:

2017-08-25T03:01:22+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.main.undoRedo. Replacement: gui.MainApplication.undoRedo

File:

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

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

@@ -36 +36 @@
 import javax.swing.tree.TreeSelectionModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.command.Command;
@@ -233 +232 @@
             listener.updateEnabledState();
         }
-        Main.main.undoRedo.addCommandQueueListener(this);
+        MainApplication.undoRedo.addCommandQueueListener(this);
     }
 
@@ -249 +248 @@
         undoTreeModel.setRoot(new DefaultMutableTreeNode());
         redoTreeModel.setRoot(new DefaultMutableTreeNode());
-        Main.main.undoRedo.removeCommandQueueListener(this);
+        MainApplication.undoRedo.removeCommandQueueListener(this);
     }
 
@@ -261 +260 @@
             return;
 
-        List<Command> undoCommands = Main.main.undoRedo.commands;
+        List<Command> undoCommands = MainApplication.undoRedo.commands;
         DefaultMutableTreeNode undoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < undoCommands.size(); ++i) {
@@ -268 +267 @@
         undoTreeModel.setRoot(undoRoot);
 
-        List<Command> redoCommands = Main.main.undoRedo.redoCommands;
+        List<Command> redoCommands = MainApplication.undoRedo.redoCommands;
         DefaultMutableTreeNode redoRoot = new DefaultMutableTreeNode();
         for (int i = 0; i < redoCommands.size(); ++i) {
@@ -457 +456 @@
             case UNDO:
                 int numUndo = ((DefaultMutableTreeNode) undoTreeModel.getRoot()).getChildCount() - idx;
-                Main.main.undoRedo.undo(numUndo);
+                MainApplication.undoRedo.undo(numUndo);
                 break;
             case REDO:
                 int numRedo = idx+1;
-                Main.main.undoRedo.redo(numRedo);
+                MainApplication.undoRedo.redo(numRedo);
                 break;
             }