Changeset 12641 in josm for trunk/src/org

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/AddNodeAction.java (modified) (1 diff)
• actions/AlignInCircleAction.java (modified) (3 diffs)
• actions/AlignInLineAction.java (modified) (3 diffs)
• actions/CombineWayAction.java (modified) (4 diffs)
• actions/CreateCircleAction.java (modified) (2 diffs)
• actions/CreateMultipolygonAction.java (modified) (1 diff)
• actions/DistributeAction.java (modified) (3 diffs)
• actions/FollowLineAction.java (modified) (2 diffs)
• actions/JoinAreasAction.java (modified) (4 diffs)
• actions/JoinNodeWayAction.java (modified) (2 diffs)
• actions/MergeNodesAction.java (modified) (2 diffs)
• actions/MirrorAction.java (modified) (3 diffs)
• actions/MoveAction.java (modified) (2 diffs)
• actions/MoveNodeAction.java (modified) (1 diff)
• actions/OrthogonalizeAction.java (modified) (3 diffs)
• actions/PurgeAction.java (modified) (2 diffs)
• actions/RedoAction.java (modified) (2 diffs)
• actions/ReverseWayAction.java (modified) (2 diffs)
• actions/SimplifyWayAction.java (modified) (2 diffs)
• actions/SplitWayAction.java (modified) (2 diffs)
• actions/UnGlueAction.java (modified) (3 diffs)
• actions/UnJoinNodeWayAction.java (modified) (2 diffs)
• actions/UndoAction.java (modified) (2 diffs)
• actions/mapmode/DeleteAction.java (modified) (3 diffs)
• actions/mapmode/DrawAction.java (modified) (2 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (6 diffs)
• actions/mapmode/ImproveWayAccuracyAction.java (modified) (4 diffs)
• actions/mapmode/ParallelWays.java (modified) (3 diffs)
• actions/mapmode/SelectAction.java (modified) (7 diffs)
• actions/relation/AddSelectionToRelations.java (modified) (2 diffs)
• actions/relation/RecentRelationsAction.java (modified) (2 diffs)
• actions/upload/DiscardTagsHook.java (modified) (2 diffs)
• actions/upload/FixDataHook.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/datatransfer/importers/AbstractTagPaster.java (modified) (3 diffs)
• gui/datatransfer/importers/PrimitiveDataPaster.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (6 diffs)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/ConflictResolutionDialog.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (4 diffs)
• gui/dialogs/relation/actions/RefreshAction.java (modified) (2 diffs)
• gui/dialogs/relation/actions/SavingAction.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• io/remotecontrol/AddTagsDialog.java (modified) (2 diffs)
• io/remotecontrol/handler/AddNodeHandler.java (modified) (1 diff)
• io/remotecontrol/handler/AddWayHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -138 +138 @@
     /**
      * The commands undo/redo handler.
-     */
-    public final UndoRedoHandler undoRedo = new UndoRedoHandler();
+     * @deprecated Use {@link MainApplication#undoRedo} instead
+     */
+    @Deprecated
+    public final UndoRedoHandler undoRedo = MainApplication.undoRedo;
 
     /**
@@ -446 +448 @@
     /**
      * Platform specific code goes in here.
-     * Plugins may replace it, however, some hooks will be called before any plugins have been loeaded.
+     * Plugins may replace it, however, some hooks will be called before any plugins have been loaded.
      * So if you need to hook into those early ones, split your class and send the one with the early hooks
      * to the JOSM team for inclusion.

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

@@ -66 +66 @@
 
         // add the node
-        Main.main.undoRedo.add(new AddCommand(nnew));
+        MainApplication.undoRedo.add(new AddCommand(nnew));
         getLayerManager().getEditDataSet().setSelected(nnew);
         MapView mapView = MainApplication.getMap().mapView;

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

@@ -17 +17 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
@@ -26 +25 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Geometry;
@@ -283 +283 @@
         }
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Circle"), cmds));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Align Nodes in Circle"), cmds));
     }
 

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

@@ -17 +17 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
@@ -26 +25 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Logging;
@@ -172 +172 @@
 
         try {
-            Main.main.undoRedo.add(buildCommand());
+            MainApplication.undoRedo.add(buildCommand());
         } catch (InvalidSelection except) {
             Logging.debug(except);

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
@@ -173 +174 @@
                 if (!reverseWayTagCommands.isEmpty()) {
                     // commands need to be executed for CombinePrimitiveResolverDialog
-                    Main.main.undoRedo.add(new SequenceCommand(tr("Reverse Ways"), reverseWayTagCommands));
+                    MainApplication.undoRedo.add(new SequenceCommand(tr("Reverse Ways"), reverseWayTagCommands));
                 }
                 wayTags = TagCollection.unionOfAllPrimitives(reversedTagWays);
@@ -192 +193 @@
             if (!reverseWayTagCommands.isEmpty()) {
                 // undo reverseWayTagCorrector and merge into SequenceCommand below
-                Main.main.undoRedo.undo();
+                MainApplication.undoRedo.undo();
             }
         }
@@ -236 +237 @@
             return;
         final Way selectedWay = combineResult.a;
-        Main.main.undoRedo.add(combineResult.b);
+        MainApplication.undoRedo.add(combineResult.b);
         if (selectedWay != null) {
             GuiHelper.runInEDT(() -> ds.setSelected(selectedWay));

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

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Geometry;
@@ -240 +241 @@
         }
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Create Circle"), cmds));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Create Circle"), cmds));
     }
 

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

@@ -107 +107 @@
             // to avoid EDT violations
             SwingUtilities.invokeLater(() -> {
-                    Main.main.undoRedo.add(command);
+                    MainApplication.undoRedo.add(command);
 
                     // Use 'SwingUtilities.invokeLater' to make sure the relationListDialog

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

@@ -16 +16 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
@@ -23 +22 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Logging;
@@ -98 +98 @@
 
         // Do it!
-        Main.main.undoRedo.add(new SequenceCommand(tr("Distribute Nodes"), cmds));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Distribute Nodes"), cmds));
     }
 

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

@@ -11 +11 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -115 +114 @@
                 newFollower.addNode(newPoint);
             }
-            Main.main.undoRedo.add(new SequenceCommand(tr("Follow line"),
+            MainApplication.undoRedo.add(new SequenceCommand(tr("Follow line"),
                     new ChangeCommand(follower, newFollower),
                     new SelectCommand(newFollower.isClosed() // see #10028 - unselect last node when closing a way

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

@@ -41 +41 @@
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
@@ -569 +570 @@
             //FIXME: this is dirty hack
             makeCommitsOneAction(tr("Reverting changes"));
-            Main.main.undoRedo.undo();
-            Main.main.undoRedo.redoCommands.clear();
+            MainApplication.undoRedo.undo();
+            MainApplication.undoRedo.redoCommands.clear();
         }
     }
@@ -826 +827 @@
     private static void commitCommand(Command c) {
         if (Main.main != null) {
-            Main.main.undoRedo.add(c);
+            MainApplication.undoRedo.add(c);
         } else {
             c.executeCommand();
@@ -1592 +1593 @@
         cmds.clear();
         if (Main.main != null) {
-            UndoRedoHandler ur = Main.main.undoRedo;
+            UndoRedoHandler ur = MainApplication.undoRedo;
             int i = Math.max(ur.commands.size() - cmdsCount, 0);
             for (; i < ur.commands.size(); i++) {

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

@@ -19 +19 @@
 import java.util.TreeSet;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -160 +159 @@
 
         if (cmds.isEmpty()) return;
-        Main.main.undoRedo.add(new SequenceCommand(getValue(NAME).toString(), cmds));
+        MainApplication.undoRedo.add(new SequenceCommand(getValue(NAME).toString(), cmds));
     }
 

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

@@ -95 +95 @@
             Command cmd = mergeNodes(getLayerManager().getEditLayer(), selectedNodes, targetNode, targetLocationNode);
             if (cmd != null) {
-                Main.main.undoRedo.add(cmd);
+                MainApplication.undoRedo.add(cmd);
                 getLayerManager().getEditLayer().data.setSelected(targetNode);
             }
@@ -274 +274 @@
             Command cmd = mergeNodes(layer, nodes, target, targetLocationNode);
             if (cmd != null) {
-                Main.main.undoRedo.add(cmd);
+                MainApplication.undoRedo.add(cmd);
                 layer.data.setSelected(target);
             }

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

@@ -14 +14 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.MoveCommand;
@@ -21 +20 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -80 +80 @@
         }
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Mirror"), cmds));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Mirror"), cmds));
     }
 

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

@@ -136 +136 @@
         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
 
-        Command c = Main.main.undoRedo.getLastCommand();
+        Command c = MainApplication.undoRedo.getLastCommand();
 
         ds.beginUpdate();
@@ -145 +145 @@
             } else {
                 c = new MoveCommand(selection, distx, disty);
-                Main.main.undoRedo.add(c);
+                MainApplication.undoRedo.add(c);
             }
         } finally {

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

@@ -50 +50 @@
 
         // move the node
-        Main.main.undoRedo.add(new MoveCommand(n, coordinates));
+        MainApplication.undoRedo.add(new MoveCommand(n, coordinates));
         MainApplication.getMap().mapView.repaint();
     }

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

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -116 +117 @@
                 }
                 if (!commands.isEmpty()) {
-                    Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize / Undo"), commands));
+                    MainApplication.undoRedo.add(new SequenceCommand(tr("Orthogonalize / Undo"), commands));
                 } else {
                     throw new InvalidUserInputException("Commands are empty");
@@ -165 +166 @@
         try {
             final SequenceCommand command = orthogonalize(sel);
-            Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize"), command));
+            MainApplication.undoRedo.add(new SequenceCommand(tr("Orthogonalize"), command));
         } catch (InvalidUserInputException ex) {
             Logging.debug(ex);

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

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -125 +126 @@
         }
 
-        Main.main.undoRedo.add(cmd);
+        MainApplication.undoRedo.add(cmd);
         if (clearUndoRedo) {
-            Main.main.undoRedo.clean();
+            MainApplication.undoRedo.clean();
             getLayerManager().getEditDataSet().clearSelectionHistory();
         }

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

@@ -37 +37 @@
             return;
         map.repaint();
-        Main.main.undoRedo.redo();
+        MainApplication.undoRedo.redo();
     }
 
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.main != null && !Main.main.undoRedo.redoCommands.isEmpty());
+        setEnabled(Main.main != null && !MainApplication.undoRedo.redoCommands.isEmpty());
     }
 
     @Override
     public void commandChanged(int queueSize, int redoSize) {
-        if (Main.main.undoRedo.redoCommands.isEmpty()) {
+        if (MainApplication.undoRedo.redoCommands.isEmpty()) {
             putValue(NAME, tr("Redo"));
             setTooltip(tr("Redo the last undone action."));
@@ -53 +53 @@
             putValue(NAME, tr("Redo ..."));
             setTooltip(tr("Redo {0}",
-                    Main.main.undoRedo.redoCommands.getFirst().getDescriptionText()));
+                    MainApplication.undoRedo.redoCommands.getFirst().getDescriptionText()));
         }
     }

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Logging;
@@ -137 +138 @@
             c.addAll(revResult.getCommands());
         }
-        Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
     }
 

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -123 +124 @@
                     allCommands
                     );
-            Main.main.undoRedo.add(rootCommand);
+            MainApplication.undoRedo.add(rootCommand);
         } finally {
             ds.endUpdate();

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

@@ -215 +215 @@
             if (wayToKeep != null) {
                 final SplitWayResult result = doSplitWay(getLayerManager().getEditLayer(), selectedWay, wayToKeep, newWays, sel);
-                Main.main.undoRedo.add(result.getCommand());
+                MainApplication.undoRedo.add(result.getCommand());
                 if (!result.getNewSelection().isEmpty()) {
                     getLayerManager().getEditDataSet().setSelected(result.getNewSelection());
@@ -296 +296 @@
                 SplitWayResult result = doSplitWay(MainApplication.getLayerManager().getEditLayer(),
                         selectedWay, list.getSelectedValue(), newWays, selection);
-                Main.main.undoRedo.add(result.getCommand());
+                MainApplication.undoRedo.add(result.getCommand());
                 if (!result.getNewSelection().isEmpty()) {
                     MainApplication.getLayerManager().getEditDataSet().setSelected(result.getNewSelection());

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

@@ -314 +314 @@
         }
 
-        Main.main.undoRedo.add(new SequenceCommand(tr("Unglued Node"), cmds));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Unglued Node"), cmds));
         getLayerManager().getEditDataSet().setSelected(n);
         mv.repaint();
@@ -553 +553 @@
      */
     private void execCommands(List<Command> cmds, List<Node> newNodes) {
-        Main.main.undoRedo.add(new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
+        MainApplication.undoRedo.add(new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
                 trn("Dupe into {0} node", "Dupe into {0} nodes", newNodes.size() + 1L, newNodes.size() + 1L), cmds));
         // select one of the new nodes
@@ -641 +641 @@
         notifyWayPartOfRelation(Collections.singleton(selectedWay));
 
-        Main.main.undoRedo.add(new SequenceCommand(
+        MainApplication.undoRedo.add(new SequenceCommand(
                 trn("Dupe {0} node into {1} nodes", "Dupe {0} nodes into {1} nodes",
                         selectedNodes.size(), selectedNodes.size(), selectedNodes.size()+allNewNodes.size()), cmds));

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

@@ -15 +15 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.RemoveNodesCommand;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -89 +89 @@
 
         // I'm sure there's a better way to handle this
-        Main.main.undoRedo.add(new RemoveNodesCommand(selectedWay, selectedNodes));
+        MainApplication.undoRedo.add(new RemoveNodesCommand(selectedWay, selectedNodes));
     }
 

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

@@ -37 +37 @@
             return;
         map.repaint();
-        Main.main.undoRedo.undo();
+        MainApplication.undoRedo.undo();
     }
 
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.main != null && !Main.main.undoRedo.commands.isEmpty());
+        setEnabled(Main.main != null && !MainApplication.undoRedo.commands.isEmpty());
     }
 
     @Override
     public void commandChanged(int queueSize, int redoSize) {
-        if (Main.main.undoRedo.commands.isEmpty()) {
+        if (MainApplication.undoRedo.commands.isEmpty()) {
             putValue(NAME, tr("Undo"));
             setTooltip(tr("Undo the last action."));
@@ -53 +53 @@
             putValue(NAME, tr("Undo ..."));
             setTooltip(tr("Undo {0}",
-                    Main.main.undoRedo.commands.getLast().getDescriptionText()));
+                    MainApplication.undoRedo.commands.getLast().getDescriptionText()));
         }
     }

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

