Changeset 18361 in josm

Timestamp:

2022-01-09T12:11:27+01:00 (2 years ago)

Author:

GerdP

Message:

fix #6725: Plugins need to be loaded before tool definitions for toolbar buttons

• use a flag to indicate that all plugins were loaded and suppress INFO messages unless that was done

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1223 +1223 @@
         monitor.indeterminateSubTask(tr("Loading plugins"));
         PluginHandler.loadLatePlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
-        GuiHelper.runInEDTAndWait(() -> toolbar.refreshToolbarControl());
+        GuiHelper.runInEDTAndWait(() -> {
+            toolbar.enableInfoAboutMissingAction();
+            toolbar.refreshToolbarControl();
+        });
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -583 +583 @@
     public final JToolBar control = new JToolBar();
     private final Map<Object, ActionDefinition> buttonActions = new ConcurrentHashMap<>(30);
+    private boolean showInfoAboutMissingActions;
 
     @Override
@@ -1113 +1114 @@
                 if (a != null) {
                     result.add(a);
-                } else {
+                } else if (showInfoAboutMissingActions) {
                     Logging.info("Could not load tool definition "+s);
                 }
@@ -1293 +1294 @@
         refreshToolbarControl();
     }
+
+    /**
+     * Call with {@code true} when all plugins were loaded.
+     * @since xxx
+     */
+    public void enableInfoAboutMissingAction() {
+        this.showInfoAboutMissingActions = true;
+    }
+
+
 }