From 0eb25eec20abcf528a546050a77ba199fdce33a1 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 15 Feb 2013 15:44:57 +0400 Subject: [PATCH] notnull --- .../codeInsight/daemon/impl/analysis/HighlightUtil.java | 2 +- .../conflictResolvers/JavaMethodsConflictResolver.java | 6 +++--- .../psi/scope/processor/MethodResolverProcessor.java | 6 +++--- .../src/com/intellij/psi/scope/util/PsiScopesUtil.java | 8 +++++--- .../src/com/intellij/openapi/util/RecursionGuard.java | 6 ++++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 094287ed733e..56b6c252beff 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -1929,7 +1929,7 @@ public class HighlightUtil extends HighlightUtilBase { @Nullable private static HighlightInfo checkReferenceToOurInstanceInsideThisOrSuper(@NotNull final PsiElement expression, - final PsiClass referencedClass, + @NotNull PsiClass referencedClass, final String resolvedName) { if (PsiTreeUtil.getParentOfType(expression, PsiReferenceParameterList.class) != null) return null; PsiElement element = expression.getParent(); diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java index b6d8f1bd93a7..32f13bb2c011 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java @@ -29,6 +29,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.*; import gnu.trove.THashSet; import gnu.trove.TIntArrayList; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; @@ -46,9 +47,8 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{ private final PsiElement myArgumentsList; private final PsiType[] myActualParameterTypes; - public JavaMethodsConflictResolver(PsiExpressionList list) { - myArgumentsList = list; - myActualParameterTypes = list.getExpressionTypes(); + public JavaMethodsConflictResolver(@NotNull PsiExpressionList list) { + this(list, list.getExpressionTypes()); } public JavaMethodsConflictResolver(final PsiElement argumentsList, final PsiType[] actualParameterTypes) { diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java index 1917e393c758..95ac928952de 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java @@ -26,20 +26,20 @@ import org.jetbrains.annotations.NotNull; public class MethodResolverProcessor extends MethodCandidatesProcessor { private boolean myStopAcceptingCandidates = false; - public MethodResolverProcessor(PsiMethodCallExpression place){ + public MethodResolverProcessor(@NotNull PsiMethodCallExpression place){ this(place, new PsiConflictResolver[]{new JavaMethodsConflictResolver(place.getArgumentList())}); setArgumentList(place.getArgumentList()); obtainTypeArguments(place); } - public MethodResolverProcessor(PsiClass classConstr, PsiExpressionList argumentList, PsiElement place) { + public MethodResolverProcessor(PsiClass classConstr, @NotNull PsiExpressionList argumentList, @NotNull PsiElement place) { super(place, new PsiConflictResolver[]{new JavaMethodsConflictResolver(argumentList)}, new SmartList()); setIsConstructor(true); setAccessClass(classConstr); setArgumentList(argumentList); } - public MethodResolverProcessor(final PsiElement place, final PsiConflictResolver[] resolvers) { + public MethodResolverProcessor(@NotNull PsiElement place, @NotNull PsiConflictResolver[] resolvers) { super(place, resolvers, new SmartList()); } diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java index ad3ff0e15ac2..3cf132ee7894 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java @@ -144,12 +144,14 @@ public class PsiScopesUtil { } } - public static boolean resolveAndWalk(PsiScopeProcessor processor, PsiJavaCodeReferenceElement ref, @Nullable PsiElement maxScope) { + public static boolean resolveAndWalk(@NotNull PsiScopeProcessor processor, + @NotNull PsiJavaCodeReferenceElement ref, + @Nullable PsiElement maxScope) { return resolveAndWalk(processor, ref, maxScope, false); } - public static boolean resolveAndWalk(PsiScopeProcessor processor, - PsiJavaCodeReferenceElement ref, + public static boolean resolveAndWalk(@NotNull PsiScopeProcessor processor, + @NotNull PsiJavaCodeReferenceElement ref, @Nullable PsiElement maxScope, boolean incompleteCode) { final PsiElement qualifier = ref.getQualifier(); diff --git a/platform/util/src/com/intellij/openapi/util/RecursionGuard.java b/platform/util/src/com/intellij/openapi/util/RecursionGuard.java index b0843e3e32eb..9df4e10fdb7e 100644 --- a/platform/util/src/com/intellij/openapi/util/RecursionGuard.java +++ b/platform/util/src/com/intellij/openapi/util/RecursionGuard.java @@ -33,7 +33,7 @@ public abstract class RecursionGuard { @SuppressWarnings("JavaDoc") @Deprecated @Nullable - public T doPreventingRecursion(@NotNull Object key, Computable computation) { + public T doPreventingRecursion(@NotNull Object key, @NotNull Computable computation) { return doPreventingRecursion(key, false, computation); } @@ -46,7 +46,7 @@ public abstract class RecursionGuard { * @return the result of the computation or null if we're entering a computation with this key on this thread recursively, */ @Nullable - public abstract T doPreventingRecursion(@NotNull Object key, boolean memoize, Computable computation); + public abstract T doPreventingRecursion(@NotNull Object key, boolean memoize, @NotNull Computable computation); /** * Used in pair with {@link com.intellij.openapi.util.RecursionGuard.StackStamp#mayCacheNow()} to ensure that cached are only the reliable values, @@ -65,11 +65,13 @@ public abstract class RecursionGuard { * @return an object representing the current stack state, managed by {@link RecursionManager} */ + @NotNull public abstract StackStamp markStack(); /** * @return the current thread-local stack of keys passed to {@link #doPreventingRecursion(Object, Computable)} */ + @NotNull public abstract List currentStack(); /**