@@ -157 +157 @@
         // if c is null, an error occurred or the user aborted. Don't do anything in that case.
         if (c != null) {
-            Main.main.undoRedo.add(c);
+            MainApplication.undoRedo.add(c);
             //FIXME: This should not be required, DeleteCommand should update the selection, otherwise undo/redo won't work.
             lm.getEditDataSet().setSelected();
@@ -304 +304 @@
         Command c = buildDeleteCommands(e, e.getModifiersEx(), false);
         if (c != null) {
-            Main.main.undoRedo.add(c);
+            MainApplication.undoRedo.add(c);
         }
 
@@ -355 +355 @@
         if (cmd != null) {
             // cmd can be null if the user cancels dialogs DialogCommand displays
-            Main.main.undoRedo.add(cmd);
+            MainApplication.undoRedo.add(cmd);
             for (Relation relation : toDelete) {
                 if (layer.data.getSelectedRelations().contains(relation)) {

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

@@ -617 +617 @@
         Command c = new SequenceCommand(title, cmds);
 
-        Main.main.undoRedo.add(c);
+        MainApplication.undoRedo.add(c);
         if (!wayIsFinished) {
             lastUsedNode = n;
@@ -1334 +1334 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Main.main.undoRedo.undo();
-            Command lastCmd = Main.main.undoRedo.getLastCommand();
+            MainApplication.undoRedo.undo();
+            Command lastCmd = MainApplication.undoRedo.getLastCommand();
             if (lastCmd == null) return;
             Node n = null;

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

@@ -496 +496 @@
                         moveCommand2 = new MoveCommand(movingNodeList.get(1), movement2.getX(), movement2.getY());
                         Command c = new SequenceCommand(tr("Extrude Way"), moveCommand, moveCommand2);
-                        Main.main.undoRedo.add(c);
+                        MainApplication.undoRedo.add(c);
                     } else {
                         // reuse existing move commands
@@ -511 +511 @@
                         //make a new move command
                         moveCommand = new MoveCommand(new ArrayList<OsmPrimitive>(movingNodeList), bestMovement);
-                        Main.main.undoRedo.add(moveCommand);
+                        MainApplication.undoRedo.add(moveCommand);
                     } else {
                         //reuse existing move command
@@ -594 +594 @@
             SequenceCommand cmds = new SequenceCommand(tr("Add a new node to an existing way"),
                     new AddCommand(n), new ChangeCommand(ws.way, wnew));
-            Main.main.undoRedo.add(cmds);
+            MainApplication.undoRedo.add(cmds);
         }
     }
@@ -624 +624 @@
         cmds.add(new AddCommand(wnew));
         Command c = new SequenceCommand(tr("Extrude Way"), cmds);
-        Main.main.undoRedo.add(c);
+        MainApplication.undoRedo.add(c);
         getLayerManager().getEditDataSet().setSelected(wnew);
     }
@@ -712 +712 @@
         }
         Command c = new SequenceCommand(tr("Extrude Way"), cmds);
-        Main.main.undoRedo.add(c);
+        MainApplication.undoRedo.add(c);
         joinNodesIfCollapsed(changedNodes);
     }
