Changeset 12127 in josm for trunk/src

Timestamp:

2017-05-12T19:53:09+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14783 - fix NPE when loading early plugins. Restored the static Main.mainPanel, no other choice in order to maintain public listener methods for early plugins

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (4 diffs)
• gui/MainApplication.java (modified) (6 diffs)
• gui/MainFrame.java (modified) (3 diffs)

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

@@ -203 +203 @@
 
     /**
+     * The same main panel, required to be static for {@code MapFrameListener} handling.
+     */
+    protected static MainPanel mainPanel;
+
+    /**
      * The file watcher service.
      */
@@ -1153 +1158 @@
      */
     public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
-        return main.panel.addAndFireMapFrameListener(listener);
+        return mainPanel.addAndFireMapFrameListener(listener);
     }
 
@@ -1164 +1169 @@
      */
     public static boolean addMapFrameListener(MapFrameListener listener) {
-        return main.panel.addMapFrameListener(listener);
+        return mainPanel.addMapFrameListener(listener);
     }
 
@@ -1174 +1179 @@
      */
     public static boolean removeMapFrameListener(MapFrameListener listener) {
-        return main.panel.removeMapFrameListener(listener);
+        return mainPanel.removeMapFrameListener(listener);
     }
 

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

@@ -88 +88 @@
     private static final List<String> COMMAND_LINE_ARGS = new ArrayList<>();
 
+    private static ProgramArguments args;
+    private static boolean skipLoadingPlugins;
+
     private final MainFrame mainFrame;
 
@@ -110 +113 @@
     protected void initializeMainWindow() {
         if (mainFrame != null) {
-            mainFrame.preInitialize();
             panel = mainFrame.getPanel();
             mainFrame.initialize();
@@ -208 +210 @@
      */
     public static void main(final String[] argArray) {
+        // First initializes all stuff that do not require AWT/Swing
+        mainNoGui(argArray);
+        // Then initializes all AWT/Swing stuff
+        mainGui();
+    }
+
+    /**
+     * Initializes all stuff that do not require AWT/Swing.
+     * @param argArray Command-line arguments
+     */
+    private static void mainNoGui(final String[] argArray) {
         I18n.init();
 
         // construct argument table
-        ProgramArguments args = null;
         try {
             args = new ProgramArguments(argArray);
@@ -261 +273 @@
         COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
 
-        boolean skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
+        skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
         if (skipLoadingPlugins) {
             Main.info(tr("Plugin loading skipped"));
@@ -286 +298 @@
 
         Main.platform.afterPrefStartupHook();
-
+    }
+
+    /**
+     * Initializes all AWT/Swing stuff.
+     */
+    private static void mainGui() {
         FontsManager.initialize();
 
@@ -297 +314 @@
                 !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
         final MainFrame mainFrame = new MainFrame(contentPanePrivate, geometry);
+        Main.mainPanel = mainFrame.getPanel();
         Main.parent = mainFrame;
 

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

@@ -49 +49 @@
     protected transient WindowGeometry geometry;
     protected int windowState = JFrame.NORMAL;
-    private MainPanel panel;
+    private final MainPanel panel;
     private MainMenu menu;
 
@@ -68 +68 @@
         super();
         this.geometry = geometry;
+        this.panel = new MainPanel(Main.getLayerManager());
         setContentPane(contentPanePrivate);
     }
 
     /**
-     * Performs pre-initialization required before the call to {@link #initialize()}.
-     * @since 12125
-     */
-    public void preInitialize() {
-        panel = new MainPanel(Main.getLayerManager());
-    }
-
-    /**
      * Initializes the content of the window and get the current status panel.
-     * {@link #preInitialize()} must have been previously called.
      */
     public void initialize() {
@@ -138 +130 @@
      * Gets the main panel.
      * @return The main panel.
-     * @throws IllegalStateException if the main frame has not been initialized yet
-     * @see #initialize
      * @since 12125
      */
     public MainPanel getPanel() {
-        if (panel == null) {
-            throw new IllegalStateException("Not initialized.");
-        }
         return panel;
     }