IG: correct source tool names in merger

diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java
index 2ce300b235dd8208f6ac2bee8db4af67554a5ad3..3b451a7bd7c6d25f72fdd707cabdb46774dc04a7 100644 (file)
--- a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java
@@ -44,9 +44,18 @@ public abstract class InspectionElementsMerger {
     return ourMergers.get(shortName);
   }
 
-  public abstract String   getMergedToolName();
+  public abstract String getMergedToolName();
+
+  /**
+   * @return the shortNames of the merged inspections
+   */
   public abstract String[] getSourceToolNames();
 
+  /**
+   * The ids to check for suppression.
+   * If this returns an empty string array, the result of getSourceToolNames() is used instead.
+   * @return the suppressIds of the merged inspections.
+   */
   public String[] getSuppressIds() {
     return ArrayUtilRt.EMPTY_STRING_ARRAY;
   }

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java
index 57aad6c9efed47fbd3c8f8484f4e6fab9434d1a0..8f6bfef107c1103eebb539424a8a5b502ed305f8 100644 (file)
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java
@@ -29,6 +29,11 @@ public class MalformedSetUpTearDownInspectionMerger extends InspectionElementsMe
 
   @Override
   public String[] getSourceToolNames() {
+    return new String[] { "TeardownIsPublicVoidNoArg", "SetupIsPublicVoidNoArg" };
+  }
+
+  @Override
+  public String[] getSuppressIds() {
     return new String[] { "TearDownWithIncorrectSignature", "SetUpWithIncorrectSignature" };
   }
 }