@@ -724 +724 @@
         Command mergeCmd = MergeNodesAction.mergeNodes(MainApplication.getLayerManager().getEditLayer(), changedNodes, targetNode, locNode);
         if (mergeCmd != null) {
-            Main.main.undoRedo.add(mergeCmd);
+            MainApplication.undoRedo.add(mergeCmd);
         } else {
             // undo extruding command itself
-            Main.main.undoRedo.undo();
+            MainApplication.undoRedo.undo();
         }
     }

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

@@ -473 +473 @@
                         virtualSegments.size(), virtualSegments.size());
 
-                Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
+                MainApplication.undoRedo.add(new SequenceCommand(text, virtualCmds));
 
             } else if (alt && !ctrl && candidateNode != null) {
@@ -490 +490 @@
                         final Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), Collections.singleton(targetWay), true);
                         if (deleteCmd != null) {
-                            Main.main.undoRedo.add(deleteCmd);
+                            MainApplication.undoRedo.add(deleteCmd);
                         }
                     } else {
-                        Main.main.undoRedo.add(new ChangeCommand(targetWay, newWay));
+                        MainApplication.undoRedo.add(new ChangeCommand(targetWay, newWay));
                     }
                 } else if (candidateNode.isTagged()) {
@@ -502 +502 @@
                     final Command deleteCmd = DeleteCommand.delete(getLayerManager().getEditLayer(), Collections.singleton(candidateNode), true);
                     if (deleteCmd != null) {
-                        Main.main.undoRedo.add(deleteCmd);
+                        MainApplication.undoRedo.add(deleteCmd);
                     }
                 }
