cleanup

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
index 39d0167f4c81eb35bce8814eb7fbc0407ae67709..49860ba3b2c9288834a750c03a06dfbbf0c58c3e 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
@@ -211,6 +211,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
     return advancedResolve(true).getElement();
   }
 
+  @NotNull
   public Object[] getVariants() {
     PsiElement context = getContext();
     if (context == null) {
@@ -552,6 +553,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
     return doResolveMember(aClass, memberName);
   }
 
+  @Nullable
   private static PsiElement doResolveMember(PsiClass aClass, String memberName) {
     PsiMember member = aClass.findFieldByName(memberName, true);
     if (member != null) return member;

diff --git a/java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java b/java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
index 94ef8782eefc75b138deac87d3bebd4c77418cf0..d7fe9c92c57da4e0209de4c9cb1a4280a91d2d2e 100644 (file)
--- a/java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
+++ b/java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
@@ -105,6 +105,7 @@ public class CanonicalPsiTypeConverterImpl extends CanonicalPsiTypeConverter imp
               }
             }
 
+            @NotNull
             public Object[] getVariants() {
               final Object[] variants = super.getVariants();
               if (myIndex == 0) {