Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12641)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12642)
@@ -140,4 +140,5 @@
     }
 
+    @SuppressWarnings("deprecation")
     private void setupGUI() {
         JOSMTestRules.cleanLayerEnvironment();
@@ -154,5 +155,5 @@
             if (Main.main.panel == null) {
                 initMainPanel(false);
-                Main.main.panel = MainApplicationTest.getMainPanel();
+                Main.main.panel = MainApplication.getMainPanel();
             }
             Main.main.panel.reAddListeners();
Index: trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 12641)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 12642)
@@ -80,4 +80,5 @@
      * @param reAddListeners {@code true} to re-add listeners
      */
+    @SuppressWarnings("deprecation")
     public static void initMainPanel(boolean reAddListeners) {
         if (MainApplication.mainPanel == null) {
@@ -90,12 +91,4 @@
             Main.main.panel = MainApplication.mainPanel;
         }
-    }
-
-    /**
-     * Returns {@link MainApplication#mainPanel} (not public).
-     * @return {@link MainApplication#mainPanel}
-     */
-    public static MainPanel getMainPanel() {
-        return MainApplication.mainPanel;
     }