@@ -512 +512 @@
                 EastNorth cursorEN = mv.getEastNorth(mousePos.x, mousePos.y);
 
-                Main.main.undoRedo.add(new MoveCommand(candidateNode, cursorEN.east() - nodeEN.east(), cursorEN.north() - nodeEN.north()));
+                MainApplication.undoRedo.add(new MoveCommand(candidateNode, cursorEN.east() - nodeEN.east(), cursorEN.north() - nodeEN.north()));
             }
         }

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

@@ -11 +11 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.osm.NodeGraph;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Geometry;
 
@@ -182 +182 @@
      */
     public void commit() {
-        Main.main.undoRedo.add(new SequenceCommand("Make parallel way(s)", makeAddWayAndNodesCommandList()));
+        MainApplication.undoRedo.add(new SequenceCommand("Make parallel way(s)", makeAddWayAndNodesCommandList()));
     }
 

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

@@ -711 +711 @@
                 } else {
                     c = new MoveCommand(selection, startEN, currentEN);
-                    Main.main.undoRedo.add(c);
+                    MainApplication.undoRedo.add(c);
                 }
                 for (Node n : affectedNodes) {
@@ -744 +744 @@
                         ((RotateCommand) c).handleEvent(currentEN);
                     } else {
-                        Main.main.undoRedo.add(new RotateCommand(selection, currentEN));
+                        MainApplication.undoRedo.add(new RotateCommand(selection, currentEN));
                     }
                 } else if (mode == Mode.SCALE) {
@@ -750 +750 @@
                         ((ScaleCommand) c).handleEvent(currentEN);
                     } else {
-                        Main.main.undoRedo.add(new ScaleCommand(selection, currentEN));
+                        MainApplication.undoRedo.add(new ScaleCommand(selection, currentEN));
                     }
                 }
