inspections: BaseAnalysisActionDialog api is restricted as it was before (IDEA-CR...

diff --git a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java
index 6d44ce3f39dd074a38123a47210d585743fde1ab..c337e89527927ac2d1e854c22ee775e7213f3640 100644 (file)
--- a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java
+++ b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java
@@ -194,14 +194,9 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
     //additional panel - inspection profile chooser
     JPanel wholePanel = new JPanel(new BorderLayout());
     wholePanel.add(myPanel, BorderLayout.NORTH);
-    final JComponent[] additions = getCompoundAdditionalActionSettings(myProject);
-    if (additions.length != 0) {
-      JPanel additionPanel = new JPanel();
-      additionPanel.setLayout(new BoxLayout(additionPanel, BoxLayout.Y_AXIS));
-      for (JComponent addition : additions) {
-        additionPanel.add(addition);
-      }
-      wholePanel.add(additionPanel, BorderLayout.CENTER);
+    final JComponent additionalPanel = getAdditionalActionSettings(myProject);
+    if (additionalPanel!= null){
+      wholePanel.add(additionalPanel, BorderLayout.CENTER);
     }
     new RadioUpDownListener(myProjectButton, myModuleButton, myUncommitedFilesButton, myFileButton, myCustomScopeButton);
     return wholePanel;
@@ -239,12 +234,6 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
     return myPanel;
   }
 
-  @NotNull
-  protected JComponent[] getCompoundAdditionalActionSettings(final Project project) {
-    final JComponent settings = getAdditionalActionSettings(project);
-    return settings == null ? new JComponent[0] : new JComponent[]{settings};
-  }
-
   @Nullable
   protected JComponent getAdditionalActionSettings(final Project project) {
     return null;

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
index dcf070ebfeb29417a5a13617319542442db26f45..0cbfb6e8193f665e2eb4c2125f634dfcb77f2963 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
@@ -51,7 +51,6 @@ import com.intellij.profile.codeInspection.ui.header.ProfilesComboBox;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.TitledSeparator;
-import com.intellij.util.SmartList;
 import com.intellij.util.containers.FactoryMap;
 import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
@@ -149,16 +148,20 @@ public class RunInspectionAction extends GotoActionBase {
 
       private InheritOptionsForToolPanel myToolOptionsPanel;
 
-      @NotNull
+      @Nullable
       @Override
-      protected JComponent[] getCompoundAdditionalActionSettings(Project project) {
-        final SmartList<JComponent> additions = new SmartList<>();
-        additions.add(fileFilterPanel.getPanel());
+      protected JComponent getAdditionalActionSettings(Project project) {
+        final JPanel fileFilter = fileFilterPanel.getPanel();
         if (toolWrapper.getTool().createOptionsPanel() != null) {
+          JPanel additionPanel = new JPanel();
+          additionPanel.setLayout(new BoxLayout(additionPanel, BoxLayout.Y_AXIS));
+          additionPanel.add(fileFilter);
           myToolOptionsPanel = new InheritOptionsForToolPanel((InspectionProfileImpl)currentProfile, toolWrapper.getShortName(), project);
-          additions.add(myToolOptionsPanel);
+          additionPanel.add(myToolOptionsPanel);
+          return additionPanel;
+        } else {
+          return fileFilter;
         }
-        return additions.toArray(new JComponent[additions.size()]);
       }
 
       @NotNull