Changeset 12643 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2017-08-25T10:18:53+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.main.menu. Replacement: gui.MainApplication.getMenu()

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

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

@@ -141 +141 @@
         createLayout(lstConflicts, true, Arrays.asList(btnResolve, btnSelect));
 
-        popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
+        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("conflict"));
 
         ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();