Changeset 14134 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.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/actions/CombineWayAction.java (modified) (5 diffs)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -34 +35 @@
 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;
@@ -176 +176 @@
                 if (!reverseWayTagCommands.isEmpty()) {
                     // commands need to be executed for CombinePrimitiveResolverDialog
-                    MainApplication.undoRedo.add(new SequenceCommand(tr("Reverse Ways"), reverseWayTagCommands));
+                    UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Reverse Ways"), reverseWayTagCommands));
                 }
                 wayTags = TagCollection.unionOfAllPrimitives(reversedTagWays);
@@ -195 +195 @@
             if (!reverseWayTagCommands.isEmpty()) {
                 // undo reverseWayTagCorrector and merge into SequenceCommand below
-                MainApplication.undoRedo.undo();
+                UndoRedoHandler.getInstance().undo();
             }
         }
@@ -239 +239 @@
             return;
         final Way selectedWay = combineResult.a;
-        MainApplication.undoRedo.add(combineResult.b);
+        UndoRedoHandler.getInstance().add(combineResult.b);
         if (selectedWay != null) {
             GuiHelper.runInEDT(() -> ds.setSelected(selectedWay));