Changeset 12128 in josm for trunk/test


Ignore:
Timestamp:
2017-05-12T20:18:02+02:00 (2 years ago)
Author:
Don-vip
Message:

see #14741 - rework initialization of Main.contentPanePrivate

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

    r12125 r12128  
    66import static org.junit.Assert.fail;
    77
     8import java.awt.BorderLayout;
    89import java.io.File;
    910import java.io.IOException;
     
    1415import java.util.TimeZone;
    1516
     17import javax.swing.JPanel;
     18
    1619import org.openstreetmap.josm.data.projection.Projections;
    1720import org.openstreetmap.josm.gui.MainApplication;
     21import org.openstreetmap.josm.gui.MainPanel;
    1822import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
    1923import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
     
    146150        assertNull(Main.getLayerManager().getActiveLayer());
    147151
     152        if (Main.contentPanePrivate == null) {
     153            Main.contentPanePrivate = new JPanel(new BorderLayout());
     154        }
     155        if (Main.mainPanel == null) {
     156            Main.mainPanel = new MainPanel(Main.getLayerManager());
     157        }
    148158        if (Main.toolbar == null) {
    149159            Main.toolbar = new ToolbarPreferences();
Note: See TracChangeset for help on using the changeset viewer.