diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index d9a7ecf3c0..33a2aaadfc 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -489,11 +489,7 @@ public abstract class ToolBarMenuDock { } if (!DesignerMode.isAuthorityEditing()) { - if (shouldShowPlugin()) { - menuDef.addShortCut( - createPluginManagerAction() - ); - } + addPluginManagerAction(menuDef); menuDef.addShortCut( new FunctionManagerAction(), new GlobalParameterAction() @@ -504,16 +500,21 @@ public abstract class ToolBarMenuDock { return menuDef; } - private ShortCut createPluginManagerAction() { + private void addPluginManagerAction(MenuDef menuDef) { Set providers = ExtraDesignClassManager.getInstance().getArray(PluginManagerProvider.MARK_STRING); if (providers != null) { for (PluginManagerProvider provider : providers) { if (provider.selector().accept(new ObjectHolder())) { - return provider.pluginManagerAction(); + menuDef.addShortCut(provider.pluginManagerAction()); + return; } } } - return new PluginManagerAction(); + if (shouldShowPlugin()) { + menuDef.addShortCut( + new PluginManagerAction() + ); + } } private ShortCut createGlobalTDAction() {