From: Dmitry Avdeev Date: Wed, 10 Mar 2010 15:07:07 +0000 (+0300) Subject: cleanup X-Git-Tag: 94.527~7^2^2~3^2~2 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=03f650d9ac7e2a691d5e672bfc7004f0affba9b9 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 39d0167f4c81..49860ba3b2c9 100644 --- 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 94ef8782eefc..d7fe9c92c57d 100644 --- 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) {