Changeset 12643 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

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()

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PreferenceTabbedPane.java (modified) (1 diff)
• ToolbarPreferences.java (modified) (1 diff)
• imagery/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -127 +127 @@
                         null /* no special help */
                         )) {
-                    Main.main.menu.restart.actionPerformed(null);
+                    MainApplication.getMenu().restart.actionPerformed(null);
                 }
             } else if (task != null && !task.isCanceled()) {

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -1054 +1054 @@
     private void loadActions() {
         rootActionsNode.removeAllChildren();
-        loadAction(rootActionsNode, Main.main.menu);
+        loadAction(rootActionsNode, MainApplication.getMenu());
         for (Map.Entry<String, Action> a : regactions.entrySet()) {
             if (actions.get(a.getKey()) == null) {

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -164 +164 @@
         ImageryLayerInfo.instance.clear();
         ImageryLayerInfo.instance.load(false);
-        Main.main.menu.imageryMenu.refreshOffsetMenu();
+        MainApplication.getMenu().imageryMenu.refreshOffsetMenu();
         OffsetBookmark.saveBookmarks();
 
@@ -958 +958 @@
         ImageryLayerInfo.instance.load(false);
         OffsetBookmark.loadBookmarks();
-        Main.main.menu.imageryMenu.refreshImageryMenu();
-        Main.main.menu.imageryMenu.refreshOffsetMenu();
+        MainApplication.getMenu().imageryMenu.refreshImageryMenu();
+        MainApplication.getMenu().imageryMenu.refreshOffsetMenu();
     }
 }