From b40cd7c41293eaf372da3c913fb4b1c42a72bd34 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 16 May 2017 23:24:41 +0300 Subject: [PATCH] set ids for Platform toolbars Signed-off-by: Konstantin Bulenkov --- .../src/com/intellij/diagnostic/IdeErrorsDialog.java | 4 ++-- .../com/intellij/notification/EventLogToolWindowFactory.java | 2 +- .../openapi/fileChooser/ex/FileChooserDialogImpl.java | 2 +- .../openapi/fileEditor/impl/http/RemoteFilePanel.java | 2 +- .../src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 0a52367f2cb7..3397912846a0 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -272,7 +272,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene DefaultActionGroup goBack = new DefaultActionGroup(); BackAction back = new BackAction(); goBack.add(back); - ActionToolbar backToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, goBack, true); + ActionToolbar backToolbar = ActionManager.getInstance().createActionToolbar("IdeErrorsBack", goBack, true); backToolbar.getComponent().setBorder(IdeBorderFactory.createEmptyBorder()); backToolbar.setLayoutPolicy(ActionToolbar.NOWRAP_LAYOUT_POLICY); myBackButtonPanel.add(backToolbar.getComponent(), BorderLayout.CENTER); @@ -280,7 +280,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene DefaultActionGroup goForward = new DefaultActionGroup(); ForwardAction forward = new ForwardAction(); goForward.add(forward); - ActionToolbar forwardToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, goForward, true); + ActionToolbar forwardToolbar = ActionManager.getInstance().createActionToolbar("IdeErrorsForward", goForward, true); forwardToolbar.setLayoutPolicy(ActionToolbar.NOWRAP_LAYOUT_POLICY); forwardToolbar.getComponent().setBorder(IdeBorderFactory.createEmptyBorder()); myNextButtonPanel.add(forwardToolbar.getComponent(), BorderLayout.CENTER); diff --git a/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java b/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java index ce9d2109a501..7d64e3b3998c 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLogToolWindowFactory.java @@ -115,7 +115,7 @@ public class EventLogToolWindowFactory implements ToolWindowFactory, DumbAware { group.add(new EventLogConsole.ClearLogAction(console)); group.add(new ContextHelpAction(EventLog.HELP_ID)); - return ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, false); + return ActionManager.getInstance().createActionToolbar("EventLog", group, false); } private static class DisplayBalloons extends ToggleAction implements DumbAware { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java index 4f41cc212bae..823aec689db2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java @@ -294,7 +294,7 @@ public class FileChooserDialogImpl extends DialogWrapper implements FileChooserD createTree(); final DefaultActionGroup group = createActionGroup(); - ActionToolbar toolBar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, true); + ActionToolbar toolBar = ActionManager.getInstance().createActionToolbar("FileChooserDialog", group, true); toolBar.setTargetComponent(panel); final JPanel toolbarPanel = new JPanel(new BorderLayout()); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java index 35d03e231b23..eb73cbb888be 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java @@ -129,7 +129,7 @@ public class RemoteFilePanel { for (RemoteFileEditorActionProvider actionProvider : RemoteFileEditorActionProvider.EP_NAME.getExtensions()) { group.addAll(actionProvider.createToolbarActions(project, myVirtualFile)); } - final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, true); + final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("RemoteFilePanel", group, true); myToolbarPanel.add(actionToolbar.getComponent(), BorderLayout.CENTER); } diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java index d1f7f36cba3a..e7b87e22414f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java @@ -208,7 +208,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi private JPanel createToolbarPanel() { final JPanel panel = new JPanel(new GridBagLayout()); DefaultActionGroup group = new DefaultActionGroup(); - final JComponent toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, true).getComponent(); + final JComponent toolbar = ActionManager.getInstance().createActionToolbar("KeymapEdit", group, true).getComponent(); final CommonActionsManager commonActionsManager = CommonActionsManager.getInstance(); final TreeExpander treeExpander = new TreeExpander() { @Override @@ -253,7 +253,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi panel.add(toolbar, new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(8, 0, 0, 0), 0, 0)); group = new DefaultActionGroup(); - ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, true); + ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("Keymap", group, true); actionToolbar.setReservePlaceAutoPopupIcon(false); final JComponent searchToolbar = actionToolbar.getComponent(); final Alarm alarm = new Alarm();