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

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

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