From f4c1d4aa3fc3374b15c184f774752fdb620ac0e7 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 6 Aug 2013 18:04:59 +0400 Subject: [PATCH] notnull --- .../codeInsight/completion/AllClassesGetter.java | 15 ++++++++------- .../JavaClassNameCompletionContributor.java | 2 +- .../psi/search/searches/AllClassesSearch.java | 16 +++++++++++----- .../impl/search/AllClassesSearchExecutor.java | 13 ++++++++----- .../src/com/intellij/util/CollectConsumer.java | 6 +++++- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java b/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java index ac8297def978..1bdedafa4219 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java @@ -140,9 +140,10 @@ public class AllClassesGetter { } }; - public static void processJavaClasses(final CompletionParameters parameters, - final PrefixMatcher prefixMatcher, final boolean filterByScope, - final Consumer consumer) { + public static void processJavaClasses(@NotNull final CompletionParameters parameters, + @NotNull final PrefixMatcher prefixMatcher, + final boolean filterByScope, + @NotNull final Consumer consumer) { final PsiElement context = parameters.getPosition(); final Project project = context.getProject(); final GlobalSearchScope scope = filterByScope ? context.getContainingFile().getResolveScope() : GlobalSearchScope.allScope(project); @@ -167,10 +168,10 @@ public class AllClassesGetter { processJavaClasses(prefixMatcher, project, scope, processor); } - public static void processJavaClasses(final PrefixMatcher prefixMatcher, - Project project, - GlobalSearchScope scope, - Processor processor) { + public static void processJavaClasses(@NotNull final PrefixMatcher prefixMatcher, + @NotNull Project project, + @NotNull GlobalSearchScope scope, + @NotNull Processor processor) { AllClassesSearch.search(scope, project, new Condition() { @Override public boolean value(String s) { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java index 6bb6999eee23..df113a5a77a1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java @@ -79,7 +79,7 @@ public class JavaClassNameCompletionContributor extends CompletionContributor { return false; } - public static void addAllClasses(CompletionParameters parameters, + public static void addAllClasses(@NotNull CompletionParameters parameters, final boolean filterByScope, @NotNull final PrefixMatcher matcher, @NotNull final Consumer consumer) { diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/AllClassesSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/AllClassesSearch.java index 5ce8995988c1..21027204c180 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/AllClassesSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/AllClassesSearch.java @@ -22,10 +22,12 @@ package com.intellij.psi.search.searches; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Conditions; import com.intellij.psi.PsiClass; import com.intellij.psi.search.SearchScope; import com.intellij.util.Query; import com.intellij.util.QueryExecutor; +import org.jetbrains.annotations.NotNull; public class AllClassesSearch extends ExtensibleQueryFactory { public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.allClassesSearch"); @@ -36,20 +38,22 @@ public class AllClassesSearch extends ExtensibleQueryFactory myShortNameCondition; - public SearchParameters(final SearchScope scope, final Project project) { - this(scope, project, Condition.TRUE); + public SearchParameters(@NotNull SearchScope scope, @NotNull Project project) { + this(scope, project, Conditions.alwaysTrue()); } - public SearchParameters(final SearchScope scope, final Project project, final Condition shortNameCondition) { + public SearchParameters(@NotNull SearchScope scope, @NotNull Project project, @NotNull Condition shortNameCondition) { myScope = scope; myProject = project; myShortNameCondition = shortNameCondition; } + @NotNull public SearchScope getScope() { return myScope; } + @NotNull public Project getProject() { return myProject; } @@ -59,11 +63,13 @@ public class AllClassesSearch extends ExtensibleQueryFactory search(SearchScope scope, Project project) { + @NotNull + public static Query search(@NotNull SearchScope scope, @NotNull Project project) { return INSTANCE.createQuery(new SearchParameters(scope, project)); } - public static Query search(SearchScope scope, Project project, Condition shortNameCondition) { + @NotNull + public static Query search(@NotNull SearchScope scope, @NotNull Project project, @NotNull Condition shortNameCondition) { return INSTANCE.createQuery(new SearchParameters(scope, project, shortNameCondition)); } } \ No newline at end of file diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java index b2e0d84850df..23dd5c77d3d3 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java @@ -50,7 +50,7 @@ public class AllClassesSearchExecutor implements QueryExecutor() { @Override public String[] compute() { @@ -81,7 +82,9 @@ public class AllClassesSearchExecutor implements QueryExecutor processor, final AllClassesSearch.SearchParameters parameters) { + private static boolean processAllClassesInGlobalScope(@NotNull final GlobalSearchScope scope, + @NotNull AllClassesSearch.SearchParameters parameters, + @NotNull Processor processor) { String[] names = getAllClassNames(parameters.getProject()); final ProgressIndicator indicator = ProgressIndicatorProvider.getGlobalProgressIndicator(); if (indicator != null) { @@ -129,7 +132,7 @@ public class AllClassesSearchExecutor implements QueryExecutor processor) { + private static boolean processScopeRootForAllClasses(@NotNull PsiElement scopeRoot, @NotNull final Processor processor) { final boolean[] stopped = {false}; JavaElementVisitor visitor = scopeRoot instanceof PsiCompiledElement ? new JavaRecursiveElementVisitor() { diff --git a/platform/util/src/com/intellij/util/CollectConsumer.java b/platform/util/src/com/intellij/util/CollectConsumer.java index 7a9a4cb37003..620712a97700 100644 --- a/platform/util/src/com/intellij/util/CollectConsumer.java +++ b/platform/util/src/com/intellij/util/CollectConsumer.java @@ -15,6 +15,8 @@ */ package com.intellij.util; +import org.jetbrains.annotations.NotNull; + import java.util.Collection; /** @@ -23,7 +25,7 @@ import java.util.Collection; public class CollectConsumer implements Consumer { private final Collection myResult; - public CollectConsumer(Collection result) { + public CollectConsumer(@NotNull Collection result) { myResult = result; } @@ -31,10 +33,12 @@ public class CollectConsumer implements Consumer { this(new SmartList()); } + @Override public void consume(T t) { myResult.add(t); } + @NotNull public Collection getResult() { return myResult; }