Changeset 12125 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2017-05-12T01:28:59+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14741 - rework initialization of Main.Panel so that it is done after PlatformHook.preStartupHook, as any other Swing code

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -65 +65 @@
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.data.validation.OsmValidator;
-import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MainPanel;
@@ -198 +197 @@
 
     /**
+     * The main panel.
+     * @since 12125
+     */
+    public MainPanel panel;
+
+    /**
      * The file watcher service.
      */
@@ -213 +218 @@
     @Deprecated
     public static int logLevel = 3;
-
-    /**
-     * The real main panel. This field may be removed any time and made private to {@link MainFrame}
-     * @see #panel
-     */
-    protected static final MainPanel mainPanel = new MainPanel(getLayerManager());
 
     /**
@@ -491 +490 @@
     protected Main() {
         setInstance(this);
-        mainPanel.addMapFrameListener((o, n) -> redoUndoListener.commandChanged(0, 0));
     }
 
@@ -579 +577 @@
     /**
      * Called once at startup to initialize the main window content.
-     * Should set {@link #menu}
+     * Should set {@link #menu} and {@link #panel}
      */
     protected abstract void initializeMainWindow();
@@ -716 +714 @@
 
     /**
-     * Global panel.
-     */
-    public static final JPanel panel = mainPanel;
-
-    private final CommandQueueListener redoUndoListener = (queueSize, redoSize) -> {
+     * Listener that sets the enabled state of undo/redo menu entries.
+     */
+    protected final CommandQueueListener redoUndoListener = (queueSize, redoSize) -> {
             menu.undo.setEnabled(queueSize > 0);
             menu.redo.setEnabled(redoSize > 0);
@@ -770 +766 @@
         toolbar = new ToolbarPreferences();
         contentPanePrivate.updateUI();
-        panel.updateUI();
 
         UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));
@@ -1158 +1153 @@
      */
     public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
-        return mainPanel.addAndFireMapFrameListener(listener);
+        return main.panel.addAndFireMapFrameListener(listener);
     }
 
@@ -1169 +1164 @@
      */
     public static boolean addMapFrameListener(MapFrameListener listener) {
-        return mainPanel.addMapFrameListener(listener);
+        return main.panel.addMapFrameListener(listener);
     }
 
@@ -1179 +1174 @@
      */
     public static boolean removeMapFrameListener(MapFrameListener listener) {
-        return mainPanel.removeMapFrameListener(listener);
+        return main.panel.removeMapFrameListener(listener);
     }