@@ -799 +799 @@
      */
     private static Command getLastCommandInDataset(DataSet ds) {
-        Command lastCommand = Main.main.undoRedo.getLastCommand();
+        Command lastCommand = MainApplication.undoRedo.getLastCommand();
         if (lastCommand instanceof SequenceCommand) {
             lastCommand = ((SequenceCommand) lastCommand).getLastCommand();
@@ -825 +825 @@
             ed.showDialog();
             if (ed.getValue() != 1) {
-                Main.main.undoRedo.undo();
+                MainApplication.undoRedo.undo();
             }
         }
@@ -848 +848 @@
 
             if (ed.getValue() != 1) {
-                Main.main.undoRedo.undo();
+                MainApplication.undoRedo.undo();
             }
         } else {
@@ -1247 +1247 @@
                     "Add and move a virtual new node to {0} ways", virtualWays.size(),
                     virtualWays.size());
-            Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
+            MainApplication.undoRedo.add(new SequenceCommand(text, virtualCmds));
             getLayerManager().getEditDataSet().setSelected(Collections.singleton((OsmPrimitive) virtualNode));
             clear();

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -11 +11 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -46 +45 @@
         }
         if (!cmds.isEmpty()) {
-            Main.main.undoRedo.add(new SequenceCommand(tr("Add selection to relation"), cmds));
+            MainApplication.undoRedo.add(new SequenceCommand(tr("Add selection to relation"), cmds));
             new Notification(
                     "<html>"+

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -18 +18 @@
 import javax.swing.plaf.basic.BasicArrowButton;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -50 +49 @@
         arrow = editButton.createArrow(this);
         arrow.setToolTipText(tr("List of recent relations"));
-        Main.main.undoRedo.addCommandQueueListener(this);
+        MainApplication.undoRedo.addCommandQueueListener(this);
         enableArrow();
         shortcut = Shortcut.registerShortcut(

trunk/src/org/openstreetmap/josm/actions/upload/DiscardTagsHook.java

@@ -10 +10 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 
 /**
@@ -44 +44 @@
             SequenceCommand removeKeys = new SequenceCommand(tr("Removed obsolete tags"),
                     new ChangePropertyCommand(objectsToUpload, map));
-            Main.main.undoRedo.add(removeKeys);
+            MainApplication.undoRedo.add(removeKeys);
         }
         return true;

trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.MainApplication;
 
 /**
@@ -204 +205 @@
 
             if (!cmds.isEmpty()) {
-                Main.main.undoRedo.add(new SequenceCommand(tr("Fix deprecated tags"), cmds));
+                MainApplication.undoRedo.add(new SequenceCommand(tr("Fix deprecated tags"), cmds));
             }
         }

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -69 +69 @@
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -164 +165 @@
 
     /**
+     * The commands undo/redo handler.
+     * @since 12641 (as a replacement to {@code Main.main.undoRedo})
+     */
+    public static final UndoRedoHandler undoRedo = new UndoRedoHandler();
+
+    /**
      * Provides access to the layers displayed in the main view.
      */

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -678 +678 @@
 
         add(editMenu, undo);
-        Main.main.undoRedo.addCommandQueueListener(undo);
+        MainApplication.undoRedo.addCommandQueueListener(undo);
         add(editMenu, redo);
-        Main.main.undoRedo.addCommandQueueListener(redo);
+        MainApplication.undoRedo.addCommandQueueListener(redo);
         editMenu.addSeparator();
         add(editMenu, copy);

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java

@@ -14 +14 @@
 import javax.swing.TransferHandler.TransferSupport;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -20 +19 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.I18n;
@@ -65 +65 @@
             @I18n.QuirkyPluralString
             final String title = title1 + ' ' + title2;
-            Main.main.undoRedo.add(new SequenceCommand(title, commands));
+            MainApplication.undoRedo.add(new SequenceCommand(title, commands));
         }
     }

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.WayData;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -57 +58 @@
 
         /* Now execute the commands to add the duplicated contents of the paste buffer to the map */
-        Main.main.undoRedo.add(command);
+        MainApplication.undoRedo.add(command);
         return true;
     }

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;
             }

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

