Changeset 17687 in josm for trunk/test

Timestamp:

2021-03-29T23:05:59+02:00 (4 years ago)

Author:

simon04

Message:

fix #19889 - CI contains thousands of "Keystroke ... is already assigned to ..., will be overridden by ..." warnings

File:

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

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -67 +67 @@
      */
     public static void initContentPane() {
-        if (MainApplication.contentPanePrivate == null) {
-            MainApplication.contentPanePrivate = new JPanel(new BorderLayout());
-        }
+        // init every time to avoid "Keystroke %s is already assigned to %s"
+        MainApplication.contentPanePrivate = new JPanel(new BorderLayout());
     }
 
@@ -104 +103 @@
      */
     public static void initToolbar() {
-        if (MainApplication.toolbar == null) {
-            MainApplication.toolbar = new ToolbarPreferences();
-        }
+        // init every time to avoid "Registered toolbar action"
+        MainApplication.toolbar = new ToolbarPreferences();
     }