move searchers to indexing module

java/execution/impl/execution-impl.iml

@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="testRunner" exported="" />
     <orderEntry type="module" module-name="compiler-openapi" />
     <orderEntry type="module" module-name="java-impl" />
+    <orderEntry type="module" module-name="java-indexing-api" />
   </component>
   <component name="copyright">
     <Base>

java/java-impl/java-impl.iml

@@ -32,6 +32,7 @@
     <orderEntry type="module" module-name="java-psi-impl" exported="" />
     <orderEntry type="module" module-name="RegExpSupport" />
     <orderEntry type="module" module-name="java-indexing-impl" exported="" />
+    <orderEntry type="module" module-name="java-indexing-api" />
   </component>
   <component name="copyright">
     <Base>

java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java

@@ -33,10 +33,8 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;
-import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
@@ -64,7 +62,6 @@ import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.Query;
 import com.intellij.util.VisibilityUtil;
 import com.intellij.util.containers.HashMap;
-import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java

@@ -34,7 +34,6 @@ import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
-import com.intellij.refactoring.util.ConflictsUtil;
 import com.intellij.refactoring.util.MoveRenameUsageInfo;
 import com.intellij.refactoring.util.RefactoringUIUtil;
 import com.intellij.refactoring.util.RefactoringUtil;

java/java-indexing-api/java-indexing-api.iml

@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="java-psi-api" />
   </component>
 </module>
 

java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java

@@ -18,7 +18,7 @@ package com.intellij.psi.search.searches;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Pair;
@@ -56,7 +56,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
 
         LOG.assertTrue(searchScope != null);
 
-        ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator();
+        ProgressIndicator progress = ProgressIndicatorProvider.getInstance().getProgressIndicator();
         if (progress != null) {
           progress.pushState();
           String className = ApplicationManager.getApplication().runReadAction(new Computable<String>() {
@@ -171,7 +171,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
       return AllClassesSearch.search(searchScope, baseClass.getProject(), parameters.getNameCondition()).forEach(new Processor<PsiClass>() {
         @Override
         public boolean process(final PsiClass aClass) {
-          ProgressManager.checkCanceled();
+          ProgressIndicatorProvider.checkCanceled();
           final String qname1 = ApplicationManager.getApplication().runReadAction(new Computable<String>() {
             @Override
             @Nullable
@@ -193,7 +193,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
     final Processor<PsiClass> processor = new Processor<PsiClass>() {
       @Override
       public boolean process(final PsiClass candidate) {
-        ProgressManager.checkCanceled();
+        ProgressIndicatorProvider.checkCanceled();
 
         final Ref<Boolean> result = new Ref<Boolean>();
         final String[] fqn = new String[1];
@@ -233,7 +233,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
     final GlobalSearchScope projectScope = GlobalSearchScope.allScope(baseClass.getProject());
     final JavaPsiFacade facade = JavaPsiFacade.getInstance(projectScope.getProject());
     while (!stack.isEmpty()) {
-      ProgressManager.checkCanceled();
+      ProgressIndicatorProvider.checkCanceled();
 
       Pair<Reference<PsiClass>, String> pair = stack.pop();
       PsiClass psiClass = pair.getFirst().get();

java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

java/java-indexing-impl/java-indexing-impl.iml

@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="indexing-impl" exported="" />
     <orderEntry type="module" module-name="projectModel-api" />
     <orderEntry type="module" module-name="projectModel-impl" />
+    <orderEntry type="module" module-name="java-indexing-api" />
   </component>
 </module>
 

java/java-tests/java-tests.iml

@@ -29,6 +29,7 @@
     <orderEntry type="module" module-name="platform-tests" scope="TEST" />
     <orderEntry type="module" module-name="IntentionPowerPackPlugin" scope="TEST" />
     <orderEntry type="module" module-name="InspectionGadgetsPlugin" scope="TEST" />
+    <orderEntry type="module" module-name="java-indexing-api" scope="TEST" />
   </component>
 </module>
 

java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImplementationsViewTest.java

@@ -2,7 +2,6 @@ package com.intellij.codeInsight.daemon;
 
 import com.intellij.codeInsight.TargetElementUtilBase;
 import com.intellij.codeInsight.hint.ImplementationViewComponent;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;