@@ -520 +520 @@
                 }
             }
-            Main.main.undoRedo.add(new SequenceCommand(name, commands));
+            MainApplication.undoRedo.add(new SequenceCommand(name, commands));
             refreshView();
         }

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

@@ -21 +21 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
 import org.openstreetmap.josm.gui.help.HelpBrowser;
@@ -203 +204 @@
                 }
             }
-            Main.main.undoRedo.add(resolver.buildResolveCommand());
+            MainApplication.undoRedo.add(resolver.buildResolveCommand());
             buttonAction(1, evt);
         }

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

@@ -613 +613 @@
                 final Command fixCommand = error.getFix();
                 if (fixCommand != null) {
-                    SwingUtilities.invokeAndWait(() -> Main.main.undoRedo.addNoRedraw(fixCommand));
+                    SwingUtilities.invokeAndWait(() -> MainApplication.undoRedo.addNoRedraw(fixCommand));
                 }
                 // It is wanted to ignore an error if it said fixable, even if fixCommand was null
@@ -644 +644 @@
                 monitor.subTask(tr("Updating map ..."));
                 SwingUtilities.invokeAndWait(() -> {
-                    Main.main.undoRedo.afterAdd();
+                    MainApplication.undoRedo.afterAdd();
                     MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
                     tree.resetErrors();

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -830 +830 @@
             Command command = TaggingPreset.createCommand(getSelection(), tags);
             if (command != null) {
-                Main.main.undoRedo.add(command);
+                MainApplication.undoRedo.add(command);
             }
         }
@@ -997 +997 @@
 
             Collection<OsmPrimitive> sel = Main.main.getInProgressSelection();
-            Main.main.undoRedo.add(new ChangePropertyCommand(sel, tags));
+            MainApplication.undoRedo.add(new ChangePropertyCommand(sel, tags));
 
             membershipTable.clearSelection();
@@ -1028 +1028 @@
                 rel.removeMembersFor(primitive);
             }
