From 35dfe0a4d82a6eacb2113d096e53f5f359352109 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 4 Mar 2016 18:24:34 +0300
Subject: [PATCH] notnull

---
 .../impl/search/JavaDirectInheritorsSearcher.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
index 077985db8c34..2c3505df7246 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
@@ -37,6 +37,7 @@ import com.intellij.util.QueryExecutor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -100,7 +101,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
       final VirtualFile jarFile = getJarFile(aClass);
       for (List<PsiClass> sameNamedClasses : classes.values()) {
         ProgressManager.checkCanceled();
-        if (!processSameNamedClasses(consumer, sameNamedClasses, jarFile)) return false;
+        if (!processSameNamedClasses(sameNamedClasses, jarFile, consumer)) return false;
       }
     }
 
@@ -135,11 +136,16 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
     return true;
   }
 
-  private static boolean checkInheritance(final DirectClassInheritorsSearch.SearchParameters p, final PsiClass aClass, final PsiClass candidate, Project project) {
+  private static boolean checkInheritance(@NotNull DirectClassInheritorsSearch.SearchParameters p,
+                                          @NotNull PsiClass aClass,
+                                          @NotNull PsiClass candidate,
+                                          @NotNull Project project) {
     return MethodUsagesSearcher.resolveInReadAction(project, () -> !p.isCheckInheritance() || candidate.isInheritor(aClass, false));
   }
 
-  private static boolean processSameNamedClasses(Processor<PsiClass> consumer, List<PsiClass> sameNamedClasses, final VirtualFile jarFile) {
+  private static boolean processSameNamedClasses(@NotNull List<PsiClass> sameNamedClasses,
+                                                 @Nullable VirtualFile jarFile,
+                                                 @NotNull Processor<PsiClass> consumer) {
     // if there is a class from the same jar, prefer it
     boolean sameJarClassFound = false;
 
@@ -157,7 +163,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
     return sameJarClassFound || ContainerUtil.process(sameNamedClasses, consumer);
   }
 
-  private static VirtualFile getJarFile(final PsiClass aClass) {
+  private static VirtualFile getJarFile(@NotNull PsiClass aClass) {
     return ApplicationManager.getApplication().runReadAction((Computable<VirtualFile>)() -> PsiUtil.getJarFile(aClass));
   }
 }