Changeset 12637 in josm for trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

Timestamp:

2017-08-24T23:29:01+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.toolbar. Replacement: gui.MainApplication.getToolbar()

File:

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

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainApplicationTest;
 import org.openstreetmap.josm.gui.MainPanel;
 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
-import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.CertificateAmendment;
@@ -201 +201 @@
      * Make sure {@code Main.toolbar} is initialized.
      */
+    @SuppressWarnings("deprecation")
     public static void initToolbar() {
+        MainApplicationTest.initToolbar();
         if (Main.toolbar == null) {
-            Main.toolbar = new ToolbarPreferences();
+            Main.toolbar = MainApplication.getToolbar();
         }
     }