From fa77cc79ae1e2ff4b7851818927b66cd6b5eecd0 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Fri, 22 Jun 2012 09:52:57 +0200 Subject: [PATCH] move java searching stuff to indexing module --- .../psi/search/searches/ClassInheritorsSearch.java | 2 ++ .../searches/DirectClassInheritorsSearch.java | 3 +++ .../JavaAnonymousClassBaseRefOccurenceIndex.java | 0 .../index/JavaSuperClassNameOccurenceIndex.java | 0 .../impl/search/JavaDirectInheritorsSearcher.java | 13 +++++++------ 5 files changed, 12 insertions(+), 6 deletions(-) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java (100%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/java/stubs/index/JavaSuperClassNameOccurenceIndex.java (100%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java (93%) diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java index 0b283808834c..bf7b89870d83 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java @@ -17,6 +17,7 @@ package com.intellij.psi.search.searches; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.util.Computable; @@ -43,6 +44,7 @@ import java.util.Set; * @author max */ public class ClassInheritorsSearch extends ExtensibleQueryFactory { + public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.classInheritorsSearch"); private static final Logger LOG = Logger.getInstance("#com.intellij.psi.search.searches.ClassInheritorsSearch"); public static final ClassInheritorsSearch INSTANCE = new ClassInheritorsSearch(); diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java index 2ef1574cbf47..da798a15ed3b 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/DirectClassInheritorsSearch.java @@ -15,6 +15,7 @@ */ package com.intellij.psi.search.searches; +import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiAnonymousClass; import com.intellij.psi.PsiClass; @@ -22,11 +23,13 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.util.FilteredQuery; import com.intellij.util.Query; +import com.intellij.util.QueryExecutor; /** * @author max */ public class DirectClassInheritorsSearch extends ExtensibleQueryFactory { + public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.directClassInheritorsSearch"); public static DirectClassInheritorsSearch INSTANCE = new DirectClassInheritorsSearch(); public static class SearchParameters { diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaAnonymousClassBaseRefOccurenceIndex.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaSuperClassNameOccurenceIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaSuperClassNameOccurenceIndex.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaSuperClassNameOccurenceIndex.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaSuperClassNameOccurenceIndex.java diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java similarity index 93% rename from java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java index b495b2bd0d8b..b88ac9e77309 100644 --- a/java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java @@ -3,8 +3,7 @@ package com.intellij.psi.impl.search; import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; -import com.intellij.openapi.fileTypes.StdFileTypes; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -53,8 +52,10 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor() { @Override @@ -96,7 +97,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor> classes = new HashMap>(); for (PsiReferenceList referenceList : candidates) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); final PsiClass candidate = (PsiClass)referenceList.getParent(); if (!checkInheritance(p, aClass, candidate)) continue; @@ -127,7 +128,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor