diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java index 070e5daee1..fa3dd3af30 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java @@ -12,19 +12,17 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.callMatcher.CallMatcher; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.project.Project; import consulo.util.collection.ContainerUtil; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import jakarta.inject.Inject; import one.util.streamex.EntryStream; import one.util.streamex.StreamEx; import org.jetbrains.annotations.Contract; -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; - import java.util.*; import static com.intellij.java.analysis.impl.codeInspection.dataFlow.JavaMethodContractUtil.ORG_JETBRAINS_ANNOTATIONS_CONTRACT; @@ -44,9 +42,9 @@ public class DefaultInferredAnnotationProvider implements InferredAnnotationProv // Could be added via external annotations, but there are many signatures to handle // and we have troubles supporting external annotations for JDK 9+ private static final CallMatcher IMMUTABLE_FACTORY = CallMatcher.anyOf( - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_LIST, "of", "copyOf"), - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_SET, "of", "copyOf"), - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_MAP, "of", "ofEntries", "copyOf", "entry") + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_LIST, "of", "copyOf"), + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_SET, "of", "copyOf"), + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_MAP, "of", "ofEntries", "copyOf", "entry") ); private final NullableNotNullManager myNullabilityManager; @@ -213,10 +211,10 @@ private PsiAnnotation getInferredNullabilityAnnotation(PsiParameter parameter) { PsiClass containingClass = method.getContainingClass(); if (containingClass != null) { String className = containingClass.getQualifiedName(); - if (JavaClassNames.JAVA_UTIL_LIST.equals(className) - || JavaClassNames.JAVA_UTIL_SET.equals(className) - || JavaClassNames.JAVA_UTIL_MAP.equals(className) - || JavaClassNames.JAVA_UTIL_ENUM_SET.equals(className)) { + if (CommonClassNames.JAVA_UTIL_LIST.equals(className) + || CommonClassNames.JAVA_UTIL_SET.equals(className) + || CommonClassNames.JAVA_UTIL_MAP.equals(className) + || CommonClassNames.JAVA_UTIL_ENUM_SET.equals(className)) { return ProjectBytecodeAnalysis.getInstance(myProject).getNotNullAnnotation(); } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java index afdbed4117..1bc3c3f13d 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java @@ -18,15 +18,13 @@ import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.psiutils.TypeUtils; import consulo.application.util.CachedValueProvider; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.util.LanguageCachedValueUtil; import consulo.util.collection.ArrayUtil; import consulo.util.lang.reflect.ReflectionUtil; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; -import jakarta.annotation.Nonnull; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -51,7 +49,7 @@ final class CustomMethodHandlers { staticCall(JAVA_LANG_FLOAT, "toString", "toHexString").parameterTypes("float"), staticCall(JAVA_LANG_BYTE, "toString").parameterTypes("byte"), staticCall(JAVA_LANG_SHORT, "toString").parameterTypes("short"), - staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes(JavaClassNames.JAVA_LANG_STRING), + staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes(CommonClassNames.JAVA_LANG_STRING), staticCall(JAVA_LANG_INTEGER, "compare", "compareUnsigned").parameterTypes("int", "int"), staticCall(JAVA_LANG_LONG, "compare", "compareUnsigned").parameterTypes("long", "long"), staticCall(JAVA_LANG_DOUBLE, "compare").parameterTypes("double", "double"), diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java index 4ae5b61e00..590bb0e412 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java @@ -32,7 +32,6 @@ import consulo.application.util.registry.Registry; import consulo.document.util.TextRange; import consulo.java.analysis.localize.JavaAnalysisLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.*; import consulo.language.editor.inspection.localize.InspectionLocalize; @@ -1112,7 +1111,7 @@ private static boolean shouldBeSuppressed(PsiElement anchor) { && TRUE_OR_FALSE.contains(ref.getReferenceName()) && ref.resolve() instanceof PsiField field) { PsiClass containingClass = field.getContainingClass(); - if (containingClass != null && JavaClassNames.JAVA_LANG_BOOLEAN.equals(containingClass.getQualifiedName())) { + if (containingClass != null && CommonClassNames.JAVA_LANG_BOOLEAN.equals(containingClass.getQualifiedName())) { return true; } } @@ -1133,7 +1132,7 @@ private static boolean shouldBeSuppressed(PsiElement anchor) { } // We assume all Void variables as null because you cannot instantiate it without dirty hacks // However reporting them as "always null" looks redundant (dereferences or comparisons will be reported though). - if (TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_VOID, expression.getType())) { + if (TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_VOID, expression.getType())) { return true; } if (isFlagCheck(anchor)) { @@ -1257,7 +1256,7 @@ private void reportNullableReturns( } // no warnings for Void methods, where only null can be possibly returned - if (returnType == null || returnType.equalsToText(JavaClassNames.JAVA_LANG_VOID)) { + if (returnType == null || returnType.equalsToText(CommonClassNames.JAVA_LANG_VOID)) { return; } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInstructionVisitor.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInstructionVisitor.java index bd38efead2..de5b382135 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInstructionVisitor.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInstructionVisitor.java @@ -17,7 +17,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.application.Application; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import consulo.logging.Logger; @@ -55,12 +54,12 @@ final class DataFlowInstructionVisitor extends StandardInstructionVisitor { private final List myEndOfInitializerStates = new ArrayList<>(); private static final CallMatcher USELESS_SAME_ARGUMENTS = CallMatcher.anyOf( - CallMatcher.staticCall(JavaClassNames.JAVA_LANG_MATH, "min", "max").parameterCount(2), - CallMatcher.staticCall(JavaClassNames.JAVA_LANG_INTEGER, "min", "max").parameterCount(2), - CallMatcher.staticCall(JavaClassNames.JAVA_LANG_LONG, "min", "max").parameterCount(2), - CallMatcher.staticCall(JavaClassNames.JAVA_LANG_FLOAT, "min", "max").parameterCount(2), - CallMatcher.staticCall(JavaClassNames.JAVA_LANG_DOUBLE, "min", "max").parameterCount(2), - CallMatcher.instanceCall(JavaClassNames.JAVA_LANG_STRING, "replace").parameterCount(2) + CallMatcher.staticCall(CommonClassNames.JAVA_LANG_MATH, "min", "max").parameterCount(2), + CallMatcher.staticCall(CommonClassNames.JAVA_LANG_INTEGER, "min", "max").parameterCount(2), + CallMatcher.staticCall(CommonClassNames.JAVA_LANG_LONG, "min", "max").parameterCount(2), + CallMatcher.staticCall(CommonClassNames.JAVA_LANG_FLOAT, "min", "max").parameterCount(2), + CallMatcher.staticCall(CommonClassNames.JAVA_LANG_DOUBLE, "min", "max").parameterCount(2), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "replace").parameterCount(2) ); @Override diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DfaOptionalSupport.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DfaOptionalSupport.java index 31b2c85a3d..8c04657f71 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DfaOptionalSupport.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DfaOptionalSupport.java @@ -8,7 +8,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.psiutils.ExpressionUtils; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.editor.localize.CommonQuickFixLocalize; @@ -29,7 +28,7 @@ public static LocalQuickFix registerReplaceOptionalOfWithOfNullableFix(@Nonnull PsiClass containingClass = method == null ? null : method.getContainingClass(); if (containingClass != null && "of".equals(method.getName())) { String qualifiedName = containingClass.getQualifiedName(); - if (JavaClassNames.JAVA_UTIL_OPTIONAL.equals(qualifiedName)) { + if (CommonClassNames.JAVA_UTIL_OPTIONAL.equals(qualifiedName)) { return new ReplaceOptionalCallFix("ofNullable", false); } if (OptionalUtil.GUAVA_OPTIONAL.equals(qualifiedName)) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaExpressionFactory.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaExpressionFactory.java index ca36cc92c5..43337ba932 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaExpressionFactory.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaExpressionFactory.java @@ -19,15 +19,13 @@ import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.ig.psiutils.ExpressionUtils; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.lang.ObjectUtil; -import one.util.streamex.LongStreamEx; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import one.util.streamex.LongStreamEx; +import org.jetbrains.annotations.Contract; import java.util.HashMap; import java.util.List; @@ -439,13 +437,13 @@ public boolean equals(Object obj) { public static final class GetterDescriptor implements VariableDescriptor { private static final CallMatcher STABLE_METHODS = CallMatcher.anyOf( - CallMatcher.instanceCall(JavaClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0), CallMatcher.instanceCall("java.lang.reflect.Member", "getName", "getModifiers", "getDeclaringClass", "isSynthetic"), CallMatcher.instanceCall("java.lang.reflect.Executable", "getParameterCount", "isVarArgs"), CallMatcher.instanceCall("java.lang.reflect.Field", "getType"), CallMatcher.instanceCall("java.lang.reflect.Method", "getReturnType"), CallMatcher.instanceCall( - JavaClassNames.JAVA_LANG_CLASS, + CommonClassNames.JAVA_LANG_CLASS, "getName", "isInterface", "isArray", diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaValueFactory.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaValueFactory.java index 0244624cf0..c266ee6343 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaValueFactory.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaValueFactory.java @@ -16,7 +16,6 @@ import com.siyeh.ig.psiutils.ExpressionUtils; import consulo.annotation.access.RequiredReadAction; import consulo.application.util.CachedValueProvider; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.pattern.ElementPattern; import consulo.language.psi.PsiCompiledElement; import consulo.language.psi.PsiElement; @@ -217,7 +216,7 @@ private static Boolean computeJavaLangBooleanFieldReference(PsiVariable variable return null; } PsiClass psiClass = field.getContainingClass(); - if (psiClass == null || !JavaClassNames.JAVA_LANG_BOOLEAN.equals(psiClass.getQualifiedName())) { + if (psiClass == null || !CommonClassNames.JAVA_LANG_BOOLEAN.equals(psiClass.getQualifiedName())) { return null; } String name = variable.getName(); @@ -292,7 +291,7 @@ public DfaValue createCommonValue(@Nonnull PsiExpression[] expressions, PsiType private static class ClassInitializationInfo { private static final CallMatcher SAFE_CALLS = - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_OBJECTS, "requireNonNull"); + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_OBJECTS, "requireNonNull"); final boolean myCanInstantiateItself; final boolean myCtorsCallMethods; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java index 3bc377340f..f6f66331ce 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java @@ -19,11 +19,9 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.MethodSignatureUtil; import consulo.annotation.component.ExtensionImpl; -import consulo.application.ApplicationManager; import consulo.application.util.CachedValueProvider; import consulo.application.util.CachedValuesManager; import consulo.application.util.function.Computable; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalInspectionToolSession; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemsHolder; @@ -58,7 +56,7 @@ public PsiElementVisitor buildVisitorImpl( @Override @Nullable public PsiClass compute() { - return psiFacade.findClass(JavaClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(project)); + return psiFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(project)); } } ); diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java b/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java index 86077c1cd2..c2603f3203 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java @@ -21,7 +21,6 @@ import com.siyeh.ig.psiutils.CollectionUtils; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; public abstract class ExtendsConcreteCollectionInspectionBase extends BaseInspection { @@ -65,7 +64,7 @@ public void visitClass(@Nonnull PsiClass aClass) { final String qualifiedName = superClass.getQualifiedName(); if ("java.util.LinkedHashMap".equals(qualifiedName)) { final PsiMethod[] methods = aClass.findMethodsByName("removeEldestEntry", false); - final PsiClassType entryType = TypeUtils.getType(JavaClassNames.JAVA_UTIL_MAP_ENTRY, aClass); + final PsiClassType entryType = TypeUtils.getType(CommonClassNames.JAVA_UTIL_MAP_ENTRY, aClass); for (PsiMethod method : methods) { if (!PsiType.BOOLEAN.equals(method.getReturnType())) { continue; diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java index 7cd5baa5c0..59fcc7599c 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java @@ -1,25 +1,20 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.siyeh.ig.psiutils; -import com.intellij.java.language.psi.PsiConditionalExpression; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiMethodCallExpression; -import com.intellij.java.language.psi.PsiReferenceExpression; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.callMatcher.CallMatcher; -import consulo.java.language.module.util.JavaClassNames; import consulo.util.collection.ArrayUtil; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; -import jakarta.annotation.Nonnull; - /** * Represents a model of PsiExpression which checks whether two expressions are equal (via Object.equals directly or indirectly). */ public class EqualityCheck { private static final CallMatcher OBJECT_EQUALS = CallMatcher.anyOf( - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_OBJECTS, "equals").parameterCount(2), + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_OBJECTS, "equals").parameterCount(2), CallMatcher.staticCall("com.google.common.base.Objects", "equal").parameterCount(2)); private final @Nonnull diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExceptionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExceptionUtils.java index 014b925efc..49dcd6f211 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExceptionUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExceptionUtils.java @@ -19,12 +19,11 @@ import com.intellij.java.language.impl.refactoring.util.RefactoringChangeUtil; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; @@ -37,10 +36,10 @@ private ExceptionUtils() { private static final Set s_genericExceptionTypes = new HashSet<>(4); static { - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_THROWABLE); - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_EXCEPTION); - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION); - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_ERROR); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_THROWABLE); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_EXCEPTION); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_ERROR); } @Nonnull @@ -209,7 +208,7 @@ public static boolean isExceptionArgument(@Nonnull PsiExpression expression) { final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(expression, PsiNewExpression.class, true, PsiCodeBlock.class, PsiClass.class); if (newExpression != null) { final PsiType newExpressionType = newExpression.getType(); - if (InheritanceUtil.isInheritor(newExpressionType, JavaClassNames.JAVA_LANG_THROWABLE)) { + if (InheritanceUtil.isInheritor(newExpressionType, CommonClassNames.JAVA_LANG_THROWABLE)) { return true; } } else { diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpectedTypeUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpectedTypeUtils.java index 93389491ac..e67d3fad4b 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpectedTypeUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpectedTypeUtils.java @@ -19,14 +19,12 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiTypesUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; import consulo.util.collection.ArrayUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -291,7 +289,7 @@ public void visitForeachStatement(PsiForeachStatement statement) { } final PsiClassType classType = (PsiClassType) iteratedValueType; final PsiType[] parameters = classType.getParameters(); - final PsiClass iterableClass = ClassUtils.findClass(JavaClassNames.JAVA_LANG_ITERABLE, statement); + final PsiClass iterableClass = ClassUtils.findClass(CommonClassNames.JAVA_LANG_ITERABLE, statement); if (iterableClass == null) { expectedType = null; } else { diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java index f153dba7d5..636735eaf2 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java @@ -26,7 +26,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.application.util.CachedValueProvider; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiModificationTracker; @@ -50,14 +49,14 @@ import static consulo.util.lang.ObjectUtil.tryCast; public class ExpressionUtils { - static final Set STRING_BUILDER_CLASS_NAMES = Set.of(JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER); - static final Set PRINT_CLASS_NAMES = Set.of(JavaClassNames.JAVA_IO_PRINT_STREAM, JavaClassNames.JAVA_IO_PRINT_WRITER); + static final Set STRING_BUILDER_CLASS_NAMES = Set.of(CommonClassNames.JAVA_LANG_STRING_BUILDER, CommonClassNames.JAVA_LANG_STRING_BUFFER); + static final Set PRINT_CLASS_NAMES = Set.of(CommonClassNames.JAVA_IO_PRINT_STREAM, CommonClassNames.JAVA_IO_PRINT_WRITER); static final Set PRINT_METHOD_NAMES = Set.of("print", "println"); static final Set SLF4J_LOGGING_CLASS_NAMES = Set.of("org.slf4j.Logger"); static final Set SLF4J_LOGGING_METHOD_NAMES = Set.of("trace", "debug", "info", "warn", "error"); static final Set CONVERTABLE_BOXED_CLASS_NAMES = - Set.of(JavaClassNames.JAVA_LANG_BYTE, JavaClassNames.JAVA_LANG_CHARACTER, JavaClassNames.JAVA_LANG_SHORT); + Set.of(CommonClassNames.JAVA_LANG_BYTE, CommonClassNames.JAVA_LANG_CHARACTER, CommonClassNames.JAVA_LANG_SHORT); static final List POLYMORPHIC_SIGNATURE_ANNOTATION = Collections.singletonList("java.lang.invoke.MethodHandle.PolymorphicSignature"); @@ -167,7 +166,7 @@ && isEvaluatedAtCompileTime(conditional.getThenExpression()) return false; } final PsiType type = castType.getType(); - return TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, type); + return TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, type); } return false; } @@ -487,13 +486,13 @@ public static boolean hasType(@Nullable PsiExpression expression, @Nonnull Strin } public static boolean hasStringType(@Nullable PsiExpression expression) { - return hasType(expression, JavaClassNames.JAVA_LANG_STRING); + return hasType(expression, CommonClassNames.JAVA_LANG_STRING); } public static boolean isConversionToStringNecessary(PsiExpression expression, boolean throwable) { final PsiElement parent = ParenthesesUtils.getParentSkipParentheses(expression); if (parent instanceof PsiPolyadicExpression polyadic) { - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING, polyadic.getType())) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING, polyadic.getType())) { return true; } final PsiExpression[] operands = polyadic.getOperands(); @@ -654,7 +653,7 @@ public static PsiExpression getValueComparedWithNull(@Nonnull PsiBinaryExpressio public static boolean isConcatenation(PsiElement element) { if (element instanceof PsiPolyadicExpression polyadic) { final PsiType type = polyadic.getType(); - return type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return type != null && type.equalsToText(CommonClassNames.JAVA_LANG_STRING); } return false; } @@ -1361,12 +1360,12 @@ private static boolean isConstantArray(PsiVariable array) { } if (reference.getParent() instanceof PsiMethodCallExpression methodCall && MethodCallUtils.isCallToMethod( - methodCall, - JavaClassNames.JAVA_LANG_OBJECT, - null, - "clone", - PsiType.EMPTY_ARRAY - )) { + methodCall, + CommonClassNames.JAVA_LANG_OBJECT, + null, + "clone", + PsiType.EMPTY_ARRAY + )) { return true; } } diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java index c19a5cb35e..c6f831122f 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java @@ -159,10 +159,10 @@ private boolean usesReflection(PsiMethod method) { } @NonNls final String qualifiedName = containingClass.getQualifiedName(); if ("getDeclaredFields".equals(name)) { - return JavaClassNames.JAVA_LANG_CLASS.equals(qualifiedName); + return CommonClassNames.JAVA_LANG_CLASS.equals(qualifiedName); } else if ("toString".equals(name)) { - return "org.apache.commons.lang.builder.ReflectionToStringBuilder".equals(qualifiedName) || - JavaClassNames.JAVA_UTIL_OBJECTS.equals(qualifiedName); + return "org.apache.commons.lang.builder.ReflectionToStringBuilder".equals(qualifiedName) + || CommonClassNames.JAVA_UTIL_OBJECTS.equals(qualifiedName); } return false; } diff --git a/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java b/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java index 8d884bcfed..4319c86043 100644 --- a/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java +++ b/java-debugger-api/src/main/java/com/intellij/java/debugger/engine/DebuggerUtils.java @@ -35,7 +35,6 @@ import consulo.ide.ServiceManager; import consulo.internal.com.sun.jdi.*; import consulo.internal.com.sun.jdi.connect.spi.TransportService; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiCodeFragment; import consulo.language.psi.PsiElement; @@ -110,7 +109,7 @@ public static String getValueAsString(EvaluationContext evaluationContext, Value Method toStringMethod = debugProcess.getUserData(TO_STRING_METHOD_KEY); if (toStringMethod == null) { try { - ReferenceType refType = objRef.virtualMachine().classesByName(JavaClassNames.JAVA_LANG_OBJECT).get(0); + ReferenceType refType = objRef.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT).get(0); toStringMethod = findMethod(refType, "toString", "()Ljava/lang/String;"); debugProcess.putUserData(TO_STRING_METHOD_KEY, toStringMethod); } @@ -161,7 +160,7 @@ public static Method findMethod(@Nonnull ReferenceType refType, String methodNam if (refType instanceof ArrayType) { // for array types methodByName() in JDI always returns empty list Method method = - findMethod(refType.virtualMachine().classesByName(JavaClassNames.JAVA_LANG_OBJECT).get(0), methodName, methodSignature); + findMethod(refType.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT).get(0), methodName, methodSignature); if (method != null) { return method; } @@ -267,7 +266,7 @@ public static boolean instanceOf(@Nonnull String subType, @Nonnull String superT return InheritanceUtil.isInheritorOrSelf(psiNodeClass, psiRendererClass, true); } else if (nodeClass.dims > rendererClass.dims) { - return rendererClass.className.equals(JavaClassNames.JAVA_LANG_OBJECT); + return rendererClass.className.equals(CommonClassNames.JAVA_LANG_OBJECT); } return false; } @@ -278,8 +277,8 @@ public static Type getSuperType(@Nullable Type subType, @Nonnull String superTyp return null; } - if (JavaClassNames.JAVA_LANG_OBJECT.equals(superType)) { - List list = subType.virtualMachine().classesByName(JavaClassNames.JAVA_LANG_OBJECT); + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superType)) { + List list = subType.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT); if (list.size() > 0) { return (ReferenceType)list.get(0); } @@ -355,8 +354,8 @@ else if (subType instanceof PrimitiveType) { } //only for interfaces and arrays - if (JavaClassNames.JAVA_LANG_OBJECT.equals(superType)) { - List list = subType.virtualMachine().classesByName(JavaClassNames.JAVA_LANG_OBJECT); + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superType)) { + List list = subType.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT); if (list.size() > 0) { return (ReferenceType)list.get(0); } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java index da574b2668..117ef05e1b 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java @@ -53,6 +53,7 @@ import com.intellij.java.debugger.ui.classFilter.DebuggerClassFilterProvider; import com.intellij.java.execution.configurations.RemoteConnection; import com.intellij.java.language.projectRoots.JavaSdkType; +import com.intellij.java.language.psi.CommonClassNames; import consulo.annotation.access.RequiredReadAction; import consulo.application.util.Semaphore; import consulo.content.bundle.Sdk; @@ -71,7 +72,6 @@ import consulo.internal.com.sun.jdi.request.EventRequestManager; import consulo.internal.com.sun.jdi.request.StepRequest; import consulo.java.language.bundle.JavaSdkTypeUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiFile; import consulo.language.psi.PsiManager; import consulo.language.psi.scope.GlobalSearchScope; @@ -1092,7 +1092,7 @@ private E invokeMethodAndFork(SuspendContextImpl context) && arrayType.componentType() instanceof InterfaceType) { List argTypes = myMethod.argumentTypeNames(); if (argTypes.size() > lastIndex - && argTypes.get(lastIndex).startsWith(JavaClassNames.JAVA_LANG_OBJECT)) { + && argTypes.get(lastIndex).startsWith(CommonClassNames.JAVA_LANG_OBJECT)) { // unwrap array of interfaces for vararg param myArgs.remove(lastIndex); myArgs.addAll(arrayRef.getValues()); @@ -1415,7 +1415,7 @@ public ReferenceType loadClass(EvaluationContextImpl evaluationContext, String q qName = reformatArrayName(qName); ReferenceType refType = null; VirtualMachineProxyImpl virtualMachine = getVirtualMachineProxy(); - ClassType classClassType = (ClassType)ContainerUtil.getFirstItem(virtualMachine.classesByName(JavaClassNames.JAVA_LANG_CLASS)); + ClassType classClassType = (ClassType)ContainerUtil.getFirstItem(virtualMachine.classesByName(CommonClassNames.JAVA_LANG_CLASS)); if (classClassType != null) { Method forNameMethod; List args = new ArrayList<>(); // do not use unmodifiable lists because the list is modified by JPDA diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/EvaluatorBuilderImpl.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/EvaluatorBuilderImpl.java index 0cd2812c8e..6f2c18eb23 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/EvaluatorBuilderImpl.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/EvaluatorBuilderImpl.java @@ -46,7 +46,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.internal.com.sun.jdi.Value; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.rawHighlight.HighlightInfo; import consulo.language.psi.PsiCodeFragment; @@ -58,9 +57,9 @@ import consulo.logging.Logger; import consulo.project.Project; import consulo.util.collection.ArrayUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; public class EvaluatorBuilderImpl implements EvaluatorBuilder @@ -681,8 +680,8 @@ private static boolean isUnboxingInBinaryExpressionApplicable(PsiType lType, Psi // concat with a String if(opCode == JavaTokenType.PLUS) { - if((lType instanceof PsiClassType && lType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) || (rType instanceof PsiClassType && rType.equalsToText(JavaClassNames - .JAVA_LANG_STRING))) + if((lType instanceof PsiClassType && lType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) + || (rType instanceof PsiClassType && rType.equalsToText(CommonClassNames.JAVA_LANG_STRING))) { return false; } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java index fa6c843bde..75b619bdb7 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java @@ -30,6 +30,7 @@ import com.intellij.java.debugger.impl.engine.DebugProcessImpl; import com.intellij.java.debugger.impl.engine.DebuggerManagerThreadImpl; import com.intellij.java.debugger.impl.engine.SuspendContextImpl; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.JavaPsiFacade; import com.intellij.java.language.psi.PsiClass; import consulo.application.ApplicationManager; @@ -43,7 +44,6 @@ import consulo.internal.com.sun.jdi.event.ExceptionEvent; import consulo.internal.com.sun.jdi.event.LocatableEvent; import consulo.internal.com.sun.jdi.request.ExceptionRequest; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; @@ -185,7 +185,7 @@ protected ObjectReference getThisObject(SuspendContextImpl context, LocatableEve @Override public String getEventMessage(LocatableEvent event) { - String exceptionName = (getQualifiedName() != null) ? getQualifiedName() : JavaClassNames.JAVA_LANG_THROWABLE; + String exceptionName = (getQualifiedName() != null) ? getQualifiedName() : CommonClassNames.JAVA_LANG_THROWABLE; String threadName = null; if (event instanceof ExceptionEvent) { ExceptionEvent exceptionEvent = (ExceptionEvent) event; diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java index 9e0ec24d58..1990de7a8d 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java @@ -16,8 +16,8 @@ package com.intellij.java.debugger.impl.ui.tree.render; import com.intellij.java.debugger.impl.settings.NodeRendererSettings; +import com.intellij.java.language.psi.CommonClassNames; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.inject.Inject; /** @@ -28,7 +28,7 @@ public class FileObjectRenderer extends ToStringBasedRenderer { @Inject public FileObjectRenderer(final NodeRendererSettings rendererSettings) { super(rendererSettings, "File", null, NodeRendererSettings.createExpressionChildrenRenderer("listFiles()", null)); - setClassName(JavaClassNames.JAVA_IO_FILE); + setClassName(CommonClassNames.JAVA_IO_FILE); setEnabled(true); } } \ No newline at end of file diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/ExceptionUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/ExceptionUtil.java index 41573f51b7..94bd96d1ee 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/ExceptionUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/ExceptionUtil.java @@ -30,7 +30,6 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.annotation.access.RequiredReadAction; import consulo.java.language.impl.codeInsight.ExtraExceptionHandler; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiFile; @@ -759,7 +758,7 @@ private static boolean isArrayClone(@Nonnull PsiMethod method, PsiElement elemen return false; } PsiClass containingClass = method.getContainingClass(); - if (containingClass == null || !JavaClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { + if (containingClass == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { return false; } if (element instanceof PsiMethodReferenceExpression methodRef) { @@ -775,13 +774,13 @@ private static boolean isArrayClone(@Nonnull PsiMethod method, PsiElement elemen } public static boolean isUncheckedException(@Nonnull PsiClassType type) { - return InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION) - || InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_ERROR); + return InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION) + || InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_ERROR); } public static boolean isUncheckedException(@Nonnull PsiClass psiClass) { - return InheritanceUtil.isInheritor(psiClass, JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION) - || InheritanceUtil.isInheritor(psiClass, JavaClassNames.JAVA_LANG_ERROR); + return InheritanceUtil.isInheritor(psiClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION) + || InheritanceUtil.isInheritor(psiClass, CommonClassNames.JAVA_LANG_ERROR); } public static boolean isUncheckedExceptionOrSuperclass(@Nonnull PsiClassType type) { @@ -790,7 +789,7 @@ public static boolean isUncheckedExceptionOrSuperclass(@Nonnull PsiClassType typ public static boolean isGeneralExceptionType(@Nonnull PsiType type) { String canonicalText = type.getCanonicalText(); - return JavaClassNames.JAVA_LANG_THROWABLE.equals(canonicalText) || JavaClassNames.JAVA_LANG_EXCEPTION.equals(canonicalText); + return CommonClassNames.JAVA_LANG_THROWABLE.equals(canonicalText) || CommonClassNames.JAVA_LANG_EXCEPTION.equals(canonicalText); } public static boolean isHandled(@Nonnull PsiClassType exceptionType, @Nonnull PsiElement throwPlace) { diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/FindSuperElementsHelper.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/FindSuperElementsHelper.java index 7617cf659c..3794f8b28d 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/FindSuperElementsHelper.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/FindSuperElementsHelper.java @@ -23,13 +23,12 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.application.progress.ProgressManager; import consulo.application.util.function.Processor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.psi.PsiAnchor; import consulo.language.psi.PsiElement; import consulo.util.collection.MultiMap; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.*; public class FindSuperElementsHelper { @@ -40,7 +39,7 @@ public static PsiElement[] findSuperElements(@Nonnull PsiElement element) { List allSupers = new ArrayList<>(Arrays.asList(aClass.getSupers())); for (Iterator iterator = allSupers.iterator(); iterator.hasNext(); ) { PsiClass superClass = iterator.next(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) { iterator.remove(); } } @@ -106,7 +105,7 @@ public static boolean canHaveSiblingSuper(PsiMethod method, PsiClass containingC !method.hasModifierProperty(PsiModifier.NATIVE) && method.hasModifierProperty(PsiModifier.PUBLIC) && !containingClass.isInterface() && - !JavaClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName()); + !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName()); } public static class SiblingInfo { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java index 95d75f01b5..f313d3f4ee 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java @@ -24,7 +24,6 @@ import consulo.document.RangeMarker; import consulo.ide.impl.idea.codeInsight.CodeInsightUtilBase; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.WriteCommandAction; import consulo.language.editor.template.Template; import consulo.language.editor.template.TemplateBuilder; @@ -37,7 +36,6 @@ import consulo.language.util.IncorrectOperationException; import consulo.project.Project; import consulo.undoRedo.CommandProcessor; - import jakarta.annotation.Nullable; /** @@ -148,8 +146,8 @@ public static PsiMethod setupSuperCall(PsiClass targetClass, PsiMethod construct PsiElementFactory elementFactory = JavaPsiFacade.getInstance(targetClass.getProject()).getElementFactory(); PsiMethod supConstructor = null; PsiClass superClass = targetClass.getSuperClass(); - if (superClass != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName()) && - !JavaClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { + if (superClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName()) && + !CommonClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { PsiMethod[] constructors = superClass.getConstructors(); boolean hasDefaultConstructor = false; @@ -202,7 +200,7 @@ private static void setupInheritance(PsiNewExpression element, PsiClass targetCl else { PsiReferenceList extendsList = targetClass.getExtendsList(); assert extendsList != null : targetClass; - if (extendsList.getReferencedTypes().length == 0 && !JavaClassNames.JAVA_LANG_OBJECT.equals(classType.getCanonicalText())) { + if (extendsList.getReferencedTypes().length == 0 && !CommonClassNames.JAVA_LANG_OBJECT.equals(classType.getCanonicalText())) { extendsList.add(factory.createReferenceElementByType(classType)); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java index 3880f4fe7f..2b35750b16 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java @@ -20,14 +20,12 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.BaseIntentionAction; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.psi.*; import consulo.language.psi.scope.GlobalSearchScope; import consulo.logging.Logger; import consulo.project.Project; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -119,7 +117,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor, if (!isAvailableInContext(element)) return false; final String superClassName = getSuperClassName(element); if (superClassName != null) { - if (superClassName.equals(JavaClassNames.JAVA_LANG_ENUM) && myKind != CreateClassKind.ENUM) return false; + if (superClassName.equals(CommonClassNames.JAVA_LANG_ENUM) && myKind != CreateClassKind.ENUM) return false; final PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass(superClassName, GlobalSearchScope.allScope(project)); if (psiClass != null && psiClass.hasModifierProperty(PsiModifier.FINAL)) return false; } @@ -145,7 +143,7 @@ protected String getSuperClassName(final PsiJavaCodeReferenceElement element) { if (ggParent instanceof PsiMethod) { PsiMethod method = (PsiMethod)ggParent; if (method.getThrowsList() == parent) { - superClassName = JavaClassNames.JAVA_LANG_EXCEPTION; + superClassName = CommonClassNames.JAVA_LANG_EXCEPTION; } } else if (ggParent instanceof PsiClassObjectAccessExpression) { @@ -153,7 +151,7 @@ else if (ggParent instanceof PsiClassObjectAccessExpression) { if (expectedTypes.length == 1) { final PsiClassType.ClassResolveResult classResolveResult = PsiUtil.resolveGenericsClassInType(expectedTypes[0].getType()); final PsiClass psiClass = classResolveResult.getElement(); - if (psiClass != null && JavaClassNames.JAVA_LANG_CLASS.equals(psiClass.getQualifiedName())) { + if (psiClass != null && CommonClassNames.JAVA_LANG_CLASS.equals(psiClass.getQualifiedName())) { final PsiTypeParameter[] typeParameters = psiClass.getTypeParameters(); PsiType psiType = typeParameters.length == 1 ? classResolveResult.getSubstitutor().substitute(typeParameters[0]) : null; if (psiType instanceof PsiWildcardType && ((PsiWildcardType)psiType).isExtends()) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index 07498241e9..ce3ca132c7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -47,7 +47,6 @@ import consulo.fileTemplate.FileTemplateManager; import consulo.fileTemplate.FileTemplateUtil; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.WeighingComparable; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.FileModificationService; @@ -456,7 +455,7 @@ else if (classKind == CreateClassKind.ANNOTATION) { targetClass = (PsiClass) sourceFile.add(aClass); } - if (superClassName != null && (classKind != CreateClassKind.ENUM || !superClassName.equals(JavaClassNames.JAVA_LANG_ENUM))) { + if (superClassName != null && (classKind != CreateClassKind.ENUM || !superClassName.equals(CommonClassNames.JAVA_LANG_ENUM))) { final PsiClass superClass = facade.findClass(superClassName, targetClass.getResolveScope()); final PsiJavaCodeReferenceElement superClassReference = factory.createReferenceElementByFQClassName(superClassName, targetClass.getResolveScope()); @@ -921,7 +920,7 @@ private static boolean handleObjectMethod(Set possibleClassNames, final ApplicationManager.getApplication().runReadAction(new Runnable() { @Override public void run() { - final PsiClass objectClass = facade.findClass(JavaClassNames.JAVA_LANG_OBJECT, searchScope); + final PsiClass objectClass = facade.findClass(CommonClassNames.JAVA_LANG_OBJECT, searchScope); if (objectClass != null) { if (method && objectClass.findMethodsByName(memberName, false).length > 0) { allClasses[0] = true; @@ -936,7 +935,7 @@ else if (!method) { } }); if (allClasses[0]) { - possibleClassNames.add(JavaClassNames.JAVA_LANG_OBJECT); + possibleClassNames.add(CommonClassNames.JAVA_LANG_OBJECT); if (!addInheritors) { return true; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java index 076edd4976..852ee37297 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java @@ -32,7 +32,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.access.RequiredReadAction; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.ImplicitUsageProvider; import consulo.language.editor.inspection.LocalInspectionToolSession; import consulo.language.editor.inspection.ProblemDescriptor; @@ -242,7 +241,7 @@ private static void checkCodeBlock(final PsiElement body, final Set ca private static boolean isImmutableState(PsiType type) { return type instanceof PsiPrimitiveType || PsiPrimitiveType.getUnboxedType(type) != null || - Comparing.strEqual(JavaClassNames.JAVA_LANG_STRING, type.getCanonicalText()); + Comparing.strEqual(CommonClassNames.JAVA_LANG_STRING, type.getCanonicalText()); } private static Collection getWrittenVariables(ControlFlow controlFlow, Ref> writtenVariables) { diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/element/ElementFactory.java b/plugin/src/main/java/com/intellij/java/impl/generate/element/ElementFactory.java index 7fcf4ca8f1..0ee9efcd31 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/element/ElementFactory.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/element/ElementFactory.java @@ -15,18 +15,10 @@ */ package com.intellij.java.impl.generate.element; -import org.jetbrains.java.generate.psi.PsiAdapter; -import consulo.logging.Logger; -import consulo.java.language.module.util.JavaClassNames; -import com.intellij.java.language.psi.JavaPsiFacade; -import com.intellij.java.language.psi.PsiClass; -import com.intellij.java.language.psi.PsiElementFactory; -import com.intellij.java.language.psi.PsiField; -import com.intellij.java.language.psi.PsiMethod; -import com.intellij.java.language.psi.PsiModifier; -import com.intellij.java.language.psi.PsiModifierList; -import com.intellij.java.language.psi.PsiType; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PropertyUtil; +import consulo.logging.Logger; +import org.jetbrains.java.generate.psi.PsiAdapter; /** * Factory for creating {@link FieldElement} or {@link ClassElement} objects. @@ -56,7 +48,7 @@ public static ClassElement newClassElement(PsiClass clazz) // super PsiClass superClass = clazz.getSuperClass(); - if(superClass != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) + if(superClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) { ce.setSuperName(superClass.getName()); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantCompareToInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantCompareToInspection.java index 5d94e8a3d9..897dff6eee 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantCompareToInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantCompareToInspection.java @@ -15,12 +15,7 @@ */ package com.intellij.java.impl.ig.bugs; -import jakarta.annotation.Nonnull; - import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.project.Project; -import consulo.language.psi.scope.GlobalSearchScope; import com.intellij.java.language.psi.util.TypeConversionUtil; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; @@ -28,7 +23,10 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.MethodUtils; import com.siyeh.ig.psiutils.TypeUtils; -import consulo.java.language.module.util.JavaClassNames; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.psi.scope.GlobalSearchScope; +import consulo.project.Project; +import jakarta.annotation.Nonnull; @ExtensionImpl public class CovariantCompareToInspection extends BaseInspection { @@ -78,7 +76,7 @@ public void visitMethod(@Nonnull PsiMethod method) { final Project project = method.getProject(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); final GlobalSearchScope scope = method.getResolveScope(); - final PsiClass comparableClass = psiFacade.findClass(JavaClassNames.JAVA_LANG_COMPARABLE, scope); + final PsiClass comparableClass = psiFacade.findClass(CommonClassNames.JAVA_LANG_COMPARABLE, scope); PsiType substitutedTypeParam = null; if (comparableClass != null && comparableClass.getTypeParameters().length == 1) { final PsiSubstitutor superSubstitutor = TypeConversionUtil.getClassSubstitutor(comparableClass, aClass, PsiSubstitutor.EMPTY); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java index 7ac164238c..6f4767f6f9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java @@ -27,7 +27,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.CheckBox; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiFile; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -163,7 +162,7 @@ public void visitClass(@Nonnull PsiClass aClass) { if (AnnotationUtil.isAnnotated(aClass, ignorableAnnotations)) { return; } - if (ignoreThrowables && InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_THROWABLE)) { + if (ignoreThrowables && InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } registerClassError(aClass, aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java index 412e719704..3c74598afa 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java @@ -17,6 +17,7 @@ import com.intellij.java.impl.ig.fixes.RemoveModifierFix; import com.intellij.java.language.codeInsight.AnnotationUtil; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiModifier; import com.siyeh.ig.BaseInspection; @@ -24,7 +25,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -67,7 +67,7 @@ public void visitMethod(@Nonnull PsiMethod method) { || !method.hasModifierProperty(PsiModifier.PRIVATE)) { return; } - if (AnnotationUtil.isAnnotated(method, JavaClassNames.JAVA_LANG_SAFE_VARARGS, false) && method.isVarArgs()) { + if (AnnotationUtil.isAnnotated(method, CommonClassNames.JAVA_LANG_SAFE_VARARGS, false) && method.isVarArgs()) { return; } registerModifierError(PsiModifier.FINAL, method, PsiModifier.FINAL); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ForLoopWithMissingComponentInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ForLoopWithMissingComponentInspection.java index d6ba44d8de..284b0d8539 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ForLoopWithMissingComponentInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ForLoopWithMissingComponentInspection.java @@ -23,7 +23,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; @@ -141,7 +140,7 @@ private boolean isCollectionLoopStatement(PsiForStatement forStatement) { if (declaredClass == null) { continue; } - if (!InheritanceUtil.isInheritor(declaredClass, JavaClassNames.JAVA_UTIL_ITERATOR)) { + if (!InheritanceUtil.isInheritor(declaredClass, CommonClassNames.JAVA_UTIL_ITERATOR)) { continue; } final PsiExpression initialValue = variable.getInitializer(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ErrorRethrownInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ErrorRethrownInspection.java index fd6be4e3e2..d46bf9aaad 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ErrorRethrownInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ErrorRethrownInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; import jakarta.annotation.Nonnull; @@ -78,8 +77,7 @@ private void checkCatchBlock(PsiParameter parameter, if (aClass == null) { return; } - if (!InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_ERROR)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_ERROR)) { return; } if (TypeUtils.typeEquals("java.lang.ThreadDeath", type)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java index fbe7bfff37..451f808a1f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ExceptionFromCatchWhichDoesntWrapInspection.java @@ -24,7 +24,6 @@ import consulo.application.util.function.Processor; import consulo.application.util.query.Query; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; import consulo.language.psi.search.ReferencesSearch; @@ -106,7 +105,7 @@ public void visitThrowStatement(PsiThrowStatement statement) { final PsiClass exceptionClass = classType.resolve(); if (exceptionClass != null) { final PsiMethod[] constructors = exceptionClass.getConstructors(); - final PsiClassType throwableType = TypeUtils.getType(JavaClassNames.JAVA_LANG_THROWABLE, statement); + final PsiClassType throwableType = TypeUtils.getType(CommonClassNames.JAVA_LANG_THROWABLE, statement); boolean canWrap = false; outer: for (PsiMethod constructor : constructors) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/finalization/FinalizeCallsSuperFinalizeInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/finalization/FinalizeCallsSuperFinalizeInspection.java index afd35010c0..3f2195b899 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/finalization/FinalizeCallsSuperFinalizeInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/finalization/FinalizeCallsSuperFinalizeInspection.java @@ -23,7 +23,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.project.Project; import jakarta.annotation.Nonnull; @@ -100,7 +99,7 @@ public void visitMethod(@Nonnull PsiMethod method) { final PsiClass superClass = containingClass.getSuperClass(); if (superClass != null) { final String superClassName = superClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(superClassName)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superClassName)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java index a35fc8a351..1de91c7dd0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ig.internationalization; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiExpressionList; import com.intellij.java.language.psi.PsiMethodCallExpression; import com.intellij.java.language.psi.PsiType; @@ -25,7 +26,6 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -65,8 +65,7 @@ public void visitMethodCallExpression( return; } final PsiType targetType = MethodCallUtils.getTargetType(expression); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_UTIL_DATE, - targetType)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_UTIL_DATE, targetType)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/ForeachStatementInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/ForeachStatementInspection.java index 6bd30b9041..50aa287f13 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/ForeachStatementInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/ForeachStatementInspection.java @@ -25,7 +25,6 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleSettingsManager; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -143,7 +142,7 @@ private static class ForeachStatementVisitor extends BaseInspectionVisitor { public void visitForeachStatement(@Nonnull PsiForeachStatement statement) { super.visitForeachStatement(statement); final PsiExpression iteratedValue = statement.getIteratedValue(); - if (iteratedValue == null || !InheritanceUtil.isInheritor(iteratedValue.getType(), JavaClassNames.JAVA_LANG_ITERABLE)) { + if (iteratedValue == null || !InheritanceUtil.isInheritor(iteratedValue.getType(), CommonClassNames.JAVA_LANG_ITERABLE)) { return; } registerStatementError(statement); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/ExpectedExceptionNeverThrownInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/ExpectedExceptionNeverThrownInspection.java index 4b8ececa55..cfee974474 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/ExpectedExceptionNeverThrownInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/ExpectedExceptionNeverThrownInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; @@ -89,8 +88,7 @@ public void visitMethod(PsiMethod method) { } final PsiClassType classType = (PsiClassType)type; final PsiClass aClass = classType.resolve(); - if (InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { + if (InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { return; } final Set exceptionsThrown = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/EnumerationCanBeIterationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/EnumerationCanBeIterationInspection.java index 63ffa97e3f..1afae63f9d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/EnumerationCanBeIterationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/EnumerationCanBeIterationInspection.java @@ -21,7 +21,6 @@ import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import com.intellij.java.language.psi.codeStyle.VariableKind; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; @@ -29,7 +28,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.application.util.query.Query; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleSettingsManager; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.editor.refactoring.rename.SuggestedNameInfo; @@ -42,9 +40,9 @@ import consulo.language.util.IncorrectOperationException; import consulo.project.Project; import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -204,7 +202,7 @@ private static PsiStatement createDeclaration( if (codeStyleSettings.GENERATE_FINAL_LOCALS) { newStatementText.append("final "); } - newStatementText.append(JavaClassNames.JAVA_UTIL_ITERATOR); + newStatementText.append(CommonClassNames.JAVA_UTIL_ITERATOR); if (parameterType != null) { final String typeText = parameterType.getCanonicalText(); newStatementText.append('<'); @@ -346,8 +344,7 @@ private static String createVariableName(PsiElement context) { final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); final PsiElementFactory factory = facade.getElementFactory(); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); - final PsiClass iteratorClass = - facade.findClass(JavaClassNames.JAVA_UTIL_ITERATOR, scope); + final PsiClass iteratorClass = facade.findClass(CommonClassNames.JAVA_UTIL_ITERATOR, scope); if (iteratorClass == null) { return "iterator"; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/ForCanBeForeachInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/ForCanBeForeachInspection.java index a235ef3fd3..b4de8a287c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/ForCanBeForeachInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/ForCanBeForeachInspection.java @@ -30,7 +30,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.codeStyle.CodeStyleSettingsManager; import consulo.language.editor.inspection.ProblemDescriptor; @@ -1140,9 +1139,7 @@ static boolean isCollectionLoopStatement( return false; } final PsiVariable variable = (PsiVariable)declaredElement; - if (!TypeUtils.variableHasTypeOrSubtype(variable, - JavaClassNames.JAVA_UTIL_ITERATOR, - "java.util.ListIterator")) { + if (!TypeUtils.variableHasTypeOrSubtype(variable, CommonClassNames.JAVA_UTIL_ITERATOR, "java.util.ListIterator")) { return false; } final PsiExpression initialValue = variable.getInitializer(); @@ -1200,10 +1197,8 @@ static boolean isCollectionLoopStatement( if (qualifierClass == null) { return false; } - if (!InheritanceUtil.isInheritor(qualifierClass, - JavaClassNames.JAVA_LANG_ITERABLE) && - !InheritanceUtil.isInheritor(qualifierClass, - JavaClassNames.JAVA_UTIL_COLLECTION)) { + if (!InheritanceUtil.isInheritor(qualifierClass, CommonClassNames.JAVA_LANG_ITERABLE) + && !InheritanceUtil.isInheritor(qualifierClass, CommonClassNames.JAVA_UTIL_COLLECTION)) { return false; } final PsiExpression condition = forStatement.getCondition(); @@ -1397,8 +1392,7 @@ static boolean expressionIsListGetLookup(PsiExpression expression) { return false; } final PsiClass aClass = method.getContainingClass(); - return InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_UTIL_LIST); + return InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_LIST); } @Nullable @@ -1442,8 +1436,7 @@ else if (secondDeclaredElement != null) { return null; } final PsiClass containingClass = method.getContainingClass(); - if (!InheritanceUtil.isInheritor(containingClass, - JavaClassNames.JAVA_UTIL_LIST)) { + if (!InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_UTIL_LIST)) { return null; } final PsiExpression qualifierExpression = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/ExceptionNameDoesntEndWithExceptionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/ExceptionNameDoesntEndWithExceptionInspection.java index 2ace4c5444..01602f92fc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/ExceptionNameDoesntEndWithExceptionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/ExceptionNameDoesntEndWithExceptionInspection.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.ig.naming; import com.intellij.java.impl.ig.fixes.RenameFix; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiTypeParameter; import com.intellij.java.language.psi.util.InheritanceUtil; @@ -24,7 +25,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -82,8 +82,7 @@ public void visitClass(@Nonnull PsiClass aClass) { if (className.endsWith(exception)) { return; } - if (!InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_EXCEPTION)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION)) { return; } registerClassError(aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java index 619d6db97a..4f0eeff67e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java @@ -25,7 +25,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInsight.CodeInsightUtilBase; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiNameIdentifierOwner; @@ -206,7 +205,7 @@ private static boolean isCallToRegexMethod(PsiMethodCallExpression expression) { return false; } final String className = containingClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_STRING.equals(className); + return CommonClassNames.JAVA_LANG_STRING.equals(className); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/ExceptionUtils.java b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/ExceptionUtils.java index f01b6c86e2..e44348c134 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/ExceptionUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/ExceptionUtils.java @@ -17,12 +17,11 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; -import consulo.language.psi.PsiElement; import com.siyeh.ig.psiutils.BoolUtils; -import consulo.java.language.module.util.JavaClassNames; - +import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -35,10 +34,10 @@ private ExceptionUtils() { private static final Set s_genericExceptionTypes = new HashSet(4); static { - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_THROWABLE); - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_EXCEPTION); - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION); - s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_ERROR); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_THROWABLE); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_EXCEPTION); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION); + s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_ERROR); } @Nonnull diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java index 011070b76e..26439b1bc2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.ig.security; import com.intellij.java.impl.ig.psiutils.SerializationUtils; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiTypeParameter; @@ -26,7 +27,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -85,7 +85,7 @@ public void visitClass(@Nonnull PsiClass aClass) { break; } } - if (ignoreThrowable && InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_LANG_THROWABLE)) { + if (ignoreThrowable && InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } registerClassError(aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java index da56905949..b267f93297 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java @@ -24,7 +24,6 @@ import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -135,7 +134,7 @@ public void visitClass(@Nonnull PsiClass aClass) { } private static boolean isExternalizable(PsiClass aClass) { - final PsiClass externalizableClass = ClassUtils.findClass(JavaClassNames.JAVA_IO_EXTERNALIZABLE, aClass); + final PsiClass externalizableClass = ClassUtils.findClass(CommonClassNames.JAVA_IO_EXTERNALIZABLE, aClass); return externalizableClass != null && aClass.isInheritor(externalizableClass, true); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java index 921a166b1d..837f5d1e74 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/EqualsCalledOnEnumConstantInspection.java @@ -142,12 +142,9 @@ public void visitMethodCallExpression( if (!MethodCallUtils.isEqualsCall(expression)) { return; } - final PsiReferenceExpression methodExpression = - expression.getMethodExpression(); - final PsiExpression qualifier = - methodExpression.getQualifierExpression(); - if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, - JavaClassNames.JAVA_LANG_ENUM)) { + final PsiReferenceExpression methodExpression = expression.getMethodExpression(); + final PsiExpression qualifier = methodExpression.getQualifierExpression(); + if (!TypeUtils.expressionHasTypeOrSubtype(qualifier, CommonClassNames.JAVA_LANG_ENUM)) { return; } registerMethodCallError(expression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/ExtendsObjectInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/ExtendsObjectInspection.java index 3afbdc887a..97180ae7c1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/ExtendsObjectInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/ExtendsObjectInspection.java @@ -21,7 +21,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -104,7 +103,7 @@ public void visitClass(@Nonnull PsiClass aClass) { } final PsiClassType[] types = aClass.getExtendsListTypes(); for (final PsiClassType type : types) { - if (type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { registerClassError(aClass); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ExceptionUtils.java b/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ExceptionUtils.java index d0bfb3affa..885e183778 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ExceptionUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ExceptionUtils.java @@ -16,7 +16,6 @@ package com.intellij.java.impl.ipp.exceptions; import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import java.util.Collections; @@ -236,7 +235,7 @@ public static void calculateExceptionsThrownForResourceList(PsiResourceList reso private static PsiClassType getJavaLangAutoCloseable(PsiElement context) { final PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory(); - return factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, context.getResolveScope()); + return factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, context.getResolveScope()); } private static void calculateExceptionsThrownForIfStatement(PsiIfStatement ifStatement, Set exceptionTypes) { diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java index 1b5f01c195..09f7bfb987 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java @@ -22,7 +22,6 @@ import com.intellij.java.language.psi.util.PropertyUtil; import consulo.codeEditor.Editor; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.WriteCommandAction; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; @@ -35,10 +34,9 @@ import consulo.language.util.IncorrectOperationException; import consulo.logging.Logger; import consulo.project.Project; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; /** * @author Dmitry Avdeev @@ -68,7 +66,7 @@ private static Object[] create(final String propertyName, final PsiClass psiClas if (type == null) { final Project project = psiClass.getProject(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); - final PsiClass aClass = facade.findClass(JavaClassNames.JAVA_LANG_STRING, GlobalSearchScope.allScope(project)); + final PsiClass aClass = facade.findClass(CommonClassNames.JAVA_LANG_STRING, GlobalSearchScope.allScope(project)); if (aClass == null) { return NO_FIXES; } diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java index 1fe50f632c..36982bd8ce 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java @@ -15,19 +15,14 @@ */ package com.intellij.java.impl.psi.impl.source.javadoc; -import consulo.java.language.module.util.JavaClassNames; -import org.jetbrains.annotations.NonNls; import com.intellij.java.language.impl.codeInsight.daemon.JavaErrorBundle; -import com.intellij.java.language.psi.JavaPsiFacade; -import com.intellij.java.language.psi.PsiClass; -import com.intellij.java.language.psi.PsiClassType; -import consulo.language.psi.PsiElement; -import com.intellij.java.language.psi.PsiJavaCodeReferenceElement; -import com.intellij.java.language.psi.PsiMethod; -import consulo.language.psi.PsiReference; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.javadoc.JavadocTagInfo; import com.intellij.java.language.psi.javadoc.PsiDocTagValue; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiReference; import consulo.language.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NonNls; /** * @author mike @@ -57,7 +52,7 @@ public String checkTagValue(PsiDocTagValue value) { final PsiClass exceptionClass = (PsiClass)element; - final PsiClass throwable = JavaPsiFacade.getInstance(value.getProject()).findClass(JavaClassNames.JAVA_LANG_THROWABLE, value.getResolveScope()); + final PsiClass throwable = JavaPsiFacade.getInstance(value.getProject()).findClass(CommonClassNames.JAVA_LANG_THROWABLE, value.getResolveScope()); if (throwable != null) { if (!exceptionClass.equals(throwable) && !exceptionClass.isInheritor(throwable, true)) { @@ -66,7 +61,7 @@ public String checkTagValue(PsiDocTagValue value) { } final PsiClass runtimeException = - JavaPsiFacade.getInstance(value.getProject()).findClass(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, value.getResolveScope()); + JavaPsiFacade.getInstance(value.getProject()).findClass(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, value.getResolveScope()); if (runtimeException != null && (exceptionClass.isInheritor(runtimeException, true) || exceptionClass.equals(runtimeException))) { @@ -74,7 +69,7 @@ public String checkTagValue(PsiDocTagValue value) { } PsiClass errorException = JavaPsiFacade.getInstance(value.getProject()) - .findClass(JavaClassNames.JAVA_LANG_ERROR, value.getResolveScope()); + .findClass(CommonClassNames.JAVA_LANG_ERROR, value.getResolveScope()); if (errorException != null && (exceptionClass.isInheritor(errorException, true) || exceptionClass.equals(errorException))) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java index 9ac48c066e..8a847a56ce 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java @@ -39,7 +39,6 @@ import consulo.application.Application; import consulo.application.Result; import consulo.ide.impl.idea.openapi.module.ModuleUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.java.localize.JavaRefactoringLocalize; import consulo.language.ast.IElementType; import consulo.language.codeStyle.CodeStyleManager; @@ -796,11 +795,11 @@ private List calculateInterfacesSupported() { PsiManager manager = sourceClass.getManager(); GlobalSearchScope scope = GlobalSearchScope.allScope(project); if (usesDefaultSerialization(sourceClass)) { - PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, scope); + PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_IO_SERIALIZABLE, scope); out.add(serializable); } if (usesDefaultClone(sourceClass)) { - PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_CLONEABLE, scope); + PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_CLONEABLE, scope); out.add(cloneable); } return out; @@ -820,7 +819,7 @@ private static boolean usesDefaultClone(PsiClass aClass) { Project project = aClass.getProject(); PsiManager manager = aClass.getManager(); GlobalSearchScope scope = GlobalSearchScope.allScope(project); - PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_CLONEABLE, scope); + PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_CLONEABLE, scope); if (!InheritanceUtil.isInheritorOrSelf(aClass, cloneable, true)) { return false; } @@ -839,7 +838,7 @@ private static boolean usesDefaultSerialization(PsiClass aClass) { Project project = aClass.getProject(); PsiManager manager = aClass.getManager(); GlobalSearchScope scope = GlobalSearchScope.allScope(project); - PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, scope); + PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_IO_SERIALIZABLE, scope); if (!InheritanceUtil.isInheritorOrSelf(aClass, serializable, true)) { return false; } diff --git a/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java b/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java index 59b477d33f..d5f949eca1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java +++ b/plugin/src/main/java/com/intellij/java/impl/util/xml/actions/CreateClassMappingAction.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.util.xml.actions; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.JavaPsiFacade; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiModifier; @@ -68,7 +69,7 @@ public boolean isAccepted(PsiClass aClass) { selectedClass = chooser.getSelected(); } else { - selectedClass = getBaseClass(context, project, myBaseClass == null ? JavaClassNames.JAVA_LANG_OBJECT : myBaseClass); + selectedClass = getBaseClass(context, project, myBaseClass == null ? CommonClassNames.JAVA_LANG_OBJECT : myBaseClass); } if (selectedClass == null) return null;