diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java
index e2a50f3ffe0a..5a143ffd1a36 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java
@@ -37,8 +37,9 @@ public class SuppressManagerImpl extends SuppressManager {
     return SuppressIntentionActionFromFix.convertBatchToSuppressIntentionActions(batchSuppressActions);
   }
 
+  @NotNull
   @Override
-  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, String toolShortName) {
+  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolShortName) {
     return createBatchSuppressActions(HighlightDisplayKey.find(toolShortName));
   }
 
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionSuppressor.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionSuppressor.java
index f1ddb453af89..d6ce2f4aff4a 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionSuppressor.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionSuppressor.java
@@ -28,5 +28,6 @@ public interface InspectionSuppressor {
   /**
    * @see com.intellij.codeInspection.BatchSuppressableTool#getBatchSuppressActions(com.intellij.psi.PsiElement)
    */
-  SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, String toolShortName);
+  @NotNull
+  SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolShortName);
 }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovySuppressableInspectionTool.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovySuppressableInspectionTool.java
index b348c9cabefd..3b1dbdd3914d 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovySuppressableInspectionTool.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovySuppressableInspectionTool.java
@@ -17,7 +17,10 @@
 package org.jetbrains.plugins.groovy.codeInspection;
 
 import com.intellij.codeInsight.daemon.HighlightDisplayKey;
-import com.intellij.codeInspection.*;
+import com.intellij.codeInspection.BatchSuppressManager;
+import com.intellij.codeInspection.LocalInspectionTool;
+import com.intellij.codeInspection.SuppressQuickFix;
+import com.intellij.codeInspection.SuppressionUtil;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.text.StringUtil;
@@ -45,7 +48,8 @@ import java.util.regex.Matcher;
  * @author peter
  */
 public abstract class GroovySuppressableInspectionTool extends LocalInspectionTool {
-  public static SuppressQuickFix[] getSuppressActions(String name) {
+  @NotNull
+  public static SuppressQuickFix[] getSuppressActions(@NotNull String name) {
     final HighlightDisplayKey displayKey = HighlightDisplayKey.find(name);
     return new SuppressQuickFix[] {
       new SuppressByGroovyCommentFix(displayKey),
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyInspectionSuppressor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyInspectionSuppressor.java
index 814d262ac9f7..467ed2b87a8c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyInspectionSuppressor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyInspectionSuppressor.java
@@ -27,8 +27,9 @@ public class GroovyInspectionSuppressor implements InspectionSuppressor {
     return GroovySuppressableInspectionTool.getElementToolSuppressedIn(element, name) != null;
   }
 
+  @NotNull
   @Override
-  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, String toolShortName) {
+  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolShortName) {
     return GroovySuppressableInspectionTool.getSuppressActions(toolShortName);
   }
 }
diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java
index ecf6af758a26..c0cc1e7c8d12 100644
--- a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java
+++ b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlInspectionSuppressor.java
@@ -25,8 +25,9 @@ public class XmlInspectionSuppressor implements InspectionSuppressor{
     return XmlSuppressionProvider.isSuppressed(element, toolId);
   }
 
+  @NotNull
   @Override
-  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, String toolShortName) {
+  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolShortName) {
     return XmlSuppressableInspectionTool.getSuppressFixes(toolShortName);
   }
 }
diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
index a46cd41085fa..3e1052f3c939 100644
--- a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
+++ b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,16 +28,18 @@ import org.jetbrains.annotations.NotNull;
 public abstract class XmlSuppressableInspectionTool extends LocalInspectionTool implements BatchSuppressableTool {
   @NonNls static final String ALL = "ALL";
 
-  public static SuppressQuickFix[] getSuppressFixes(final String shortName) {
+  @NotNull
+  public static SuppressQuickFix[] getSuppressFixes(@NotNull String shortName) {
     return getSuppressFixes(shortName, new DefaultXmlSuppressionProvider());
   }
 
-  public static SuppressQuickFix[] getSuppressFixes(final String shortName, XmlSuppressionProvider provider) {
+  @NotNull
+  public static SuppressQuickFix[] getSuppressFixes(@NotNull String shortName, @NotNull XmlSuppressionProvider provider) {
     final String id = HighlightDisplayKey.find(shortName).getID();
     return new SuppressQuickFix[]{new SuppressTagStatic(id, provider), new SuppressForFile(id, provider), new SuppressAllForFile(provider)};
   }
 
-  public static abstract class XmlSuppressFix implements SuppressQuickFix {
+  public abstract static class XmlSuppressFix implements SuppressQuickFix {
 
     protected final String myId;
     protected final XmlSuppressionProvider myProvider;
diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java
index 0bf4d43eefc7..00e2268b803b 100644
--- a/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java
+++ b/xml/xml-psi-api/src/com/intellij/codeInspection/XmlSuppressionProvider.java
@@ -47,8 +47,9 @@ public abstract class XmlSuppressionProvider implements InspectionSuppressor {
 
   public abstract void suppressForTag(@NotNull PsiElement element, @NotNull String inspectionId);
 
+  @NotNull
   @Override
-  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, String toolShortName) {
+  public SuppressQuickFix[] getSuppressActions(@Nullable PsiElement element, @NotNull String toolShortName) {
     return XmlSuppressableInspectionTool.getSuppressFixes(toolShortName, this);
   }