diff --git a/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java b/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
index 519e3a7daa58..f65d58051522 100644
--- a/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
@@ -83,10 +83,10 @@ public class RedundantSuppressInspection extends GlobalInspectionTool{
   }
 
   @Override
-  public void runInspection(final AnalysisScope scope,
-                            final InspectionManager manager,
-                            final GlobalInspectionContext globalContext,
-                            final ProblemDescriptionsProcessor problemDescriptionsProcessor) {
+  public void runInspection(@NotNull final AnalysisScope scope,
+                            @NotNull final InspectionManager manager,
+                            @NotNull final GlobalInspectionContext globalContext,
+                            @NotNull final ProblemDescriptionsProcessor problemDescriptionsProcessor) {
     globalContext.getRefManager().iterate(new RefJavaVisitor() {
       @Override public void visitClass(@NotNull RefClass refClass) {
         if (!globalContext.shouldCheck(refClass, RedundantSuppressInspection.this)) return;
@@ -110,13 +110,13 @@ public class RedundantSuppressInspection extends GlobalInspectionTool{
   }
 
   @Nullable
-  private CommonProblemDescriptor[] checkElement(RefClass refEntity, InspectionManager manager, final Project project) {
+  private CommonProblemDescriptor[] checkElement(@NotNull RefClass refEntity, @NotNull InspectionManager manager, @NotNull Project project) {
     final PsiClass psiClass = refEntity.getElement();
     if (psiClass == null) return null;
     return checkElement(psiClass, manager, project);
   }
 
-  public CommonProblemDescriptor[] checkElement(@NotNull final PsiElement psiElement, InspectionManager manager, Project project) {
+  public CommonProblemDescriptor[] checkElement(@NotNull final PsiElement psiElement, @NotNull InspectionManager manager, @NotNull Project project) {
     final Map<PsiElement, Collection<String>> suppressedScopes = new THashMap<PsiElement, Collection<String>>();
     psiElement.accept(new JavaRecursiveElementWalkingVisitor() {
       @Override public void visitModifierList(PsiModifierList list) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java b/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
index c91934f4bc4b..35a997fc3b9c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
@@ -132,11 +132,11 @@ public class CanBeFinalInspection extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(final RefEntity refEntity,
-                                                final AnalysisScope scope,
-                                                final InspectionManager manager,
-                                                final GlobalInspectionContext globalContext,
-                                                final ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull final RefEntity refEntity,
+                                                @NotNull final AnalysisScope scope,
+                                                @NotNull final InspectionManager manager,
+                                                @NotNull final GlobalInspectionContext globalContext,
+                                                @NotNull final ProblemDescriptionsProcessor processor) {
     if (refEntity instanceof RefJavaElement) {
       final RefJavaElement refElement = (RefJavaElement)refEntity;
       if (refElement instanceof RefParameter) return null;
diff --git a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
index a57abafe6d85..479272842951 100644
--- a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
@@ -63,11 +63,11 @@ public class EmptyMethodInspection extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity,
-                                                AnalysisScope scope,
-                                                InspectionManager manager,
-                                                GlobalInspectionContext globalContext,
-                                                ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity,
+                                                @NotNull AnalysisScope scope,
+                                                @NotNull InspectionManager manager,
+                                                @NotNull GlobalInspectionContext globalContext,
+                                                @NotNull ProblemDescriptionsProcessor processor) {
     if (!(refEntity instanceof RefMethod)) {
       return null;
     }
diff --git a/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java b/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
index bad9ae514620..59abd75d39a5 100644
--- a/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
@@ -46,8 +46,8 @@ public class SameParameterValueInspection extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity, AnalysisScope scope, InspectionManager manager, GlobalInspectionContext globalContext,
-                                                ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity, @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext,
+                                                @NotNull ProblemDescriptionsProcessor processor) {
     ArrayList<ProblemDescriptor> problems = null;
     if (refEntity instanceof RefMethod) {
       final RefMethod refMethod = (RefMethod)refEntity;
diff --git a/java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java b/java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
index fefe51df247e..7d4c3536b139 100644
--- a/java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
@@ -29,8 +29,8 @@ import org.jetbrains.annotations.Nullable;
 public class SameReturnValueInspection extends GlobalJavaInspectionTool {
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity, AnalysisScope scope, InspectionManager manager, GlobalInspectionContext globalContext,
-                                                ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity, @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext,
+                                                @NotNull ProblemDescriptionsProcessor processor) {
     if (refEntity instanceof RefMethod) {
       final RefMethod refMethod = (RefMethod)refEntity;
 
diff --git a/java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java b/java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java
index d75f062b9cc9..87e99c553b36 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java
@@ -33,7 +33,7 @@ public class UnnecessaryModuleDependencyInspection extends GlobalInspectionTool
   }
 
   @Override
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity, AnalysisScope scope, InspectionManager manager, final GlobalInspectionContext globalContext) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity, @NotNull AnalysisScope scope, @NotNull InspectionManager manager, @NotNull final GlobalInspectionContext globalContext) {
     if (refEntity instanceof RefModule){
       final RefModule refModule = (RefModule)refEntity;
       final Module module = refModule.getModule();
diff --git a/java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java b/java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
index f3fcf5651730..6b3ebe0defdd 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
@@ -51,11 +51,11 @@ public class RedundantThrows extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity,
-                                                AnalysisScope scope,
-                                                InspectionManager manager,
-                                                GlobalInspectionContext globalContext,
-                                                ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity,
+                                                @NotNull AnalysisScope scope,
+                                                @NotNull InspectionManager manager,
+                                                @NotNull GlobalInspectionContext globalContext,
+                                                @NotNull ProblemDescriptionsProcessor processor) {
     if (refEntity instanceof RefMethod) {
       final RefMethod refMethod = (RefMethod)refEntity;
       if (refMethod.isSyntheticJSP()) return null;
diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
index b26e43fca402..ea832d151cf0 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
@@ -58,11 +58,11 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(final RefEntity refEntity,
-                                                final AnalysisScope scope,
-                                                final InspectionManager manager,
-                                                final GlobalInspectionContext globalContext,
-                                                final ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull final RefEntity refEntity,
+                                                @NotNull final AnalysisScope scope,
+                                                @NotNull final InspectionManager manager,
+                                                @NotNull final GlobalInspectionContext globalContext,
+                                                @NotNull final ProblemDescriptionsProcessor processor) {
     if (refEntity instanceof RefMethod) {
       final RefMethod refMethod = (RefMethod)refEntity;
 
@@ -103,15 +103,15 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
   }
 
   @Override
-  protected boolean queryExternalUsagesRequests(final RefManager manager, final GlobalJavaInspectionContext globalContext,
-                                                final ProblemDescriptionsProcessor processor) {
+  protected boolean queryExternalUsagesRequests(@NotNull final RefManager manager, @NotNull final GlobalJavaInspectionContext globalContext,
+                                                @NotNull final ProblemDescriptionsProcessor processor) {
     final Project project = manager.getProject();
     for (RefElement entryPoint : globalContext.getEntryPointsManager(manager).getEntryPoints()) {
       processor.ignoreElement(entryPoint);
     }
 
     final PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(project);
-    final AnalysisScope scope = manager.getScope();
+    final AnalysisScope scope = ((RefManagerImpl)manager).getScope();
     manager.iterate(new RefJavaVisitor() {
       @Override
       public void visitElement(@NotNull RefEntity refEntity) {
@@ -162,7 +162,7 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public String getHint(final QuickFix fix) {
+  public String getHint(@NotNull final QuickFix fix) {
     return ((AcceptSuggested)fix).getHint();
   }
 
@@ -173,7 +173,7 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
   }
 
   @Override
-  public void compose(final StringBuffer buf, final RefEntity refEntity, final HTMLComposer composer) {
+  public void compose(@NotNull final StringBuffer buf, @NotNull final RefEntity refEntity, @NotNull final HTMLComposer composer) {
     if (refEntity instanceof RefMethod) {
       final RefMethod refMethod = (RefMethod)refEntity;
       final HTMLJavaHTMLComposer javaComposer = composer.getExtension(HTMLJavaHTMLComposer.COMPOSER);
diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
index 69df5b440ed2..2bfbdf833c93 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
@@ -48,11 +48,11 @@ public class UnusedReturnValue extends GlobalJavaInspectionTool{
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity,
-                                                AnalysisScope scope,
-                                                InspectionManager manager,
-                                                GlobalInspectionContext globalContext,
-                                                ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity,
+                                                @NotNull AnalysisScope scope,
+                                                @NotNull InspectionManager manager,
+                                                @NotNull GlobalInspectionContext globalContext,
+                                                @NotNull ProblemDescriptionsProcessor processor) {
     if (refEntity instanceof RefMethod) {
       final RefMethod refMethod = (RefMethod)refEntity;
 
diff --git a/java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java b/java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
index 535e24a35aa9..112c379b712c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
@@ -143,11 +143,11 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(final RefEntity refEntity,
-                                                final AnalysisScope scope,
-                                                final InspectionManager manager,
-                                                final GlobalInspectionContext globalContext,
-                                                final ProblemDescriptionsProcessor processor) {
+  public CommonProblemDescriptor[] checkElement(@NotNull final RefEntity refEntity,
+                                                @NotNull final AnalysisScope scope,
+                                                @NotNull final InspectionManager manager,
+                                                @NotNull final GlobalInspectionContext globalContext,
+                                                @NotNull final ProblemDescriptionsProcessor processor) {
     if (refEntity instanceof RefJavaElement) {
       final RefJavaElement refElement = (RefJavaElement)refEntity;
 
diff --git a/platform/lang-api/src/com/intellij/codeInspection/GlobalSimpleInspectionTool.java b/platform/lang-api/src/com/intellij/codeInspection/GlobalSimpleInspectionTool.java
index d302b82b5f18..dd6fbf91f770 100644
--- a/platform/lang-api/src/com/intellij/codeInspection/GlobalSimpleInspectionTool.java
+++ b/platform/lang-api/src/com/intellij/codeInspection/GlobalSimpleInspectionTool.java
@@ -38,10 +38,10 @@ public abstract class GlobalSimpleInspectionTool extends GlobalInspectionTool {
                                  @NotNull ProblemDescriptionsProcessor problemDescriptionsProcessor);
 
   @Override
-  public final void runInspection(AnalysisScope scope,
-                                  InspectionManager manager,
-                                  GlobalInspectionContext globalContext,
-                                  ProblemDescriptionsProcessor problemDescriptionsProcessor) {
+  public final void runInspection(@NotNull AnalysisScope scope,
+                                  @NotNull InspectionManager manager,
+                                  @NotNull GlobalInspectionContext globalContext,
+                                  @NotNull ProblemDescriptionsProcessor problemDescriptionsProcessor) {
     throw new IncorrectOperationException("You must override checkFile() instead");
   }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
index a87663ca95c8..0ef2dac69269 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
@@ -75,9 +75,9 @@ public class GlobalInspectionToolWrapper extends InspectionToolWrapper<GlobalIns
     return getTool().isGraphNeeded();
   }
 
-  public void processFile(final AnalysisScope analysisScope,
-                          final InspectionManager manager,
-                          final GlobalInspectionContext context,
+  public void processFile(@NotNull final AnalysisScope analysisScope,
+                          @NotNull final InspectionManager manager,
+                          @NotNull final GlobalInspectionContext context,
                           final boolean filterSuppressed) {
     context.getRefManager().iterate(new RefVisitor() {
       @Override public void visitElement(@NotNull RefEntity refEntity) {
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
index 63eaae83b888..41b1824772eb 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
@@ -152,7 +152,7 @@ public class ToolsImpl implements Tools {
     myDefaultState.getTool().writeSettings(inspectionElement);
   }
 
-  void readExternal(Element toolElement, InspectionProfileImpl profile) throws InvalidDataException {
+  void readExternal(@NotNull Element toolElement, @NotNull InspectionProfileImpl profile) throws InvalidDataException {
     final String levelName = toolElement.getAttributeValue(LEVEL_ATTRIBUTE);
     final ProfileManager profileManager = profile.getProfileManager();
     final SeverityRegistrar registrar = ((SeverityProvider)profileManager).getOwnSeverityRegistrar();
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java b/platform/platform-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
index 65173fd66c17..50954b986d33 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
@@ -199,7 +199,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
           if (dependency.optional) {
             optionalDependentPlugins.add(id);
             if (dependency.configFile != null && !dependency.configFile.isEmpty()) {
-              myOptionalConfigs.put(id, dependency.configFile);  
+              myOptionalConfigs.put(id, dependency.configFile);
             }
           }
         }
@@ -208,14 +208,14 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
     myDependencies = dependentPlugins.isEmpty() ? PluginId.EMPTY_ARRAY : dependentPlugins.toArray(new PluginId[dependentPlugins.size()]);
     myOptionalDependencies = optionalDependentPlugins.isEmpty() ? PluginId.EMPTY_ARRAY : optionalDependentPlugins.toArray(new PluginId[optionalDependentPlugins.size()]);
 
-    List<HelpSetPath> hsPathes = new ArrayList<HelpSetPath>();
+    List<HelpSetPath> hsPaths = new ArrayList<HelpSetPath>();
     if (pluginBean.helpSets != null) {
       for (PluginHelpSet pluginHelpSet : pluginBean.helpSets) {
         HelpSetPath hsPath = new HelpSetPath(pluginHelpSet.file, pluginHelpSet.path);
-        hsPathes.add(hsPath);
+        hsPaths.add(hsPath);
       }
     }
-    myHelpSets = !hsPathes.isEmpty() ? hsPathes.toArray(new HelpSetPath[hsPathes.size()]) : HelpSetPath.EMPTY;
+    myHelpSets = hsPaths.isEmpty() ? HelpSetPath.EMPTY : hsPaths.toArray(new HelpSetPath[hsPaths.size()]);
 
     myAppComponents = pluginBean.applicationComponents;
     myProjectComponents = pluginBean.projectComponents;
diff --git a/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java b/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java
index 1568a9b3f945..48a5a9d06624 100644
--- a/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java
+++ b/plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java
@@ -52,10 +52,10 @@ public class BooleanMethodIsAlwaysInvertedInspection extends GlobalJavaInspectio
   }
 
   @Override
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity,
-                                                AnalysisScope scope,
-                                                final InspectionManager manager,
-                                                final GlobalInspectionContext globalContext) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity,
+                                                @NotNull AnalysisScope scope,
+                                                @NotNull final InspectionManager manager,
+                                                @NotNull final GlobalInspectionContext globalContext) {
     if (refEntity instanceof RefMethod) {
       RefMethod refMethod = (RefMethod)refEntity;
       if (!refMethod.isReferenced()) return null;
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java
index cc1c4efc348e..77030cec7721 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java
@@ -42,9 +42,9 @@ public class FieldCanBeMovedToSubclassInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefField)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java
index 733f52b2fa7e..4948498513bd 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java
@@ -45,8 +45,8 @@ public class MethodReturnAlwaysConstantInspection extends BaseGlobalInspection {
 
   @Override
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope scope, InspectionManager manager,
-    GlobalInspectionContext globalContext) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope scope, @NotNull InspectionManager manager,
+    @NotNull GlobalInspectionContext globalContext) {
     if (!(refEntity instanceof RefMethod)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java
index b5e749b6c1f9..6580acdaba1c 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java
@@ -43,9 +43,9 @@ public class StaticFieldCanBeMovedToUseInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefField)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java
index af23a468c2a2..74a7abc00439 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependenciesInspection.java
@@ -47,10 +47,10 @@ public class ClassWithTooManyDependenciesInspection
 
   @Override
   public void runInspection(
-    AnalysisScope scope,
-    final InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext,
-    final ProblemDescriptionsProcessor problemDescriptionsProcessor) {
+    @NotNull AnalysisScope scope,
+    @NotNull final InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext,
+    @NotNull final ProblemDescriptionsProcessor problemDescriptionsProcessor) {
     final RefManager refManager = globalInspectionContext.getRefManager();
     refManager.iterate(new RefJavaVisitor() {
 
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java
index 6eae1d24d47f..6f79a8a8a84a 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java
@@ -47,10 +47,10 @@ public class ClassWithTooManyDependentsInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java
index 19deae5818c1..62d3a47d4dfe 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java
@@ -48,10 +48,10 @@ public class ClassWithTooManyTransitiveDependenciesInspection
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java
index b1818783fc8c..3856e37ae373 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java
@@ -48,10 +48,10 @@ public class ClassWithTooManyTransitiveDependentsInspection
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java
index 8f6a4405fb52..0a74e0277dc4 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java
@@ -42,10 +42,10 @@ public class CyclicClassDependencyInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java
index 363944457113..18331fec4382 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java
@@ -42,10 +42,10 @@ public class CyclicClassInitializationInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java
index 8b1bcdc68961..1c96efe2d466 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java
@@ -41,10 +41,10 @@ public class CyclicPackageDependencyInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefPackage)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java
index e7814458a6a5..94ef39be9280 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassIndependentOfModuleInspection.java
@@ -45,10 +45,10 @@ public class ClassIndependentOfModuleInspection extends BaseGlobalInspection {
   @Nullable
   @Override
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope scope,
-    InspectionManager manager,
-    GlobalInspectionContext globalContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope scope,
+    @NotNull InspectionManager manager,
+    @NotNull GlobalInspectionContext globalContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java
index a64708bd3e0c..b1697848c3d9 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ClassOnlyUsedInOneModuleInspection.java
@@ -48,10 +48,10 @@ public class ClassOnlyUsedInOneModuleInspection extends BaseGlobalInspection {
   @Nullable
   @Override
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope scope,
-    InspectionManager manager,
-    GlobalInspectionContext globalContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope scope,
+    @NotNull InspectionManager manager,
+    @NotNull GlobalInspectionContext globalContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java
index 1893ff6e5add..9f5932824a5a 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooFewClassesInspection.java
@@ -47,8 +47,8 @@ public class ModuleWithTooFewClassesInspection extends BaseGlobalInspection {
 
   @Override
   @Nullable
-  public CommonProblemDescriptor[] checkElement(RefEntity refEntity, AnalysisScope analysisScope, InspectionManager inspectionManager,
-                                                GlobalInspectionContext globalInspectionContext) {
+  public CommonProblemDescriptor[] checkElement(@NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope, @NotNull InspectionManager inspectionManager,
+                                                @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefModule)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java
index f7f997416269..57dd6b0350ac 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/modularization/ModuleWithTooManyClassesInspection.java
@@ -46,10 +46,10 @@ public class ModuleWithTooManyClassesInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefModule)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
index 8f98b4daf78a..8a3d9bb24097 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/PackageNamingConventionInspection.java
@@ -76,9 +76,9 @@ public class PackageNamingConventionInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefPackage)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java
index fd8b30f25e26..1f53a74f239f 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassOnlyUsedInOnePackageInspection.java
@@ -43,10 +43,10 @@ public class ClassOnlyUsedInOnePackageInspection extends BaseGlobalInspection {
   @Nullable
   @Override
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope scope,
-    InspectionManager manager,
-    GlobalInspectionContext globalContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope scope,
+    @NotNull InspectionManager manager,
+    @NotNull GlobalInspectionContext globalContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java
index cd191e13b8b8..a333739180a6 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/ClassUnconnectedToPackageInspection.java
@@ -45,10 +45,10 @@ public class ClassUnconnectedToPackageInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager manager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager manager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefClass)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/DisjointPackageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/DisjointPackageInspection.java
index cc193166e218..7c73800a5267 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/DisjointPackageInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/DisjointPackageInspection.java
@@ -47,9 +47,9 @@ public class DisjointPackageInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefPackage)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/EmptyDirectoryInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/EmptyDirectoryInspection.java
index 68fd50f9cc94..a6d481633eb8 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/EmptyDirectoryInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/EmptyDirectoryInspection.java
@@ -61,9 +61,9 @@ public class EmptyDirectoryInspection extends BaseGlobalInspection {
   }
 
   @Override
-  public void runInspection(final AnalysisScope scope, final InspectionManager manager,
-    final GlobalInspectionContext context,
-    final ProblemDescriptionsProcessor processor) {
+  public void runInspection(@NotNull final AnalysisScope scope, @NotNull final InspectionManager manager,
+    @NotNull final GlobalInspectionContext context,
+    @NotNull final ProblemDescriptionsProcessor processor) {
     final Project project = context.getProject();
     final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
     final SearchScope searchScope = scope.toSearchScope();
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageInMultipleModulesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageInMultipleModulesInspection.java
index ce69ce03547a..5f982ba93920 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageInMultipleModulesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageInMultipleModulesInspection.java
@@ -44,9 +44,9 @@ public class PackageInMultipleModulesInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefPackage)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooFewClassesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooFewClassesInspection.java
index c72f37d7ed91..49f24660af8e 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooFewClassesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooFewClassesInspection.java
@@ -46,10 +46,10 @@ public class PackageWithTooFewClassesInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefPackage)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooManyClassesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooManyClassesInspection.java
index ae410bdcc5fc..18b30b3ce63b 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooManyClassesInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/packaging/PackageWithTooManyClassesInspection.java
@@ -46,10 +46,10 @@ public class PackageWithTooManyClassesInspection extends BaseGlobalInspection {
   @Override
   @Nullable
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity,
-    AnalysisScope analysisScope,
-    InspectionManager inspectionManager,
-    GlobalInspectionContext globalInspectionContext) {
+    @NotNull RefEntity refEntity,
+    @NotNull AnalysisScope analysisScope,
+    @NotNull InspectionManager inspectionManager,
+    @NotNull GlobalInspectionContext globalInspectionContext) {
     if (!(refEntity instanceof RefPackage)) {
       return null;
     }
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ElementOnlyUsedFromTestCodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ElementOnlyUsedFromTestCodeInspection.java
index 8a24b7f4ef78..7cb49d1bae51 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ElementOnlyUsedFromTestCodeInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/ElementOnlyUsedFromTestCodeInspection.java
@@ -50,9 +50,9 @@ public class ElementOnlyUsedFromTestCodeInspection
   @Nullable
   @Override
   public CommonProblemDescriptor[] checkElement(
-    RefEntity refEntity, AnalysisScope scope, InspectionManager manager,
-    GlobalInspectionContext globalContext,
-    ProblemDescriptionsProcessor processor) {
+    @NotNull RefEntity refEntity, @NotNull AnalysisScope scope, @NotNull InspectionManager manager,
+    @NotNull GlobalInspectionContext globalContext,
+    @NotNull ProblemDescriptionsProcessor processor) {
     if (!isOnlyUsedFromTestCode(refEntity)) {
       return null;
     }