Changeset 12128 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (4 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"));