Changeset 12128 in josm

Timestamp:

2017-05-12T20:18:02+02:00 (8 years ago)

Author:

Don-vip

Message:

see #14741 - rework initialization of Main.contentPanePrivate

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/MainFrame.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (3 diffs)

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

@@ -38 +38 @@
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 import javax.swing.LookAndFeel;
@@ -208 +207 @@
 
     /**
+     * The private content pane of {@code MainFrame}, required to be static for shortcut handling.
+     */
+    protected static JComponent contentPanePrivate;
+
+    /**
      * The file watcher service.
      */
@@ -637 +641 @@
         }
     }
-
-    protected static final JPanel contentPanePrivate = new JPanel(new BorderLayout());
 
     public static void redirectToMainContentPane(JComponent source) {
@@ -770 +772 @@
         }
         toolbar = new ToolbarPreferences();
-        contentPanePrivate.updateUI();
 
         UIManager.put("OptionPane.okIcon", ImageProvider.get("ok"));

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

@@ -38 +38 @@
 
 import javax.net.ssl.SSLSocketFactory;
+import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.RepaintManager;
@@ -313 +314 @@
                 args.getSingle(Option.GEOMETRY).orElse(null),
                 !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
-        final MainFrame mainFrame = new MainFrame(contentPanePrivate, geometry);
+        final MainFrame mainFrame = new MainFrame(geometry);
+        Main.contentPanePrivate = (JComponent) mainFrame.getContentPane();
         Main.mainPanel = mainFrame.getPanel();
         Main.parent = mainFrame;

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

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.Image;
 import java.awt.Rectangle;
@@ -56 +55 @@
      */
     public MainFrame() {
-        this(new JPanel(), new WindowGeometry(new Rectangle(10, 10, 500, 500)));
-    }
-
-    /**
-     * Create a new main window. The parameters will be removed in the future.
-     * @param contentPanePrivate The content
+        this(new WindowGeometry(new Rectangle(10, 10, 500, 500)));
+    }
+
+    /**
+     * Create a new main window. The parameter will be removed in the future.
      * @param geometry The inital geometry to use.
-     * @since 11713
-     */
-    public MainFrame(Container contentPanePrivate, WindowGeometry geometry) {
+     * @since 12127
+     */
+    public MainFrame(WindowGeometry geometry) {
         super();
         this.geometry = geometry;
         this.panel = new MainPanel(Main.getLayerManager());
-        setContentPane(contentPanePrivate);
+        setContentPane(new JPanel(new BorderLayout()));
     }
 

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -6 +6 @@
 import static org.junit.Assert.fail;
 
+import java.awt.BorderLayout;
 import java.io.File;
 import java.io.IOException;
@@ -14 +15 @@
 import java.util.TimeZone;
 
+import javax.swing.JPanel;
+
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainPanel;
 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
@@ -146 +150 @@
         assertNull(Main.getLayerManager().getActiveLayer());
 
+        if (Main.contentPanePrivate == null) {
+            Main.contentPanePrivate = new JPanel(new BorderLayout());
+        }
+        if (Main.mainPanel == null) {
+            Main.mainPanel = new MainPanel(Main.getLayerManager());
+        }
         if (Main.toolbar == null) {
             Main.toolbar = new ToolbarPreferences();