diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java index ec44f00d15bb..d5a3d0e21356 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java @@ -108,7 +108,7 @@ public class BasicExpressionCompletionContributor { } PsiScopesUtil.treeWalkUp(new BaseScopeProcessor() { - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiLocalVariable) { if (!matcher.prefixMatches(((PsiLocalVariable)element).getName())) { return true; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 2e168b6291ab..791f298c74a0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -389,7 +389,7 @@ public class JavaCompletionUtil { public static PsiType getQualifiedMemberReferenceType(@Nullable PsiType qualifierType, @NotNull final PsiMember member) { final Ref subst = Ref.create(PsiSubstitutor.EMPTY); class MyProcessor extends BaseScopeProcessor implements NameHint, ElementClassHint { - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element == member) { subst.set(state.get(PsiSubstitutor.KEY)); } @@ -407,7 +407,7 @@ public class JavaCompletionUtil { } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return hintKey == NameHint.KEY || hintKey == ElementClassHint.KEY ? (T)this : null; } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java index 03777100a052..7e11f577e223 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java @@ -31,6 +31,7 @@ import com.intellij.psi.ResolveState; import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -63,7 +64,7 @@ public class VariablesProcessor } /** Always return true since we wanna get all vars in scope */ - public boolean execute(PsiElement pe, ResolveState state){ + public boolean execute(@NotNull PsiElement pe, ResolveState state){ if(pe instanceof PsiVariable){ final PsiVariable pvar = (PsiVariable)pe; final String pvar_name = pvar.getName(); @@ -90,7 +91,7 @@ public class VariablesProcessor } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY) { return (T)this; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java index 5723681ecde3..b1fe9212ab69 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java @@ -193,7 +193,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme } } - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { //noinspection SuspiciousMethodCalls if (myNonInitializedFields.contains(element)) { return true; @@ -294,7 +294,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY) { return (T)this; } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index d966cb14d7a7..456812925a0d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -514,7 +514,7 @@ public class CreateFromUsageUtils { final List list = new ArrayList(); VariablesProcessor varproc = new VariablesProcessor("", true, list){ @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if(!(element instanceof PsiField) || JavaPsiFacade.getInstance(element.getProject()).getResolveHelper().isAccessible((PsiField)element, expression, null)) { return super.execute(element, state); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java index 44153db1059b..1d0d44cd300f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java @@ -160,7 +160,7 @@ public class RenameWrongRefFix implements IntentionAction { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiNamedElement && element instanceof PsiModifierListOwner && myFilterMethods == element instanceof PsiMethod) { diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java index b67ab09fa72f..6a8912aba347 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java @@ -162,7 +162,7 @@ public class MacroUtil { final List list = new ArrayList(); VariablesProcessor varproc = new VariablesProcessor(prefix, true, list) { - public boolean execute(PsiElement pe, ResolveState state) { + public boolean execute(@NotNull PsiElement pe, ResolveState state) { if (pe instanceof PsiVariable) { //exclude variables that are initialized in 'place' final PsiExpression initializer = ((PsiVariable)pe).getInitializer(); diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/AddAllMembersProcessor.java b/java/java-impl/src/com/intellij/ide/structureView/impl/AddAllMembersProcessor.java index 1ba819f5f14b..68a66cf25407 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/AddAllMembersProcessor.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/AddAllMembersProcessor.java @@ -21,6 +21,7 @@ import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.util.MethodSignature; import com.intellij.psi.util.PsiUtil; import com.intellij.util.containers.HashMap; +import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Map; @@ -41,7 +42,7 @@ public class AddAllMembersProcessor extends BaseScopeProcessor { myPsiClass = psiClass; } - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { PsiMember member = (PsiMember)element; if (!isInteresting(element)) return true; if (myPsiClass.isInterface() && isObjectMember(element)) return true; diff --git a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java index 55001b8d8224..43a05188a6d2 100644 --- a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java +++ b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java @@ -247,7 +247,7 @@ public abstract class AbstractQualifiedReference myResults = new LinkedHashSet(); @Override - public boolean execute(final PsiElement element, final ResolveState state) { + public boolean execute(@NotNull final PsiElement element, final ResolveState state) { if (isFound()) return false; process(element); return true; 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 4fe0f182794b..20f5f7f57f5b 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 @@ -110,12 +110,12 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer } processorToUse = new PsiScopeProcessor() { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { return !(element instanceof PsiClass || element instanceof PsiPackage) || processor.execute(element, state); } @Override - public V getHint(Key hintKey) { + public V getHint(@NotNull Key hintKey) { return processor.getHint(hintKey); } diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java b/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java index b82f8ae02123..08ecc5379f0b 100644 --- a/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java +++ b/java/java-impl/src/com/intellij/psi/scope/processor/VariablesProcessor.java @@ -24,6 +24,7 @@ import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -52,7 +53,7 @@ public abstract class VariablesProcessor extends BaseScopeProcessor implements E /** Always return true since we wanna get all vars in scope */ @Override - public boolean execute(PsiElement pe, ResolveState state){ + public boolean execute(@NotNull PsiElement pe, ResolveState state){ if(pe instanceof PsiVariable){ final PsiVariable pvar = (PsiVariable)pe; if(!myStaticSensitiveFlag || !myStaticScopeFlag || pvar.hasModifierProperty(PsiModifier.STATIC)){ @@ -79,7 +80,7 @@ public abstract class VariablesProcessor extends BaseScopeProcessor implements E } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY) { return (T)this; } diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java index f52fdbbfc0b0..2d99c94337d0 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java @@ -40,6 +40,7 @@ import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; @@ -512,7 +513,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr return type.isAssignableFrom(varType); } - public boolean execute(PsiElement pe, ResolveState state) { + public boolean execute(@NotNull PsiElement pe, ResolveState state) { super.execute(pe, state); return size() < 2; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java index 9ea434fa27f4..8c436715f9e5 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java @@ -233,7 +233,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava } @Override - public T getHint(final Key hintKey) { + public T getHint(@NotNull final Key hintKey) { return myDelegate.getHint(hintKey); } @@ -250,7 +250,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava } @Override - public boolean execute(final PsiElement element, final ResolveState state) { + public boolean execute(@NotNull final PsiElement element, final ResolveState state) { if (element instanceof PsiModifierListOwner && ((PsiModifierListOwner)element).hasModifierProperty(PsiModifier.STATIC)) { if (element instanceof PsiNamedElement && myIsProcessingOnDemand) { final String name = ((PsiNamedElement)element).getName(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java index 83d61fea1827..39815fb6ad30 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java @@ -25,6 +25,7 @@ import com.intellij.psi.infos.ClassCandidateInfo; import com.intellij.psi.scope.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; import java.util.Iterator; import java.util.List; @@ -210,7 +211,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (!(element instanceof PsiClass)) return true; final PsiClass aClass = (PsiClass)element; final String name = aClass.getName(); @@ -308,7 +309,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY || hintKey == NameHint.KEY) { //noinspection unchecked return (T)this; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java index 316f5a980fc2..f7adb3545e57 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java @@ -21,6 +21,7 @@ import com.intellij.psi.infos.CandidateInfo; import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.NameHint; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.ListIterator; @@ -38,7 +39,7 @@ public class StaticImportResolveProcessor extends BaseScopeProcessor implements } @Override - public boolean execute(final PsiElement candidate, final ResolveState state) { + public boolean execute(@NotNull final PsiElement candidate, final ResolveState state) { if (candidate instanceof PsiMember && ((PsiModifierListOwner)candidate).hasModifierProperty(PsiModifier.STATIC)) { if (candidate instanceof PsiField) { if (checkDomination((PsiMember)candidate, myFieldResults)) return true; @@ -90,7 +91,7 @@ public class StaticImportResolveProcessor extends BaseScopeProcessor implements } @Override - public T getHint(final Key hintKey) { + public T getHint(@NotNull final Key hintKey) { if (hintKey == NameHint.KEY) { //noinspection unchecked return (T)this; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java index 8145272ed390..c65b6e65a6df 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java @@ -34,7 +34,7 @@ public class SymbolCollectingProcessor extends BaseScopeProcessor implements Ele private PsiElement myCurrentFileContext = null; @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY) { //noinspection unchecked return (T)this; @@ -50,7 +50,7 @@ public class SymbolCollectingProcessor extends BaseScopeProcessor implements Ele } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiNamedElement) { PsiNamedElement named = (PsiNamedElement)element; String name = named.getName(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java index 56c9f20d1dd0..c544598b25c5 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java @@ -29,6 +29,7 @@ import com.intellij.psi.scope.conflictResolvers.JavaVariableConflictResolver; import com.intellij.psi.scope.processor.ConflictFilterProcessor; import com.intellij.psi.util.PsiUtil; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; /** * @author ik, dsl @@ -91,7 +92,7 @@ public class VariableResolverProcessor extends ConflictFilterProcessor implement } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (!(element instanceof PsiField) && (myName == null || PsiUtil.checkName(element, myName, myPlace))) { super.execute(element, state); return myResults.isEmpty(); @@ -101,7 +102,7 @@ public class VariableResolverProcessor extends ConflictFilterProcessor implement } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY) { return (T)this; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java index 55adbec6bee5..b03e9a42e3f5 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java @@ -102,7 +102,7 @@ public class PsiCodeBlockImpl extends LazyParseablePsiElement implements PsiCode final Ref conflict = new Ref(Boolean.FALSE); PsiScopesUtil.walkChildrenScopes(this, new BaseScopeProcessor() { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiLocalVariable) { final PsiLocalVariable variable = (PsiLocalVariable)element; final String name = variable.getName(); diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java index 3d928069cc03..c5b44c8d8563 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java @@ -48,7 +48,7 @@ public class ConflictFilterProcessor extends FilterScopeProcessor } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (myCachedResult != null && myCachedResult.length == 1 && myCachedResult[0].isAccessible()) { return false; } @@ -103,7 +103,7 @@ public class ConflictFilterProcessor extends FilterScopeProcessor } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == NameHint.KEY) { //noinspection unchecked return myName != null ? (T)this : null; diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java index 3adf67c1aa49..f1eb3ed46853 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java @@ -23,6 +23,7 @@ import com.intellij.psi.filters.ElementFilter; import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -66,7 +67,7 @@ public class FilterScopeProcessor extends BaseScopeProcessor { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (myFilter.isAcceptable(element, myCurrentDeclarationHolder)) { if (myProcessor != null) { return myProcessor.execute(element, state); @@ -82,7 +83,7 @@ public class FilterScopeProcessor extends BaseScopeProcessor { } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (myProcessor != null) { return myProcessor.getHint(hintKey); } 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 76cc89586b86..1917e393c758 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 @@ -21,6 +21,7 @@ import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.scope.PsiConflictResolver; import com.intellij.psi.scope.conflictResolvers.JavaMethodsConflictResolver; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; public class MethodResolverProcessor extends MethodCandidatesProcessor { private boolean myStopAcceptingCandidates = false; @@ -51,7 +52,7 @@ public class MethodResolverProcessor extends MethodCandidatesProcessor { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { return !myStopAcceptingCandidates && super.execute(element, state); } } diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java index 919eb89bbec0..ffc49b153981 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java @@ -26,6 +26,7 @@ import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.scope.PsiConflictResolver; import com.intellij.psi.util.PsiUtil; import com.intellij.util.SmartList; +import org.jetbrains.annotations.NotNull; /** * Created by IntelliJ IDEA. @@ -116,7 +117,7 @@ public abstract class MethodsProcessor extends ConflictFilterProcessor implement } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == ElementClassHint.KEY) { return (T)this; } diff --git a/platform/core-api/src/com/intellij/psi/scope/PsiScopeProcessor.java b/platform/core-api/src/com/intellij/psi/scope/PsiScopeProcessor.java index b3627c469d1c..28983a78a911 100644 --- a/platform/core-api/src/com/intellij/psi/scope/PsiScopeProcessor.java +++ b/platform/core-api/src/com/intellij/psi/scope/PsiScopeProcessor.java @@ -18,6 +18,7 @@ package com.intellij.psi.scope; import com.intellij.openapi.util.Key; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveState; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public interface PsiScopeProcessor { @@ -30,10 +31,10 @@ public interface PsiScopeProcessor { * @param state current state of resolver. * @return false to stop processing. */ - boolean execute(PsiElement element, ResolveState state); + boolean execute(@NotNull PsiElement element, ResolveState state); @Nullable - T getHint(Key hintKey); + T getHint(@NotNull Key hintKey); void handleEvent(Event event, @Nullable Object associated); } diff --git a/platform/core-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java b/platform/core-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java index 4e35c078f27b..889122c2fe63 100644 --- a/platform/core-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java +++ b/platform/core-impl/src/com/intellij/psi/scope/BaseScopeProcessor.java @@ -16,10 +16,11 @@ package com.intellij.psi.scope; import com.intellij.openapi.util.Key; +import org.jetbrains.annotations.NotNull; public abstract class BaseScopeProcessor implements PsiScopeProcessor { @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return null; } diff --git a/platform/lang-impl/src/com/intellij/psi/scope/DelegatingScopeProcessor.java b/platform/lang-impl/src/com/intellij/psi/scope/DelegatingScopeProcessor.java index 1698e06e5a84..ea5c27501cca 100644 --- a/platform/lang-impl/src/com/intellij/psi/scope/DelegatingScopeProcessor.java +++ b/platform/lang-impl/src/com/intellij/psi/scope/DelegatingScopeProcessor.java @@ -3,6 +3,7 @@ package com.intellij.psi.scope; import com.intellij.openapi.util.Key; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveState; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -16,13 +17,13 @@ public abstract class DelegatingScopeProcessor implements PsiScopeProcessor { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { return myDelegate.execute(element, state); } @Override @Nullable - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return myDelegate.getHint(hintKey); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java index 0cadee6aa3c9..352f44cf2dd6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java @@ -2053,7 +2053,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (myBorderPassed) { return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java index 0ff1054751e4..6aaa6ec69382 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java @@ -235,7 +235,7 @@ public class GroovyDslFileIndex extends ScalarIndexExtension { final DelegatingScopeProcessor nameChecker = new DelegatingScopeProcessor(processor) { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) { return processor.execute(element, state); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java index 1930fc665b11..4b09f3f77b31 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/GroovyConstructorNamedArgumentProvider.java @@ -151,7 +151,7 @@ public class GroovyConstructorNamedArgumentProvider extends GroovyNamedArgumentP } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiMethod || element instanceof PsiField) { String propertyName; PsiType type; @@ -186,7 +186,7 @@ public class GroovyConstructorNamedArgumentProvider extends GroovyNamedArgumentP } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if ((NameHint.KEY == hintKey && myNameHint != null) || ClassHint.KEY == hintKey || ElementClassHint.KEY == hintKey) { //noinspection unchecked return (T) this; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index 581b6674da9f..2b4ce4c98938 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -115,12 +115,12 @@ public class GroovyCompletionContributor extends CompletionContributor { final PsiManager manager = file.getManager(); PsiScopeProcessor processor = new PsiScopeProcessor() { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { return !manager.areElementsEquivalent(element, member); } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return null; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java index 49e7ee2d9e5a..990e30343fdd 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java @@ -146,7 +146,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile { final String expectedName = ResolveUtil.getNameHint(processor); PsiScopeProcessor importProcessor = !processClasses || expectedName == null ? processor : new DelegatingScopeProcessor(processor) { - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { return isImplicitlyImported(element, expectedName) || super.execute(element, state); } }; @@ -245,7 +245,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile { final DelegatingScopeProcessor packageSkipper = new DelegatingScopeProcessor(processor) { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiPackage) return true; return super.execute(element, state); } @@ -276,7 +276,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile { PsiPackage aPackage = facade.findPackage(packageName); if (aPackage != null && !aPackage.processDeclarations(new DelegatingScopeProcessor(processor) { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiPackage) return true; return super.execute(element, state); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java index 43ba6338da9e..c124cb1c0496 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java @@ -395,7 +395,7 @@ public class CompleteReferenceExpression { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) return true; PsiNamedElement namedElement = (PsiNamedElement)element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java index 9f382dae836b..23e962b95722 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java @@ -400,12 +400,12 @@ public class GroovyScriptClass extends LightElement implements GrMemberOwner, Sy final PsiClass scriptClass = getSuperClass(); //noinspection RedundantIfStatement if (scriptClass != null && !scriptClass.processDeclarations(new BaseScopeProcessor() { - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { return !(element instanceof PsiNamedElement) || ResolveUtil.processElement(processor, (PsiNamedElement)element, state); } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return processor.getHint(hintKey); } }, state, lastParent, place)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java index 360fdb2c63cd..0a5de49d1973 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java @@ -105,7 +105,7 @@ public class GdkMethodUtil { @NotNull PsiClass categoryClass) { final DelegatingScopeProcessor delegate = new DelegatingScopeProcessor(processor) { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiMethod) { if (!((PsiMethod)element).hasModifierProperty(PsiModifier.STATIC)) return true; final PsiParameter[] parameters = ((PsiMethod)element).getParameterList().getParameters(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java index 65190bb6b41e..de98c0d447a0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java @@ -69,7 +69,7 @@ public class MixinMemberContributor extends NonCodeMembersContributor { for (PsiClass mixin : mixins) { if (!mixin.processDeclarations(new DelegatingScopeProcessor(processor) { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (isCategoryMethod(element, qualifierType, state.get(PsiSubstitutor.KEY))) { return super.execute(GrGdkMethodImpl.createGdkMethod((PsiMethod)element, false), state); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java index 2ec7cca71ecf..8530d0b9c338 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java @@ -116,7 +116,7 @@ public abstract class NonCodeMembersContributor { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (!wantMore) { return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java index d6615c3db993..388ed8909225 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/noncode/GrCollectionTypeMembersProvider.java @@ -61,7 +61,7 @@ public class GrCollectionTypeMembersProvider extends NonCodeMembersContributor { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiField) { final PsiType type = ((PsiField)element).getType(); final String typeText; @@ -79,7 +79,7 @@ public class GrCollectionTypeMembersProvider extends NonCodeMembersContributor { } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if (hintKey == NameHint.KEY) return processor.getHint(hintKey); if (hintKey == ClassHint.KEY || hintKey == ElementClassHint.KEY) return (T)this; return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/AccessorResolverProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/AccessorResolverProcessor.java index 4a74d3e72cef..b69bd9fada06 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/AccessorResolverProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/AccessorResolverProcessor.java @@ -56,7 +56,7 @@ public class AccessorResolverProcessor extends MethodResolverProcessor { }; } - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (mySearchForGetter) { if (element instanceof PsiMethod && GroovyPropertyUtils.isSimplePropertyGetter((PsiMethod)element, myPropertyName)) { return addAccessor((PsiMethod)element, state); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java index 699f94697fb7..7b3923a8a906 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java @@ -34,7 +34,7 @@ public class CompletionProcessor extends ResolverProcessor { super(name, resolveTargets, place, PsiType.EMPTY_ARRAY); } - public boolean execute(PsiElement element, ResolveState substitutor) { + public boolean execute(@NotNull PsiElement element, ResolveState substitutor) { if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()) { return true; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java index 4fa00bd3444b..90b67c467ccd 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java @@ -86,7 +86,7 @@ public class MethodResolverProcessor extends ResolverProcessor { } - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (myStopExecuting) { return false; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/PropertyResolverProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/PropertyResolverProcessor.java index 8f82f8bf9280..8fc7d4b9c805 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/PropertyResolverProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/PropertyResolverProcessor.java @@ -36,7 +36,7 @@ public class PropertyResolverProcessor extends ResolverProcessor { } @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof GrReferenceExpression && ((GrReferenceExpression)element).getQualifier() != null) { return true; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java index 0870d5a0c9c9..19e46b7fa65b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/ResolverProcessor.java @@ -68,7 +68,7 @@ public class ResolverProcessor implements PsiScopeProcessor, NameHint, ClassHint myTypeArguments = typeArguments; } - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiLocalVariableImpl) { //todo a better hack return true; // the debugger creates a Java code block context and our expressions to evaluate resolve there } @@ -159,7 +159,7 @@ public class ResolverProcessor implements PsiScopeProcessor, NameHint, ClassHint } @SuppressWarnings({"unchecked"}) - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { if ((NameHint.KEY == hintKey && myName != null) || ClassHint.KEY == hintKey || ElementClassHint.KEY == hintKey) { return (T) this; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java index 480fe28df873..fb1a2d0f04c7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java @@ -39,6 +39,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyFileType; import org.jetbrains.plugins.groovy.lang.GrReferenceAdjuster; @@ -615,7 +616,7 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc return type.isAssignableFrom(varType); } - public boolean execute(PsiElement pe, ResolveState state) { + public boolean execute(@NotNull PsiElement pe, ResolveState state) { super.execute(pe, state); return size() < 2; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java index ea1c043e5d69..22948deabf3a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java @@ -562,13 +562,13 @@ public class GenerationUtil { final PsiManager manager = PsiManager.getInstance(context.project); return ResolveUtil.processAllDeclarations(declared, new PsiScopeProcessor() { @Override - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (manager.areElementsEquivalent(element, member)) return false; return true; } @Override - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return null; } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java index 9a517c35899f..9e762596374e 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java @@ -274,7 +274,7 @@ public class JavaI18nUtil extends I18nUtil { private static void addAvailableMethodsOfType(final PsiClassType type, final PsiLiteralExpression context, final Collection result) { PsiScopesUtil.treeWalkUp(new PsiScopeProcessor() { - public boolean execute(PsiElement element, ResolveState state) { + public boolean execute(@NotNull PsiElement element, ResolveState state) { if (element instanceof PsiMethod) { PsiMethod method = (PsiMethod)element; PsiType returnType = method.getReturnType(); @@ -286,7 +286,7 @@ public class JavaI18nUtil extends I18nUtil { return true; } - public T getHint(Key hintKey) { + public T getHint(@NotNull Key hintKey) { return null; } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java index a758a7217a71..1c4b2f6f37c7 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java @@ -152,7 +152,7 @@ public class RncNameImpl extends RncElementImpl implements RncName, PsiReference myKind = kind; } - public boolean execute(PsiElement element, ResolveState substitutor) { + public boolean execute(@NotNull PsiElement element, ResolveState substitutor) { final ASTNode node = element.getNode(); if (node == null) return true;