fix inability to add the first dom element to the collection control, and duplicate "Edit deployment descriptor" actions (IDEA-97589)

This commit is contained in:
peter
2012-12-20 16:52:56 +01:00
parent 6d5e0ca116
commit db2c916cc2
2 changed files with 4 additions and 2 deletions
@@ -128,7 +128,7 @@ public abstract class AbstractTableView<T> extends JPanel implements TypeSafeDat
final ActionManager actionManager = ActionManager.getInstance();
final ToolbarPosition position = getToolbarPosition();
final ActionToolbar myActionToolbar = actionManager.createActionToolbar(ActionPlaces.PROJECT_VIEW_TOOLBAR, actionGroup, position == ToolbarPosition.TOP || position == ToolbarPosition.BOTTOM);
myActionToolbar.setTargetComponent(myTable);
myActionToolbar.setTargetComponent(myInnerPanel);
final JComponent toolbarComponent = myActionToolbar.getComponent();
final MatteBorder matteBorder = BorderFactory.createMatteBorder(0, 0, position == ToolbarPosition.TOP ? 1 : 0, 0, JBColor.DARK_GRAY);
toolbarComponent.setBorder(BorderFactory.createCompoundBorder(matteBorder, toolbarComponent.getBorder()));
@@ -167,7 +167,9 @@ public class DomCollectionControl<T extends DomElement> extends DomUIControl imp
}
protected DefaultActionGroup createPopupActionGroup() {
return (DefaultActionGroup)ActionManager.getInstance().getAction("DomCollectionControl");
final DefaultActionGroup group = new DefaultActionGroup();
group.addAll((DefaultActionGroup)ActionManager.getInstance().getAction("DomCollectionControl"));
return group;
}
protected ColumnInfo[] createColumnInfos(DomElement parent) {