diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java
index 7dd92822237d..1783d36d0a0b 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class RefImplicitConstructorImpl extends RefMethodImpl implements RefImplicitConstructor {
 
-  RefImplicitConstructorImpl(RefClass ownerClass) {
+  RefImplicitConstructorImpl(@NotNull RefClass ownerClass) {
     super(InspectionsBundle.message("inspection.reference.implicit.constructor.name", ownerClass.getName()), ownerClass);
   }
 
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java
index 12f42b7b3f23..e0d9ff172cd8 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java
@@ -47,7 +47,7 @@ public abstract class RefJavaElementImpl extends RefElementImpl implements RefJa
   private static final int IS_USES_DEPRECATION_MASK = 0x200;
   private static final int IS_SYNTHETIC_JSP_ELEMENT_MASK = 0x400;
 
-  protected RefJavaElementImpl(String name, @NotNull RefJavaElement owner) {
+  protected RefJavaElementImpl(@NotNull String name, @NotNull RefJavaElement owner) {
     super(name, owner);
     String am = owner.getAccessModifier();
     doSetAccessModifier(am);
@@ -91,6 +91,7 @@ public abstract class RefJavaElementImpl extends RefElementImpl implements RefJa
     myOutTypeReferences.add(refClass);
   }
 
+  @NotNull
   public static String getName(PsiElement element) {
    if (element instanceof PsiAnonymousClass) {
      PsiAnonymousClass psiAnonymousClass = (PsiAnonymousClass)element;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
index 6845c42fd95f..778b6b47d94a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
@@ -67,7 +67,7 @@ public class RefMethodImpl extends RefJavaElementImpl implements RefMethod {
   }
 
   // To be used only from RefImplicitConstructor.
-  protected RefMethodImpl(String name, @NotNull RefClass ownerClass) {
+  protected RefMethodImpl(@NotNull String name, @NotNull RefClass ownerClass) {
     super(name, ownerClass);
     myOwnerClass = ownerClass;
     ((RefClassImpl)ownerClass).add(this);
@@ -79,7 +79,7 @@ public class RefMethodImpl extends RefJavaElementImpl implements RefMethod {
   }
 
   @Override
-  public void add(RefEntity child) {
+  public void add(@NotNull RefEntity child) {
     if (child instanceof RefParameter) {
       return;
     }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java
index 32649b924a25..b00f25abb82f 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -45,6 +45,7 @@ public class RefPackageImpl extends RefEntityImpl implements RefPackage {
     return myQualifiedName;
   }
 
+  @NotNull
   private static String getPackageSuffix(@NotNull String fullName) {
     int dotIndex = fullName.lastIndexOf('.');
     return (dotIndex >= 0) ? fullName.substring(dotIndex + 1) : fullName;
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
index 619ee155b175..947792b2df41 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -64,7 +64,7 @@ public abstract class RefElementImpl extends RefEntityImpl implements RefElement
   private final Module myModule;
   protected static final int IS_REACHABLE_MASK = 0x40;
 
-  protected RefElementImpl(String name, @NotNull RefElement owner) {
+  protected RefElementImpl(@NotNull String name, @NotNull RefElement owner) {
     super(name, owner.getRefManager());
     myID = null;
     myFlags = 0;
@@ -75,7 +75,7 @@ public abstract class RefElementImpl extends RefEntityImpl implements RefElement
     this(file.getName(), file, manager);
   }
 
-  protected RefElementImpl(String name, @NotNull PsiElement element, @NotNull RefManager manager) {
+  protected RefElementImpl(@NotNull String name, @NotNull PsiElement element, @NotNull RefManager manager) {
     super(name, manager);
     myID = SmartPointerManager.getInstance(manager.getProject()).createSmartPsiElementPointer(element);
     myFlags = 0;