Changeset 12128 in josm for trunk/test/unit

Timestamp:

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

Author:

Don-vip

Message:

see #14741 - rework initialization of Main.contentPanePrivate

File:

• trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (3 diffs)

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