-            Main.main.undoRedo.add(new ChangeCommand(cur, rel));
+            MainApplication.undoRedo.add(new ChangeCommand(cur, rel));
 
             tagTable.clearSelection();
@@ -1266 +1266 @@
             if (sel.isEmpty() || clipboard == null)
                 return;
-            Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));
+            MainApplication.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -507 +507 @@
                 return;
             if (key.equals(newkey) || value == null) {
-                Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
+                MainApplication.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
                 AutoCompletionManager.rememberUserInput(newkey, value, true);
             } else {
@@ -541 +541 @@
                     AutoCompletionManager.rememberUserInput(newkey, value, false);
                 }
-                Main.main.undoRedo.add(new SequenceCommand(
+                MainApplication.undoRedo.add(new SequenceCommand(
                         trn("Change properties of up to {0} object",
                                 "Change properties of up to {0} objects", sel.size(), sel.size()),
@@ -1068 +1068 @@
             AutoCompletionManager.rememberUserInput(key, value, false);
             commandCount++;
-            Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
+            MainApplication.undoRedo.add(new ChangePropertyCommand(sel, key, value));
             changedKey = key;
             clearEntries();
@@ -1079 +1079 @@
 
         public void undoAllTagsAdding() {
-            Main.main.undoRedo.undo(commandCount);
+            MainApplication.undoRedo.undo(commandCount);
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
@@ -50 +51 @@
             ((JComponent) editor).getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), "refresh");
         }
-        Main.main.undoRedo.addCommandQueueListener(this);
+        MainApplication.undoRedo.addCommandQueueListener(this);
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

@@ -73 +73 @@
         if (newRelation.getMembersCount() == 0 && !newRelation.hasKeys())
             return;
-        Main.main.undoRedo.add(new AddCommand(layer, newRelation));
+        MainApplication.undoRedo.add(new AddCommand(layer, newRelation));
 
         // make sure everybody is notified about the changes
@@ -95 +95 @@
         memberTableModel.applyToRelation(editedRelation);
         Conflict<Relation> conflict = new Conflict<>(editor.getRelation(), editedRelation);
-        Main.main.undoRedo.add(new ConflictAddCommand(layer, conflict));
+        MainApplication.undoRedo.add(new ConflictAddCommand(layer, conflict));
     }
 
@@ -107 +107 @@
         memberTableModel.applyToRelation(editedRelation);
         if (!editedRelation.hasEqualSemanticAttributes(editor.getRelation(), false)) {
-            Main.main.undoRedo.add(new ChangeCommand(editor.getRelation(), editedRelation));
+            MainApplication.undoRedo.add(new ChangeCommand(editor.getRelation(), editedRelation));
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -609 +609 @@
             return;
 
-        Main.main.undoRedo.clean(this);
+        MainApplication.undoRedo.clean(this);
 
         // if uploaded, clean the modified flags as well

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -398 +398 @@
             Command cmd = createCommand(sel, getChangedTags());
             if (cmd != null) {
-                Main.main.undoRedo.add(cmd);
+                MainApplication.undoRedo.add(cmd);
             }
         } else if (answer == DIALOG_ANSWER_NEW_RELATION) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -258 +258 @@
                     String key = (String) tm.getValueAt(i, 1);
                     Object value = tm.getValueAt(i, 2);
-                    Main.main.undoRedo.add(new ChangePropertyCommand(sel,
+                    MainApplication.undoRedo.add(new ChangePropertyCommand(sel,
                             key, value instanceof String ? (String) value : ""));
                 }
@@ -312 +312 @@
             if (MainApplication.getLayerManager().getEditDataSet() != null) {
                 for (String[] row : keyValue) {
-                    Main.main.undoRedo.add(new ChangePropertyCommand(primitives, row[0], row[1]));
+                    MainApplication.undoRedo.add(new ChangePropertyCommand(primitives, row[0], row[1]));
                 }
             }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -99 +99 @@
             node = new Node(ll);
             // Now execute the commands to add this node.
-            Main.main.undoRedo.add(new AddCommand(node));
+            MainApplication.undoRedo.add(new AddCommand(node));
         }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -167 +167 @@
         allCoordinates.clear();
         commands.add(new AddCommand(way));
-        Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands));
+        MainApplication.undoRedo.add(new SequenceCommand(tr("Add way"), commands));
         MainApplication.getLayerManager().getEditDataSet().setSelected(way);
         if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {