Changeset 12641 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.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/ConflictResolutionDialog.java (modified) (2 diffs)

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