Changeset 12643 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.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/MainApplication.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -136 +136 @@
 
     /**
+     * The main menu bar at top of screen.
+     */
+    static MainMenu menu;
+
+    /**
      * The main panel, required to be static for {@link MapFrameListener} handling.
      */
@@ -278 +283 @@
             mainFrame.initialize();
             menu = mainFrame.getMenu();
+            super.menu = menu;
         } else {
             // required for running some tests.
@@ -283 +289 @@
             panel = mainPanel;
             menu = new MainMenu();
+            super.menu = menu;
         }
         mainPanel.addMapFrameListener((o, n) -> redoUndoListener.commandChanged(0, 0));
@@ -377 +384 @@
     public static MainPanel getMainPanel() {
         return mainPanel;
+    }
+
+    /**
+     * Returns the main menu, at top of screen.
+     * @return the main menu
+     * @since 12643 (as a replacement to {@code MainApplication.getMenu()})
+     */
+    public static MainMenu getMenu() {
+        return menu;
     }