From 847d615019e79b8ddb957c27dc8fb8ba092fd35a Mon Sep 17 00:00:00 2001 From: Shaverdova Elena Date: Tue, 26 Jun 2012 13:52:56 +0400 Subject: [PATCH] WI-4950 Reload Symfony commands --- .../src/com/intellij/util/ui/ValidatingTableEditor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java index 7c06e6c39075..331903f3b691 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java +++ b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java @@ -190,7 +190,7 @@ public abstract class ValidatingTableEditor implements ComponentWithEmptyT myFixLink = new HoverHyperlinkLabel(null); } - protected ValidatingTableEditor(AnActionButton extraButton) { + protected ValidatingTableEditor(@Nullable AnActionButton ... extraButtons) { ToolbarDecorator decorator = ToolbarDecorator.createDecorator(myTable).disableRemoveAction().disableUpAction().disableDownAction(); decorator.setAddAction(new AnActionButtonRunnable() { @@ -211,8 +211,10 @@ public abstract class ValidatingTableEditor implements ComponentWithEmptyT myRemoveButton.setShortcut(CustomShortcutSet.fromString("alt DELETE")); //NON-NLS decorator.addExtraAction(myRemoveButton); - if (extraButton != null) { - decorator.addExtraAction(extraButton); + if (extraButtons != null && extraButtons.length != 0) { + for (AnActionButton extraButton : extraButtons) { + decorator.addExtraAction(extraButton); + } } myTablePanel.add(decorator.createPanel(), BorderLayout.CENTER); @@ -240,6 +242,7 @@ public abstract class ValidatingTableEditor implements ComponentWithEmptyT } protected ValidatingTableEditor() { + //noinspection NullArgumentToVariableArgMethod this(null); }