diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/AllOverridingMethodsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/AllOverridingMethodsSearch.java index 32067d077a48..3243525e4d99 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/AllOverridingMethodsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/AllOverridingMethodsSearch.java @@ -34,7 +34,7 @@ import com.intellij.util.QueryExecutor; * (method in original class, overriding method) */ public class AllOverridingMethodsSearch extends ExtensibleQueryFactory, AllOverridingMethodsSearch.SearchParameters> { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.allOverridingMethodsSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.allOverridingMethodsSearch"); public static final AllOverridingMethodsSearch INSTANCE = new AllOverridingMethodsSearch(); public static class SearchParameters { diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java index 79445e685284..b13a5645c4c6 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java @@ -24,7 +24,7 @@ import com.intellij.util.QueryExecutor; import org.jetbrains.annotations.NotNull; public class AnnotatedElementsSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.annotatedElementsSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.annotatedElementsSearch"); public static final AnnotatedElementsSearch INSTANCE = new AnnotatedElementsSearch(); public static class Parameters { 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 ec3599fec62e..1b925e02eabe 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 @@ -43,7 +43,7 @@ import java.util.Set; * @author max */ public class ClassInheritorsSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.classInheritorsSearch"); + public static final 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 1a98d0c167d3..8db0cf827e9b 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 @@ -30,8 +30,8 @@ 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 final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.directClassInheritorsSearch"); + public static final DirectClassInheritorsSearch INSTANCE = new DirectClassInheritorsSearch(); public static class SearchParameters { private final PsiClass myClass; diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/FunctionalExpressionSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/FunctionalExpressionSearch.java index bb05211d92dd..4dcc889233c2 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/FunctionalExpressionSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/FunctionalExpressionSearch.java @@ -32,7 +32,7 @@ import com.intellij.util.QueryExecutor; import org.jetbrains.annotations.NotNull; public class FunctionalExpressionSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.functionalInterfaceSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.functionalInterfaceSearch"); public static final FunctionalExpressionSearch INSTANCE = new FunctionalExpressionSearch(); public static class SearchParameters { diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java index f797300bccbb..8a0b5e3a8144 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; * @author max */ public class MethodReferencesSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.methodReferencesSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.methodReferencesSearch"); public static final MethodReferencesSearch INSTANCE = new MethodReferencesSearch(); public static class SearchParameters { diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java index 4a5f5389e892..bedc0ba91f7e 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/OverridingMethodsSearch.java @@ -31,7 +31,7 @@ import com.intellij.util.QueryExecutor; * @author max */ public class OverridingMethodsSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.overridingMethodsSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.overridingMethodsSearch"); public static final OverridingMethodsSearch INSTANCE = new OverridingMethodsSearch(); public static class SearchParameters { diff --git a/java/java-psi-api/src/com/intellij/psi/search/searches/SuperMethodsSearch.java b/java/java-psi-api/src/com/intellij/psi/search/searches/SuperMethodsSearch.java index dba92bebcb65..c20984ef6a2b 100644 --- a/java/java-psi-api/src/com/intellij/psi/search/searches/SuperMethodsSearch.java +++ b/java/java-psi-api/src/com/intellij/psi/search/searches/SuperMethodsSearch.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; * @author max */ public class SuperMethodsSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.superMethodsSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.superMethodsSearch"); public static final SuperMethodsSearch SUPER_METHODS_SEARCH_INSTANCE = new SuperMethodsSearch(); public static class SearchParameters { diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java index 001712e0f529..6faa3cfaa4e4 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java @@ -34,8 +34,8 @@ import org.jetbrains.annotations.NotNull; * */ public class DefinitionsScopedSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.definitionsScopedSearch"); - public static DefinitionsScopedSearch INSTANCE = new DefinitionsScopedSearch(); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.definitionsScopedSearch"); + public static final DefinitionsScopedSearch INSTANCE = new DefinitionsScopedSearch(); static { final QueryExecutor[] OLD_EXECUTORS = DefinitionsSearch.EP_NAME.getExtensions(); diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java index fe9221a4489c..07791dd1f51f 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; * @author max */ public class ReferencesSearch extends ExtensibleQueryFactory { - public static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.referencesSearch"); private static final ReferencesSearch INSTANCE = new ReferencesSearch(); private ReferencesSearch() { diff --git a/python/src/com/jetbrains/python/psi/search/PyClassInheritorsSearch.java b/python/src/com/jetbrains/python/psi/search/PyClassInheritorsSearch.java index 7d5254f367ed..21aaece7ab9e 100644 --- a/python/src/com/jetbrains/python/psi/search/PyClassInheritorsSearch.java +++ b/python/src/com/jetbrains/python/psi/search/PyClassInheritorsSearch.java @@ -23,7 +23,7 @@ import com.jetbrains.python.psi.PyClass; * @author yole */ public class PyClassInheritorsSearch extends ExtensibleQueryFactory { - public static PyClassInheritorsSearch INSTANCE = new PyClassInheritorsSearch(); + public static final PyClassInheritorsSearch INSTANCE = new PyClassInheritorsSearch(); public static class SearchParameters { private final PyClass mySuperClass; diff --git a/python/src/com/jetbrains/python/psi/search/PySuperMethodsSearch.java b/python/src/com/jetbrains/python/psi/search/PySuperMethodsSearch.java index 115f4927dc0e..577205e1e766 100644 --- a/python/src/com/jetbrains/python/psi/search/PySuperMethodsSearch.java +++ b/python/src/com/jetbrains/python/psi/search/PySuperMethodsSearch.java @@ -28,7 +28,7 @@ import java.util.List; * @author yole */ public class PySuperMethodsSearch extends ExtensibleQueryFactory { - public static PySuperMethodsSearch INSTANCE = new PySuperMethodsSearch(); + public static final PySuperMethodsSearch INSTANCE = new PySuperMethodsSearch(); private static PyFunction getBaseMethod(List superMethods, PyClass containingClass) {