Changeset 12128 in josm for trunk/src/org/openstreetmap/josm/gui/MainFrame.java

Timestamp:

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

Author:

Don-vip

Message:

see #14741 - rework initialization of Main.contentPanePrivate

File:

• trunk/src/org/openstreetmap/josm/gui/MainFrame.java (modified) (2 diffs)

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()));
     }