Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (3 diffs)

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

@@ -476 +476 @@
         if (mainFrame != null) {
             mainPanel = mainFrame.getPanel();
-            panel = mainPanel;
             mainFrame.initialize();
             menu = mainFrame.getMenu();
-            super.menu = menu;
         } else {
             // required for running some tests.
             mainPanel = new MainPanel(layerManager);
-            panel = mainPanel;
             menu = new MainMenu();
-            super.menu = menu;
         }
         mainPanel.addMapFrameListener((o, n) -> redoUndoListener.commandChanged(0, 0));
@@ -1026 +1022 @@
         setupUIManager();
         toolbar = new ToolbarPreferences();
-        Main.toolbar = toolbar;
         ProjectionPreference.setProjection();
         setupNadGridSources();
@@ -1051 +1046 @@
             mainFrame.setMaximized(true);
         }
-        if (main.menu.fullscreenToggleAction != null) {
-            main.menu.fullscreenToggleAction.initial();
+        if (menu.fullscreenToggleAction != null) {
+            menu.fullscreenToggleAction.initial();
         }