From 92dffaa974628364237cbaec08ec3bfe85863379 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 16 May 2017 01:10:19 +0300 Subject: [PATCH] ActionPlaces.UNKNOWN -> real name for toolbars Signed-off-by: Konstantin Bulenkov --- .../openapi/vcs/changes/conflicts/MoveChangesDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/MoveChangesDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/MoveChangesDialog.java index 2e7974930f98..b1382f4f836e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/MoveChangesDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/MoveChangesDialog.java @@ -114,7 +114,7 @@ public class MoveChangesDialog extends DialogWrapper { panel.add(ScrollPaneFactory.createScrollPane(myTreeList), BorderLayout.CENTER); DefaultActionGroup actionGroup = new DefaultActionGroup(myTreeList.getTreeActions()); - panel.add(ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, actionGroup, true).getComponent(), BorderLayout.NORTH); + panel.add(ActionManager.getInstance().createActionToolbar("MoveChangesDialog", actionGroup, true).getComponent(), BorderLayout.NORTH); myTreeList.expandAll(); myTreeList.repaint(); return panel;