diff --git a/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java b/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java index d3d392761031..7de498e0892c 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/BeforeRunStepsPanel.java @@ -91,7 +91,7 @@ class BeforeRunStepsPanel extends JPanel { ToolbarDecorator myDecorator = ToolbarDecorator.createDecorator(myList); if (!SystemInfo.isMac) { - myDecorator.setAsTopToolbar(); + myDecorator.setAsUsualTopToolbar(); } myDecorator.setEditAction(new AnActionButtonRunnable() { @Override diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index f45aa2d4ffa7..48c11acf9da2 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -419,7 +419,7 @@ class RunConfigurable extends BaseConfigurable { initTree(); DefaultActionGroup actionsGroup = createActionsGroup(); PopupHandler.installFollowingSelectionTreePopup(myTree, actionsGroup, ActionPlaces.UNKNOWN, ActionManager.getInstance()); - myToolbarDecorator = ToolbarDecorator.createDecorator(myTree).setActionGroup(actionsGroup).setForcedDnD(); + myToolbarDecorator = ToolbarDecorator.createDecorator(myTree).setAsUsualTopToolbar().setActionGroup(actionsGroup).setForcedDnD(); return myToolbarDecorator.createPanel(); } @@ -984,7 +984,7 @@ class RunConfigurable extends BaseConfigurable { }); //new TreeSpeedSearch(myTree); - popup.showUnderneathOf(myToolbarDecorator.getPanel()); + popup.showUnderneathOf(myToolbarDecorator.getActionsPanel()); } } @@ -1100,7 +1100,7 @@ class RunConfigurable extends BaseConfigurable { configurable.getNameTextField().setSelectionEnd(copyName.length()); } catch (ConfigurationException e1) { - Messages.showErrorDialog(myToolbarDecorator.getPanel(), e1.getMessage(), e1.getTitle()); + Messages.showErrorDialog(myToolbarDecorator.getActionsPanel(), e1.getMessage(), e1.getTitle()); } } diff --git a/platform/platform-api/src/com/intellij/ui/ListToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/ListToolbarDecorator.java index 7736d79e5876..99f09d882a0b 100644 --- a/platform/platform-api/src/com/intellij/ui/ListToolbarDecorator.java +++ b/platform/platform-api/src/com/intellij/ui/ListToolbarDecorator.java @@ -78,7 +78,7 @@ class ListToolbarDecorator extends ToolbarDecorator { @Override protected void updateButtons() { - final CommonActionsPanel p = getPanel(); + final CommonActionsPanel p = getActionsPanel(); if (p != null) { if (myList.isEnabled()) { final int index = myList.getSelectedIndex(); diff --git a/platform/platform-api/src/com/intellij/ui/TableToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/TableToolbarDecorator.java index 407b03341389..6eebcd8bd337 100644 --- a/platform/platform-api/src/com/intellij/ui/TableToolbarDecorator.java +++ b/platform/platform-api/src/com/intellij/ui/TableToolbarDecorator.java @@ -62,7 +62,7 @@ class TableToolbarDecorator extends ToolbarDecorator { } protected void updateButtons() { - final CommonActionsPanel p = getPanel(); + final CommonActionsPanel p = getActionsPanel(); if (p != null) { if (myTable.isEnabled()) { final int index = myTable.getSelectedRow(); diff --git a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java index c8390de96f6d..446f41274a75 100644 --- a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java +++ b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java @@ -30,7 +30,6 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.border.Border; -import javax.swing.border.LineBorder; import java.awt.*; import java.util.*; import java.util.List; @@ -58,7 +57,7 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan protected boolean myRemoveActionEnabled; protected boolean myUpActionEnabled; protected boolean myDownActionEnabled; - protected Border myBorder; + protected Border myActionsPanelBorder; private List myExtraActions = new ArrayList(); private ActionToolbarPosition myToolbarPosition; protected AnActionButtonRunnable myAddAction; @@ -77,9 +76,9 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan private AnActionButtonUpdater myMoveUpActionUpdater = null; private AnActionButtonUpdater myMoveDownActionUpdater = null; private Dimension myPreferredSize; - private CommonActionsPanel myPanel; + private CommonActionsPanel myActionsPanel; private Comparator myButtonComparator; - private boolean myAsTopToolbar = false; + private boolean myAsUsualTopToolbar = false; private Icon myAddIcon; private boolean myForcedDnD = false; @@ -87,8 +86,8 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan protected abstract void updateButtons(); - public final CommonActionsPanel getPanel() { - return myPanel; + public final CommonActionsPanel getActionsPanel() { + return myActionsPanel; } public ToolbarDecorator initPosition() { @@ -96,8 +95,8 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan return this; } - public ToolbarDecorator setAsTopToolbar() { - myAsTopToolbar = true; + public ToolbarDecorator setAsUsualTopToolbar() { + myAsUsualTopToolbar = true; setToolbarPosition(ActionToolbarPosition.TOP); return this; } @@ -149,7 +148,7 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan } public ToolbarDecorator setToolbarBorder(Border border) { - myBorder = border; + myActionsPanelBorder = border; return this; } @@ -188,7 +187,7 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan public ToolbarDecorator setToolbarPosition(ActionToolbarPosition position) { myToolbarPosition = position; - myBorder = new CustomLineBorder(0, + myActionsPanelBorder = new CustomLineBorder(0, myToolbarPosition == ActionToolbarPosition.RIGHT ? 1 : 0, myToolbarPosition == ActionToolbarPosition.TOP ? 1 : 0, myToolbarPosition == ActionToolbarPosition.LEFT ? 1 : 0); @@ -306,22 +305,16 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan public JPanel createPanel() { final CommonActionsPanel.Buttons[] buttons = getButtons(); final JComponent contextComponent = getComponent(); - myPanel = new CommonActionsPanel(this, contextComponent, + myActionsPanel = new CommonActionsPanel(this, contextComponent, myToolbarPosition == ActionToolbarPosition.TOP || myToolbarPosition == ActionToolbarPosition.BOTTOM, myExtraActions.toArray(new AnActionButton[myExtraActions.size()]), myButtonComparator, myAddName, myRemoveName, myMoveUpName, myMoveDownName, myEditName, myAddIcon, buttons); - if (myAsTopToolbar) { - contextComponent.setBorder(IdeBorderFactory.createBorder(SideBorder.ALL)); - } else { - myPanel.setBorder(myBorder); - } - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(contextComponent); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(contextComponent, true); if (myPreferredSize != null) { scrollPane.setPreferredSize(myPreferredSize); } - scrollPane.setBorder(IdeBorderFactory.createEmptyBorder(0)); final JPanel panel = new JPanel(new BorderLayout()) { @Override public void addNotify() { @@ -330,42 +323,36 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan } }; panel.add(scrollPane, BorderLayout.CENTER); - panel.add(myPanel, getPlacement()); + panel.add(myActionsPanel, getPlacement()); installUpdaters(); updateButtons(); installDnD(); - panel.putClientProperty(ActionToolbar.ACTION_TOOLBAR_PROPERTY_KEY, myPanel.getComponent(0)); + panel.putClientProperty(ActionToolbar.ACTION_TOOLBAR_PROPERTY_KEY, myActionsPanel.getComponent(0)); DataManager.registerDataProvider(panel, this); - if (myAsTopToolbar) { - panel.setBorder(null); - if (getComponent().getBorder() == null) { - getComponent().setBorder(IdeBorderFactory.createBorder(SideBorder.ALL)); - } + if (myAsUsualTopToolbar) { + scrollPane.setBorder(IdeBorderFactory.createBorder(SideBorder.ALL)); } else { - panel.setBorder(new LineBorder(UIUtil.getBorderColor())); - final JComponent c = getComponent(); - if (contextComponent != null) { - contextComponent.setBorder(IdeBorderFactory.createEmptyBorder(0)); - } + myActionsPanel.setBorder(myActionsPanelBorder); + panel.setBorder(IdeBorderFactory.createBorder(SideBorder.ALL)); } return panel; } private void installUpdaters() { if (myAddActionEnabled && myAddAction != null && myAddActionUpdater != null) { - myPanel.getAnActionButton(CommonActionsPanel.Buttons.ADD).addCustomUpdater(myAddActionUpdater); + myActionsPanel.getAnActionButton(CommonActionsPanel.Buttons.ADD).addCustomUpdater(myAddActionUpdater); } if (myEditActionEnabled && myEditAction != null && myEditActionUpdater != null) { - myPanel.getAnActionButton(CommonActionsPanel.Buttons.EDIT).addCustomUpdater(myEditActionUpdater); + myActionsPanel.getAnActionButton(CommonActionsPanel.Buttons.EDIT).addCustomUpdater(myEditActionUpdater); } if (myRemoveActionEnabled && myRemoveAction != null && myRemoveActionUpdater != null) { - myPanel.getAnActionButton(CommonActionsPanel.Buttons.REMOVE).addCustomUpdater(myRemoveActionUpdater); + myActionsPanel.getAnActionButton(CommonActionsPanel.Buttons.REMOVE).addCustomUpdater(myRemoveActionUpdater); } if (myUpActionEnabled && myUpAction != null && myMoveUpActionUpdater != null) { - myPanel.getAnActionButton(CommonActionsPanel.Buttons.UP).addCustomUpdater(myMoveUpActionUpdater); + myActionsPanel.getAnActionButton(CommonActionsPanel.Buttons.UP).addCustomUpdater(myMoveUpActionUpdater); } if (myDownActionEnabled && myDownAction != null && myMoveDownActionUpdater != null) { - myPanel.getAnActionButton(CommonActionsPanel.Buttons.DOWN).addCustomUpdater(myMoveDownActionUpdater); + myActionsPanel.getAnActionButton(CommonActionsPanel.Buttons.DOWN).addCustomUpdater(myMoveDownActionUpdater); } } diff --git a/platform/platform-api/src/com/intellij/ui/TreeToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/TreeToolbarDecorator.java index 9cfe8a95b792..081c4541453c 100644 --- a/platform/platform-api/src/com/intellij/ui/TreeToolbarDecorator.java +++ b/platform/platform-api/src/com/intellij/ui/TreeToolbarDecorator.java @@ -116,7 +116,7 @@ class TreeToolbarDecorator extends ToolbarDecorator { @Override protected void updateButtons() { - getPanel().setEnabled(CommonActionsPanel.Buttons.REMOVE, myTree.getSelectionPath() != null); + getActionsPanel().setEnabled(CommonActionsPanel.Buttons.REMOVE, myTree.getSelectionPath() != null); } @Override