From f8a8f0c854d4ceb6dcb4d312acaae5405209b395 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 9 May 2025 19:15:24 +0300 Subject: [PATCH] Replacing JavaClassNames with CommonClassNames (part 2). --- .../analysis/impl/codeInsight/ClassUtil.java | 5 +- ...ngeStringLiteralToCharInMethodCallFix.java | 3 +- .../impl/quickfix/ChangeToAppendFix.java | 14 ++-- .../impl/quickfix/ChangeTypeArgumentsFix.java | 5 +- .../dataFlow/ControlFlowAnalyzer.java | 5 +- .../dataFlow/inliner/ComparatorModel.java | 4 +- .../com/siyeh/ig/callMatcher/CallMatcher.java | 8 +-- .../com/siyeh/ig/psiutils/ClassUtils.java | 25 ++++--- .../com/siyeh/ig/psiutils/CloneUtils.java | 9 +-- .../siyeh/ig/psiutils/CollectionUtils.java | 65 +++++++++---------- .../siyeh/ig/psiutils/ConstructionUtils.java | 23 ++++--- .../ClassHasNoToStringMethodInspection.java | 2 +- .../impl/classParsing/ClassFileReader.java | 6 +- .../expression/BoxingEvaluator.java | 29 ++++----- .../impl/ui/tree/render/ClassRenderer.java | 47 +++++--------- .../ui/tree/render/CompoundTypeRenderer.java | 16 ++--- .../psi/controlFlow/ControlFlowAnalyzer.java | 3 +- .../impl/psi/impl/compiled/ClsClassImpl.java | 5 +- .../impl/psi/impl/compiled/ClsFieldImpl.java | 6 +- .../resolve/ClassResolverProcessor.java | 15 ++--- .../completion/CatchTypeProvider.java | 18 ++--- .../completion/ConstructorInsertHandler.java | 7 +- .../quickfix/ConvertCollectionToArrayFix.java | 6 +- .../quickfix/ConvertSwitchToIfIntention.java | 3 +- .../dataFlow/ContractInspection.java | 3 +- .../CastToConcreteClassInspection.java | 3 +- .../ig/bugs/ClassNewInstanceInspection.java | 3 +- .../bugs/CollectionAddedToSelfInspection.java | 7 +- ...entedButEqualsNotOverriddenInspection.java | 6 +- ...ratorMethodParameterNotUsedInspection.java | 16 +++-- .../BadExceptionCaughtInspection.java | 12 ++-- .../BadExceptionDeclaredInspection.java | 21 +++--- .../BadExceptionThrownInspection.java | 17 ++--- .../CheckedExceptionClassInspection.java | 8 +-- .../CharacterComparisonInspection.java | 6 +- .../impl/ig/jdk/AutoBoxingInspection.java | 53 ++++++++------- .../impl/ig/jdk/AutoUnboxingInspection.java | 19 +++--- ...cessReplaceableByMethodCallInspection.java | 11 ++-- ...odNameMustStartWithQuestionInspection.java | 4 +- .../naming/ConfusingMainMethodInspection.java | 4 +- ...CachedNumberConstructorCallInspection.java | 11 ++-- .../ig/numeric/ComparisonToNaNInspection.java | 3 +- .../numeric/ConstantMathCallInspection.java | 5 +- .../BooleanConstructorInspection.java | 6 +- .../BoxingBoxedValueInspection.java | 16 ++--- .../CollectionContainsUrlInspection.java | 4 +- .../performance/CollectionsListSettings.java | 37 +++++------ .../ConstantStringInternInspection.java | 3 +- .../ComparatorNotSerializableInspection.java | 4 +- ...ncatCanBeReplacedByOperatorInspection.java | 9 +-- ...llToNativeMethodWhileLockedInspection.java | 8 +-- .../chartostring/CharToStringPredicate.java | 17 +++-- ...oncatenatedStringToClipboardIntention.java | 8 +-- .../constant/ConstantExpressionPredicate.java | 15 ++--- .../ConstantSubexpressionPredicate.java | 16 ++--- ...onvertJUnit3TestCaseToJUnit4Intention.java | 6 +- .../impl/ipp/psiutils/ConcatenationUtils.java | 12 ++-- .../filters/getters/ClassLiteralGetter.java | 12 ++-- .../naming/AutomaticVariableRenamer.java | 10 ++- .../deductive/resolver/BindingFactory.java | 16 ++--- 60 files changed, 317 insertions(+), 423 deletions(-) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/ClassUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/ClassUtil.java index bd01781773..0389a60bd4 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/ClassUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/ClassUtil.java @@ -20,10 +20,9 @@ package com.intellij.java.analysis.impl.codeInsight; import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -84,7 +83,7 @@ private static PsiMethod checkPackageLocalInSuperClass(@Nonnull PsiClass aClass) // super class can have package local abstract methods not accessible for overriding PsiClass superClass = aClass.getSuperClass(); if (superClass == null) return null; - if (JavaClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null; + if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null; if (JavaPsiFacade.getInstance(aClass.getProject()).arePackagesTheSame(aClass, superClass)) return null; for (HierarchicalMethodSignature methodSignature : superClass.getVisibleSignatures()) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java index c4ecbcccbb..c974f844e6 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java @@ -21,7 +21,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.codeEditor.Editor; import consulo.java.analysis.impl.localize.JavaQuickFixLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.FileModificationService; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.editor.rawHighlight.HighlightInfo; @@ -187,6 +186,6 @@ private static boolean charToString(PsiType firstType, PsiType secondType) { } private static boolean isString(PsiType type) { - return type != null && JavaClassNames.JAVA_LANG_STRING.equals(type.getCanonicalText()); + return type != null && CommonClassNames.JAVA_LANG_STRING.equals(type.getCanonicalText()); } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java index 4f1d6cd5b5..380443638a 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeToAppendFix.java @@ -20,7 +20,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.codeEditor.Editor; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.FileModificationService; import consulo.language.editor.intention.SyntheticIntentionAction; @@ -29,9 +28,8 @@ import consulo.language.util.IncorrectOperationException; import consulo.project.Project; import jakarta.annotation.Nonnull; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; /** * @author Bas Leijdekkers @@ -62,8 +60,8 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file return JavaTokenType.PLUSEQ == myTokenType && myAssignmentExpression.isValid() && PsiManager.getInstance(project).isInProject(myAssignmentExpression) && - (myLhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUILDER) || - myLhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING_BUFFER) || + (myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUILDER) || + myLhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING_BUFFER) || myLhsType.equalsToText("java.lang.Appendable")); } @@ -100,7 +98,7 @@ private static StringBuilder buildAppendExpression(@Nullable PsiExpression conca if (type == null) { return null; } - if (concatenation instanceof PsiPolyadicExpression && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (concatenation instanceof PsiPolyadicExpression && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)concatenation; final PsiExpression[] operands = polyadicExpression.getOperands(); boolean isConstant = true; @@ -112,7 +110,7 @@ private static StringBuilder buildAppendExpression(@Nullable PsiExpression conca builder.append('+'); } final PsiType operandType = operand.getType(); - if (operandType != null && operandType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (operandType != null && operandType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { isString = true; } builder.append(operand.getText()); @@ -138,7 +136,7 @@ else if (concatenation instanceof PsiParenthesizedExpression) { } } else { - append(concatenation.getText(), useStringValueOf && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING), out); + append(concatenation.getText(), useStringValueOf && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING), out); } return out; } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java index bd107b5416..8bc618e67f 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java @@ -27,10 +27,8 @@ import com.intellij.java.language.psi.impl.source.resolve.DefaultParameterTypeInferencePolicy; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.FileModificationService; import consulo.language.editor.intention.HighPriorityAction; -import consulo.language.editor.intention.QuickFixAction; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.editor.rawHighlight.HighlightInfo; import consulo.language.psi.PsiElement; @@ -41,7 +39,6 @@ import consulo.ui.annotation.RequiredUIAccess; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; - import jakarta.annotation.Nullable; public class ChangeTypeArgumentsFix implements SyntheticIntentionAction, HighPriorityAction { @@ -71,7 +68,7 @@ public String getText() { myPsiClass.getTypeParameters(), typeParameter -> { PsiType substituted = substitutor.substitute(typeParameter); - return substituted != null ? substituted.getPresentableText() : JavaClassNames.JAVA_LANG_OBJECT; + return substituted != null ? substituted.getPresentableText() : CommonClassNames.JAVA_LANG_OBJECT; }, ", " ) + ">"; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java index e99e74ac8e..5a0f95097c 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java @@ -23,7 +23,6 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.psiutils.*; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.ImplicitUsageProvider; import consulo.language.psi.PsiElement; @@ -1260,7 +1259,7 @@ public void visitArrayAccessExpression(PsiArrayAccessExpression expression) { toPush = myFactory.getObjectType(expression.getType(), Nullability.UNKNOWN); } DfaControlTransferValue transfer = shouldHandleException() - ? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack) + ? myFactory.controlTransfer(myExceptionCache.get(CommonClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack) : null; addInstruction(new ArrayAccessInstruction(toPush, expression, transfer)); addNullCheck(expression); @@ -2025,7 +2024,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression castExpression) { final PsiTypeElement typeElement = castExpression.getCastType(); if (typeElement != null && operand != null && operand.getType() != null && !(typeElement.getType() instanceof PsiPrimitiveType)) { DfaControlTransferValue transfer = shouldHandleException() - ? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack) + ? myFactory.controlTransfer(myExceptionCache.get(CommonClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack) : null; addInstruction(new TypeCastInstruction(castExpression, operand, typeElement.getType(), transfer)); } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/ComparatorModel.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/ComparatorModel.java index f7c20d1b87..e4eb47acf4 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/ComparatorModel.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/inliner/ComparatorModel.java @@ -21,9 +21,7 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.callMatcher.CallMatcher; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.util.lang.ObjectUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -147,7 +145,7 @@ static ComparatorModel from(@Nullable PsiExpression expression) { if (expression instanceof PsiReferenceExpression ref && "CASE_INSENSITIVE_ORDER".equals(ref.getReferenceName())) { PsiField field = ObjectUtil.tryCast(ref.resolve(), PsiField.class); if (field != null && field.getContainingClass() != null - && JavaClassNames.JAVA_LANG_STRING.equals(field.getContainingClass().getQualifiedName())) { + && CommonClassNames.JAVA_LANG_STRING.equals(field.getContainingClass().getQualifiedName())) { return new NullHostile(); } } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/callMatcher/CallMatcher.java b/java-analysis-impl/src/main/java/com/siyeh/ig/callMatcher/CallMatcher.java index d581acc05e..e7785cc3ba 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/callMatcher/CallMatcher.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/callMatcher/CallMatcher.java @@ -7,15 +7,13 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.psiutils.MethodCallUtils; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.util.collection.ArrayUtil; import consulo.util.lang.ObjectUtil; -import one.util.streamex.StreamEx; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import one.util.streamex.StreamEx; +import org.jetbrains.annotations.Contract; import java.util.Collections; import java.util.Set; @@ -222,7 +220,7 @@ class Simple implements CallMatcher { static final Simple ENUM_VALUES = new Simple("", Collections.singleton("values"), ArrayUtil.EMPTY_STRING_ARRAY, CallType.ENUM_STATIC); static final Simple ENUM_VALUE_OF = - new Simple("", Collections.singleton("valueOf"), new String[]{JavaClassNames.JAVA_LANG_STRING}, CallType.ENUM_STATIC); + new Simple("", Collections.singleton("valueOf"), new String[]{CommonClassNames.JAVA_LANG_STRING}, CallType.ENUM_STATIC); @Nonnull private final String myClassName; @Nonnull diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java index e515357a5a..657b50d560 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java @@ -19,14 +19,13 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; -import jakarta.annotation.Nullable; import java.util.HashSet; import java.util.Set; @@ -62,15 +61,15 @@ public class ClassUtils { primitiveNumericTypes.add(PsiType.FLOAT); primitiveNumericTypes.add(PsiType.DOUBLE); - immutableTypes.add(JavaClassNames.JAVA_LANG_BOOLEAN); - immutableTypes.add(JavaClassNames.JAVA_LANG_CHARACTER); - immutableTypes.add(JavaClassNames.JAVA_LANG_SHORT); - immutableTypes.add(JavaClassNames.JAVA_LANG_INTEGER); - immutableTypes.add(JavaClassNames.JAVA_LANG_LONG); - immutableTypes.add(JavaClassNames.JAVA_LANG_FLOAT); - immutableTypes.add(JavaClassNames.JAVA_LANG_DOUBLE); - immutableTypes.add(JavaClassNames.JAVA_LANG_BYTE); - immutableTypes.add(JavaClassNames.JAVA_LANG_STRING); + immutableTypes.add(CommonClassNames.JAVA_LANG_BOOLEAN); + immutableTypes.add(CommonClassNames.JAVA_LANG_CHARACTER); + immutableTypes.add(CommonClassNames.JAVA_LANG_SHORT); + immutableTypes.add(CommonClassNames.JAVA_LANG_INTEGER); + immutableTypes.add(CommonClassNames.JAVA_LANG_LONG); + immutableTypes.add(CommonClassNames.JAVA_LANG_FLOAT); + immutableTypes.add(CommonClassNames.JAVA_LANG_DOUBLE); + immutableTypes.add(CommonClassNames.JAVA_LANG_BYTE); + immutableTypes.add(CommonClassNames.JAVA_LANG_STRING); immutableTypes.add("java.awt.Font"); immutableTypes.add("java.awt.Color"); immutableTypes.add("java.math.BigDecimal"); @@ -78,7 +77,7 @@ public class ClassUtils { immutableTypes.add("java.math.MathContext"); immutableTypes.add("java.nio.channels.FileLock"); immutableTypes.add("java.nio.charset.Charset"); - immutableTypes.add(JavaClassNames.JAVA_IO_FILE); + immutableTypes.add(CommonClassNames.JAVA_IO_FILE); immutableTypes.add("java.net.URI"); immutableTypes.add("java.util.regex.Pattern"); } @@ -93,7 +92,7 @@ public static PsiClass findClass(String fqClassName, PsiElement context) { @Nullable public static PsiClass findObjectClass(PsiElement context) { - return findClass(JavaClassNames.JAVA_LANG_OBJECT, context); + return findClass(CommonClassNames.JAVA_LANG_OBJECT, context); } public static boolean isPrimitive(PsiType type) { diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CloneUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CloneUtils.java index fdb0e93528..d4388ad116 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CloneUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CloneUtils.java @@ -15,21 +15,18 @@ */ package com.siyeh.ig.psiutils; -import jakarta.annotation.Nonnull; - import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.HardcodedMethodConstants; -import consulo.java.language.module.util.JavaClassNames; +import jakarta.annotation.Nonnull; public class CloneUtils { private CloneUtils() {} public static boolean isCloneable(@Nonnull PsiClass aClass) { - return InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_CLONEABLE); + return InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_CLONEABLE); } public static boolean isDirectlyCloneable(@Nonnull PsiClass aClass) { @@ -39,7 +36,7 @@ public static boolean isDirectlyCloneable(@Nonnull PsiClass aClass) { continue; } final String qualifiedName = anInterface.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName)) { + if (CommonClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName)) { return true; } } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java index c13375d84c..0e9eabda78 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java @@ -18,7 +18,6 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.siyeh.ig.callMatcher.CallMatcher; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; @@ -43,25 +42,25 @@ public class CollectionUtils { allCollectionClassesAndInterfaces.add("java.util.AbstractQueue"); allCollectionClassesAndInterfaces.add("java.util.AbstractSequentialList"); allCollectionClassesAndInterfaces.add("java.util.AbstractSet"); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_ARRAY_LIST); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_ARRAY_LIST); allCollectionClassesAndInterfaces.add("java.util.ArrayDeque"); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_COLLECTION); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_DICTIONARY); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_COLLECTION); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_DICTIONARY); allCollectionClassesAndInterfaces.add("java.util.EnumMap"); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_HASH_MAP); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_HASH_SET); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_HASH_MAP); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_HASH_SET); allCollectionClassesAndInterfaces.add("java.util.Hashtable"); allCollectionClassesAndInterfaces.add("java.util.IdentityHashMap"); allCollectionClassesAndInterfaces.add("java.util.LinkedHashMap"); allCollectionClassesAndInterfaces.add("java.util.LinkedHashSet"); allCollectionClassesAndInterfaces.add("java.util.LinkedList"); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_LIST); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_MAP); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_LIST); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_MAP); allCollectionClassesAndInterfaces.add("java.util.PriorityQueue"); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_QUEUE); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SET); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SORTED_MAP); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SORTED_SET); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_QUEUE); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_SET); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_SORTED_MAP); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_SORTED_SET); allCollectionClassesAndInterfaces.add("java.util.Stack"); allCollectionClassesAndInterfaces.add("java.util.TreeMap"); allCollectionClassesAndInterfaces.add("java.util.TreeSet"); @@ -70,7 +69,7 @@ public class CollectionUtils { allCollectionClassesAndInterfaces.add("java.util.concurrent.ArrayBlockingQueue"); allCollectionClassesAndInterfaces.add("java.util.concurrent.BlockingDeque"); allCollectionClassesAndInterfaces.add("java.util.concurrent.BlockingQueue"); - allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP); + allCollectionClassesAndInterfaces.add(CommonClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP); allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentLinkedDeque"); allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentLinkedQueue"); allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentMap"); @@ -116,21 +115,21 @@ public class CollectionUtils { s_interfaceForCollection.put("TreeSet", "SortedSet"); s_interfaceForCollection.put("Vector", "List"); s_interfaceForCollection.put("WeakHashMap", "Map"); - s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_ARRAY_LIST, JavaClassNames.JAVA_UTIL_LIST); - s_interfaceForCollection.put("java.util.EnumMap", JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_ENUM_SET, JavaClassNames.JAVA_UTIL_SET); - s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_HASH_MAP, JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_HASH_SET, JavaClassNames.JAVA_UTIL_SET); - s_interfaceForCollection.put("java.util.Hashtable", JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put("java.util.IdentityHashMap", JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put("java.util.LinkedHashMap", JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put("java.util.LinkedHashSet", JavaClassNames.JAVA_UTIL_SET); - s_interfaceForCollection.put("java.util.LinkedList", JavaClassNames.JAVA_UTIL_LIST); - s_interfaceForCollection.put("java.util.PriorityQueue", JavaClassNames.JAVA_UTIL_QUEUE); - s_interfaceForCollection.put("java.util.TreeMap", JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put("java.util.TreeSet", JavaClassNames.JAVA_UTIL_SET); - s_interfaceForCollection.put("java.util.Vector", JavaClassNames.JAVA_UTIL_LIST); - s_interfaceForCollection.put("java.util.WeakHashMap", JavaClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put(CommonClassNames.JAVA_UTIL_ARRAY_LIST, CommonClassNames.JAVA_UTIL_LIST); + s_interfaceForCollection.put("java.util.EnumMap", CommonClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put(CommonClassNames.JAVA_UTIL_ENUM_SET, CommonClassNames.JAVA_UTIL_SET); + s_interfaceForCollection.put(CommonClassNames.JAVA_UTIL_HASH_MAP, CommonClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put(CommonClassNames.JAVA_UTIL_HASH_SET, CommonClassNames.JAVA_UTIL_SET); + s_interfaceForCollection.put("java.util.Hashtable", CommonClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put("java.util.IdentityHashMap", CommonClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put("java.util.LinkedHashMap", CommonClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put("java.util.LinkedHashSet", CommonClassNames.JAVA_UTIL_SET); + s_interfaceForCollection.put("java.util.LinkedList", CommonClassNames.JAVA_UTIL_LIST); + s_interfaceForCollection.put("java.util.PriorityQueue", CommonClassNames.JAVA_UTIL_QUEUE); + s_interfaceForCollection.put("java.util.TreeMap", CommonClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put("java.util.TreeSet", CommonClassNames.JAVA_UTIL_SET); + s_interfaceForCollection.put("java.util.Vector", CommonClassNames.JAVA_UTIL_LIST); + s_interfaceForCollection.put("java.util.WeakHashMap", CommonClassNames.JAVA_UTIL_MAP); s_interfaceForCollection.put("com.sun.java.util.collections.HashSet", "com.sun.java.util.collections.Set"); s_interfaceForCollection.put("com.sun.java.util.collections.TreeSet", "com.sun.java.util.collections.Set"); s_interfaceForCollection.put("com.sun.java.util.collections.Vector", "com.sun.java.util.collections.List"); @@ -145,7 +144,7 @@ public class CollectionUtils { * Matches a call which creates collection of the same size as the qualifier collection */ public static final CallMatcher DERIVED_COLLECTION = CallMatcher.anyOf( - CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "keySet", "values", "entrySet").parameterCount(0), + CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "keySet", "values", "entrySet").parameterCount(0), CallMatcher.instanceCall("java.util.NavigableMap", "descendingKeySet", "descendingMap", "navigableKeySet") .parameterCount(0), CallMatcher.instanceCall("java.util.NavigableSet", "descendingSet").parameterCount(0) @@ -177,8 +176,8 @@ public static boolean isConcreteCollectionClass(PsiClass aClass) { if (aClass == null || aClass.isEnum() || aClass.isInterface() || aClass.isAnnotationType() || aClass.isAbstract()) { return false; } - if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_UTIL_COLLECTION) - && !InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_UTIL_MAP)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_COLLECTION) + && !InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_MAP)) { return false; } String name = aClass.getQualifiedName(); @@ -193,8 +192,8 @@ public static boolean isCollectionClassOrInterface(@Nullable PsiType type) { if (resolved == null) { return false; } - return InheritanceUtil.isInheritor(resolved, JavaClassNames.JAVA_UTIL_COLLECTION) - || InheritanceUtil.isInheritor(resolved, JavaClassNames.JAVA_UTIL_MAP) + return InheritanceUtil.isInheritor(resolved, CommonClassNames.JAVA_UTIL_COLLECTION) + || InheritanceUtil.isInheritor(resolved, CommonClassNames.JAVA_UTIL_MAP) || InheritanceUtil.isInheritor(resolved, "com.google.common.collect.Multimap") || InheritanceUtil.isInheritor(resolved, "com.google.common.collect.Table"); } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ConstructionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ConstructionUtils.java index 1ea36be891..d190dd4afe 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ConstructionUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ConstructionUtils.java @@ -20,7 +20,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.callMatcher.CallMatcher; import consulo.annotation.access.RequiredReadAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; @@ -36,7 +35,7 @@ public class ConstructionUtils { private static final Set GUAVA_UTILITY_CLASSES = Set.of("com.google.common.collect.Maps", "com.google.common.collect.Lists", "com.google.common.collect.Sets"); private static final CallMatcher ENUM_SET_NONE_OF = - CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_ENUM_SET, "noneOf").parameterCount(1); + CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_ENUM_SET, "noneOf").parameterCount(1); /** * Checks that given expression initializes empty StringBuilder or StringBuffer (either with explicit default capacity or not) @@ -73,7 +72,7 @@ public static String getStringBuilderInitializerText(PsiExpression construction) return null; } String qualifiedName = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(qualifiedName) && !JavaClassNames.JAVA_LANG_STRING_BUFFER.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(qualifiedName) && !CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(qualifiedName)) { return null; } PsiExpressionList argumentList = newExpr.getArgumentList(); @@ -108,8 +107,8 @@ public static boolean isEmptyCollectionInitializer(PsiExpression expression) { PsiExpressionList argumentList = newExpr.getArgumentList(); if (argumentList != null && argumentList.getExpressions().length == 0) { PsiType type = expression.getType(); - return InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_UTIL_COLLECTION) - || InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_UTIL_MAP); + return InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_COLLECTION) + || InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_MAP); } } if (expression instanceof PsiMethodCallExpression) { @@ -154,12 +153,12 @@ public static boolean isCustomizedEmptyCollectionInitializer(PsiExpression expre if (aClass != null && (aClass.getQualifiedName() == null || !aClass.getQualifiedName().startsWith("java.util."))) { return false; } - if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_UTIL_COLLECTION) - && !InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_UTIL_MAP)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_COLLECTION) + && !InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_MAP)) { return false; } Predicate allowedParameterType = - t -> t instanceof PsiPrimitiveType || InheritanceUtil.isInheritor(t, JavaClassNames.JAVA_LANG_CLASS); + t -> t instanceof PsiPrimitiveType || InheritanceUtil.isInheritor(t, CommonClassNames.JAVA_LANG_CLASS); return Stream.of(constructor.getParameterList().getParameters()).map(PsiParameter::getType).allMatch(allowedParameterType); } if (expression instanceof PsiMethodCallExpression call) { @@ -208,8 +207,8 @@ public static boolean isPrepopulatedCollectionInitializer(PsiExpression expressi PsiType type = parameter.getType(); if (type instanceof PsiClassType) { PsiClassType rawType = ((PsiClassType)type).rawType(); - if (rawType.equalsToText(JavaClassNames.JAVA_UTIL_COLLECTION) - || rawType.equalsToText(JavaClassNames.JAVA_UTIL_MAP)) { + if (rawType.equalsToText(CommonClassNames.JAVA_UTIL_COLLECTION) + || rawType.equalsToText(CommonClassNames.JAVA_UTIL_MAP)) { return true; } } @@ -238,8 +237,8 @@ public static boolean isPrepopulatedCollectionInitializer(PsiExpression expressi } if (type instanceof PsiClassType) { PsiClassType rawType = ((PsiClassType)type).rawType(); - if (rawType.equalsToText(JavaClassNames.JAVA_LANG_ITERABLE) - || rawType.equalsToText(JavaClassNames.JAVA_UTIL_ITERATOR)) { + if (rawType.equalsToText(CommonClassNames.JAVA_LANG_ITERABLE) + || rawType.equalsToText(CommonClassNames.JAVA_UTIL_ITERATOR)) { return true; } } diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java index bcf5c43edf..66831cd135 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java @@ -69,7 +69,7 @@ public void visitClass(PsiClass clazz) { return; } - if (inspectionState.excludeException && InheritanceUtil.isInheritor(clazz, JavaClassNames.JAVA_LANG_THROWABLE)) { + if (inspectionState.excludeException && InheritanceUtil.isInheritor(clazz, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } if (inspectionState.excludeDeprecated && clazz.isDeprecated()) { diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/classParsing/ClassFileReader.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/classParsing/ClassFileReader.java index 4cb20e430e..6f39b57c78 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/classParsing/ClassFileReader.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/classParsing/ClassFileReader.java @@ -23,10 +23,10 @@ import com.intellij.java.compiler.impl.cache.SymbolTable; import com.intellij.java.compiler.impl.util.cls.BytePointer; import com.intellij.java.compiler.impl.util.cls.ClsUtil; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.util.cls.ClsFormatException; import consulo.compiler.CacheCorruptedException; import consulo.compiler.localize.CompilerLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.util.collection.ArrayUtil; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -211,7 +211,7 @@ public String getSuperClass() throws ClsFormatException { BytePointer ptr = new BytePointer(getData(), getConstantPoolEnd() + 4); int index = ClsUtil.readU2(ptr); if (index == 0) { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName()) || "module-info".equals(getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName()) || "module-info".equals(getQualifiedName())) { mySuperClassName = ""; } else { @@ -222,7 +222,7 @@ public String getSuperClass() throws ClsFormatException { ptr.offset = getOffsetInConstantPool(index); mySuperClassName = readClassInfo(ptr); // keep '$' in the name for anonymous classes if (isInterface()) { - if (!JavaClassNames.JAVA_LANG_OBJECT.equals(mySuperClassName)) { + if (!CommonClassNames.JAVA_LANG_OBJECT.equals(mySuperClassName)) { throw new ClsFormatException(); } } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java index 5dd77a1218..bde1063c78 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java @@ -15,19 +15,18 @@ */ package com.intellij.java.debugger.impl.engine.evaluation.expression; -import java.util.ArrayList; -import java.util.List; - +import com.intellij.java.debugger.engine.evaluation.EvaluateException; +import com.intellij.java.debugger.engine.evaluation.expression.Modifier; import com.intellij.java.debugger.impl.engine.DebugProcessImpl; import com.intellij.java.debugger.impl.engine.JVMNameUtil; -import com.intellij.java.debugger.engine.evaluation.EvaluateException; import com.intellij.java.debugger.impl.engine.evaluation.EvaluationContextImpl; -import com.intellij.java.debugger.engine.evaluation.expression.Modifier; +import com.intellij.java.language.psi.CommonClassNames; import consulo.internal.com.sun.jdi.*; - -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + /** * @author Eugene Zhuravlev * @since 2010-02-08 @@ -47,28 +46,28 @@ public Object evaluate(EvaluationContextImpl context) throws EvaluateException { } if (result instanceof BooleanValue booleanValue) { - return convertToWrapper(context, booleanValue, JavaClassNames.JAVA_LANG_BOOLEAN); + return convertToWrapper(context, booleanValue, CommonClassNames.JAVA_LANG_BOOLEAN); } if (result instanceof ByteValue byteValue) { - return convertToWrapper(context, byteValue, JavaClassNames.JAVA_LANG_BYTE); + return convertToWrapper(context, byteValue, CommonClassNames.JAVA_LANG_BYTE); } if (result instanceof CharValue charValue) { - return convertToWrapper(context, charValue, JavaClassNames.JAVA_LANG_CHARACTER); + return convertToWrapper(context, charValue, CommonClassNames.JAVA_LANG_CHARACTER); } if (result instanceof ShortValue shortValue) { - return convertToWrapper(context, shortValue, JavaClassNames.JAVA_LANG_SHORT); + return convertToWrapper(context, shortValue, CommonClassNames.JAVA_LANG_SHORT); } if (result instanceof IntegerValue integerValue) { - return convertToWrapper(context, integerValue, JavaClassNames.JAVA_LANG_INTEGER); + return convertToWrapper(context, integerValue, CommonClassNames.JAVA_LANG_INTEGER); } if (result instanceof LongValue longValue) { - return convertToWrapper(context, longValue, JavaClassNames.JAVA_LANG_LONG); + return convertToWrapper(context, longValue, CommonClassNames.JAVA_LANG_LONG); } if (result instanceof FloatValue floatValue) { - return convertToWrapper(context, floatValue, JavaClassNames.JAVA_LANG_FLOAT); + return convertToWrapper(context, floatValue, CommonClassNames.JAVA_LANG_FLOAT); } if (result instanceof DoubleValue doubleValue) { - return convertToWrapper(context, doubleValue, JavaClassNames.JAVA_LANG_DOUBLE); + return convertToWrapper(context, doubleValue, CommonClassNames.JAVA_LANG_DOUBLE); } throw new EvaluateException("Cannot perform boxing conversion for a value of type " + ((Value)result).type().name()); } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ClassRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ClassRenderer.java index 28fefe65c3..8935f17add 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ClassRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/ClassRenderer.java @@ -15,53 +15,42 @@ */ package com.intellij.java.debugger.impl.ui.tree.render; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import jakarta.annotation.Nonnull; - -import consulo.execution.debug.setting.XDebuggerSettingsManager; -import jakarta.annotation.Nullable; -import org.jdom.Element; -import org.jetbrains.annotations.NonNls; import com.intellij.java.debugger.DebuggerBundle; import com.intellij.java.debugger.DebuggerContext; -import com.intellij.java.debugger.impl.engine.DebuggerManagerThreadImpl; import com.intellij.java.debugger.engine.DebuggerUtils; import com.intellij.java.debugger.engine.evaluation.EvaluateException; import com.intellij.java.debugger.engine.evaluation.EvaluationContext; import com.intellij.java.debugger.engine.jdi.StackFrameProxy; +import com.intellij.java.debugger.impl.engine.DebuggerManagerThreadImpl; import com.intellij.java.debugger.impl.ui.impl.watch.FieldDescriptorImpl; import com.intellij.java.debugger.impl.ui.impl.watch.MessageDescriptor; import com.intellij.java.debugger.impl.ui.impl.watch.NodeManagerImpl; import com.intellij.java.debugger.impl.ui.impl.watch.ValueDescriptorImpl; -import com.intellij.java.debugger.impl.ui.tree.DebuggerTreeNode; -import com.intellij.java.debugger.impl.ui.tree.FieldDescriptor; +import com.intellij.java.debugger.impl.ui.tree.*; import com.intellij.java.debugger.ui.tree.NodeDescriptor; -import com.intellij.java.debugger.impl.ui.tree.NodeDescriptorFactory; -import com.intellij.java.debugger.impl.ui.tree.NodeManager; -import com.intellij.java.debugger.impl.ui.tree.ValueDescriptor; +import com.intellij.java.language.psi.CommonClassNames; +import com.intellij.java.language.psi.JavaPsiFacade; +import com.intellij.java.language.psi.PsiElementFactory; +import consulo.execution.debug.setting.XDebuggerSettingsManager; +import consulo.internal.com.sun.jdi.*; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; import consulo.logging.Logger; import consulo.util.lang.Comparing; +import consulo.util.lang.StringUtil; import consulo.util.xml.serializer.DefaultJDOMExternalizer; import consulo.util.xml.serializer.InvalidDataException; import consulo.util.xml.serializer.WriteExternalException; -import consulo.util.lang.StringUtil; -import consulo.java.language.module.util.JavaClassNames; -import com.intellij.java.language.psi.JavaPsiFacade; -import consulo.language.psi.PsiElement; -import com.intellij.java.language.psi.PsiElementFactory; -import consulo.language.util.IncorrectOperationException; -import java.util.HashSet; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import org.jdom.Element; +import org.jetbrains.annotations.NonNls; -import consulo.internal.com.sun.jdi.*; +import java.util.*; /** - * User: lex - * Date: Sep 17, 2003 - * Time: 2:04:00 PM + * @author lex + * @since 2003-09-17 */ public class ClassRenderer extends NodeRendererImpl { @@ -366,7 +355,7 @@ public static String getEnumConstantName(@Nonnull ObjectReference objRef, ClassT return null; } } - while(!(JavaClassNames.JAVA_LANG_ENUM.equals(classType.name()))); + while(!(CommonClassNames.JAVA_LANG_ENUM.equals(classType.name()))); //noinspection HardCodedStringLiteral final Field field = classType.fieldByName("name"); if(field == null) diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/CompoundTypeRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/CompoundTypeRenderer.java index 2fb49ad665..a1c0b36181 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/CompoundTypeRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/CompoundTypeRenderer.java @@ -15,8 +15,6 @@ */ package com.intellij.java.debugger.impl.ui.tree.render; -import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; import com.intellij.java.debugger.DebuggerContext; import com.intellij.java.debugger.engine.DebugProcess; import com.intellij.java.debugger.engine.DebuggerUtils; @@ -25,16 +23,18 @@ import com.intellij.java.debugger.impl.settings.NodeRendererSettings; import com.intellij.java.debugger.impl.ui.tree.DebuggerTreeNode; import com.intellij.java.debugger.impl.ui.tree.ValueDescriptor; -import consulo.logging.Logger; -import consulo.project.Project; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.JavaPsiFacade; -import consulo.language.psi.PsiElement; import com.intellij.java.language.psi.PsiElementFactory; -import consulo.language.psi.scope.GlobalSearchScope; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.internal.com.sun.jdi.ReferenceType; import consulo.internal.com.sun.jdi.Type; +import consulo.language.psi.PsiElement; +import consulo.language.psi.scope.GlobalSearchScope; +import consulo.logging.Logger; +import consulo.project.Project; +import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.NonNls; public class CompoundTypeRenderer extends CompoundNodeRenderer { @@ -47,7 +47,7 @@ public class CompoundTypeRenderer extends CompoundNodeRenderer public CompoundTypeRenderer(NodeRendererSettings rendererSettings, String name, ValueLabelRenderer labelRenderer, ChildrenRenderer childrenRenderer) { super(rendererSettings, name, labelRenderer, childrenRenderer); - myProperties.setClassName(JavaClassNames.JAVA_LANG_OBJECT); + myProperties.setClassName(CommonClassNames.JAVA_LANG_OBJECT); LOG.assertTrue(labelRenderer == null || labelRenderer instanceof TypeRenderer); LOG.assertTrue(childrenRenderer == null || childrenRenderer instanceof TypeRenderer); } diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/controlFlow/ControlFlowAnalyzer.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/controlFlow/ControlFlowAnalyzer.java index 9f86650ffa..2e3fe78658 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/controlFlow/ControlFlowAnalyzer.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/controlFlow/ControlFlowAnalyzer.java @@ -8,7 +8,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.access.RequiredReadAction; import consulo.application.progress.ProgressManager; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiErrorElement; @@ -1176,7 +1175,7 @@ else if (!throwReachable) { // if description is evaluated, the 'assert' statement cannot complete normally // though non-necessarily AssertionError will be thrown (description may throw something, or AssertionError ctor, etc.) PsiClassType exceptionClass = JavaPsiFacade.getElementFactory(statement.getProject()) - .createTypeByFQClassName(JavaClassNames.JAVA_LANG_THROWABLE, statement.getResolveScope()); + .createTypeByFQClassName(CommonClassNames.JAVA_LANG_THROWABLE, statement.getResolveScope()); addThrowInstructions(findThrowToBlocks(exceptionClass)); myStartStatementStack.popStatement(); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsClassImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsClassImpl.java index cdddfeea4f..0b13dd7024 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsClassImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsClassImpl.java @@ -23,7 +23,6 @@ import consulo.application.util.Queryable; import consulo.content.scope.SearchScope; import consulo.java.language.impl.psi.augment.JavaEnumAugmentProvider; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.ast.TreeElement; import consulo.language.impl.psi.SourceTreeToPsiMap; import consulo.language.psi.*; @@ -160,7 +159,7 @@ public PsiClass[] getInterfaces() { @Override @Nonnull public PsiClass[] getSupers() { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName())) { return PsiClass.EMPTY_ARRAY; } return PsiClassImplUtil.getSupers(this); @@ -169,7 +168,7 @@ public PsiClass[] getSupers() { @Override @Nonnull public PsiClassType[] getSuperTypes() { - if (JavaClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName())) { return PsiClassType.EMPTY_ARRAY; } return PsiClassImplUtil.getSuperTypes(this); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java index 3a8fcaaa3e..5bae8745dd 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java @@ -26,7 +26,6 @@ import consulo.application.dumb.IndexNotReadyException; import consulo.component.extension.Extensions; import consulo.content.scope.SearchScope; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.ast.TreeElement; import consulo.language.impl.psi.SourceTreeToPsiMap; import consulo.language.psi.PsiElement; @@ -36,7 +35,6 @@ import consulo.navigation.ItemPresentationProvider; import consulo.util.lang.Comparing; import consulo.util.lang.lazy.LazyValue; - import jakarta.annotation.Nonnull; import java.util.HashSet; @@ -128,7 +126,7 @@ public Object computeConstantValue(Set visitedVars) { PsiClass containingClass = getContainingClass(); if (containingClass != null) { String qName = containingClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_FLOAT.equals(qName)) { + if (CommonClassNames.JAVA_LANG_FLOAT.equals(qName)) { String name = getName(); if ("POSITIVE_INFINITY".equals(name)) { return Float.POSITIVE_INFINITY; @@ -140,7 +138,7 @@ public Object computeConstantValue(Set visitedVars) { return Float.NaN; } } - else if (JavaClassNames.JAVA_LANG_DOUBLE.equals(qName)) { + else if (CommonClassNames.JAVA_LANG_DOUBLE.equals(qName)) { String name = getName(); if ("POSITIVE_INFINITY".equals(name)) { return Double.POSITIVE_INFINITY; diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/ClassResolverProcessor.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/ClassResolverProcessor.java index 73730b6b28..4e441d48f5 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/ClassResolverProcessor.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/ClassResolverProcessor.java @@ -21,27 +21,26 @@ import com.intellij.java.language.psi.infos.CandidateInfo; import com.intellij.java.language.psi.infos.ClassCandidateInfo; import com.intellij.java.language.psi.scope.JavaScopeProcessorEvent; -import consulo.util.lang.Comparing; -import consulo.util.lang.StringUtil; +import consulo.language.psi.FileContextUtil; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.FileContextUtil; import consulo.language.psi.resolve.BaseScopeProcessor; import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; import consulo.language.psi.util.PsiTreeUtil; -import consulo.util.collection.SmartList; -import consulo.java.language.module.util.JavaClassNames; import consulo.logging.Logger; +import consulo.util.collection.SmartList; import consulo.util.dataholder.Key; - +import consulo.util.lang.Comparing; +import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; + import java.util.Iterator; import java.util.List; public class ClassResolverProcessor extends BaseScopeProcessor implements NameHint, ElementClassHint { private static final Logger LOG = Logger.getInstance(ClassResolverProcessor.class); - private static final String[] DEFAULT_PACKAGES = {JavaClassNames.DEFAULT_PACKAGE}; + private static final String[] DEFAULT_PACKAGES = {CommonClassNames.DEFAULT_PACKAGE}; private final String myClassName; @Nonnull diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CatchTypeProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CatchTypeProvider.java index e7819662cf..bb21c3a81e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CatchTypeProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CatchTypeProvider.java @@ -15,22 +15,21 @@ */ package com.intellij.java.impl.codeInsight.completion; -import consulo.language.editor.completion.lookup.TailType; +import com.intellij.java.impl.codeInsight.lookup.PsiTypeLookupItem; +import com.intellij.java.language.impl.codeInsight.ExceptionUtil; +import com.intellij.java.language.psi.*; import consulo.language.editor.completion.CompletionParameters; +import consulo.language.editor.completion.CompletionProvider; import consulo.language.editor.completion.CompletionResultSet; import consulo.language.editor.completion.lookup.LookupElement; +import consulo.language.editor.completion.lookup.TailType; import consulo.language.editor.completion.lookup.TailTypeDecorator; -import com.intellij.java.impl.codeInsight.lookup.PsiTypeLookupItem; -import com.intellij.java.language.impl.codeInsight.ExceptionUtil; -import com.intellij.java.language.psi.*; import consulo.language.pattern.ElementPattern; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import consulo.language.util.ProcessingContext; -import consulo.language.editor.completion.CompletionProvider; -import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; + import java.util.Collection; import java.util.Collections; @@ -65,8 +64,9 @@ public void addCompletions(@Nonnull final CompletionParameters parameters, final } } - final Collection expectedClassTypes = Collections.singletonList(JavaPsiFacade.getElementFactory(tryBlock.getProject()).createTypeByFQClassName(JavaClassNames - .JAVA_LANG_THROWABLE)); + final Collection expectedClassTypes = Collections.singletonList( + JavaPsiFacade.getElementFactory(tryBlock.getProject()).createTypeByFQClassName(CommonClassNames.JAVA_LANG_THROWABLE) + ); JavaInheritorsGetter.processInheritors(parameters, expectedClassTypes, result.getPrefixMatcher(), type -> { final PsiClass psiClass = type instanceof PsiClassType ? ((PsiClassType) type).resolve() : null; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/ConstructorInsertHandler.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/ConstructorInsertHandler.java index d2e1e18383..d3ca5e1d20 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/ConstructorInsertHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/ConstructorInsertHandler.java @@ -16,7 +16,6 @@ import consulo.codeEditor.ScrollType; import consulo.document.Document; import consulo.externalService.statistic.FeatureUsageTracker; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.codeStyle.PostprocessReformattingAspect; import consulo.language.editor.WriteCommandAction; @@ -37,10 +36,10 @@ import consulo.project.Project; import consulo.undoRedo.CommandProcessor; import consulo.undoRedo.UndoConfirmationPolicy; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Contract; + import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -313,7 +312,7 @@ public void run() { private static boolean shouldStartTypeTemplate(PsiTypeElement[] parameters) { if (parameters != null && parameters.length > 0) { for (PsiTypeElement parameter : parameters) { - if (parameter.getType().equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (parameter.getType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java index 3b81b26696..58a966d732 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java @@ -19,15 +19,13 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import consulo.codeEditor.Editor; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.psi.PsiFile; import consulo.language.psi.PsiManager; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; -import org.jetbrains.annotations.Nls; - import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.Nls; /** * @author Pavel.Dolgov @@ -40,7 +38,7 @@ public ConvertCollectionToArrayFix(@Nonnull PsiExpression collectionExpression, myCollectionExpression = collectionExpression; PsiType componentType = arrayType.getComponentType(); - myNewArrayText = componentType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) ? "" : "new " + getArrayTypeText(componentType); + myNewArrayText = componentType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) ? "" : "new " + getArrayTypeText(componentType); } @Nls diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java index 68f3b7b278..8b630023dc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java @@ -15,7 +15,6 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import consulo.annotation.access.RequiredReadAction; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.editor.localize.CommonQuickFixLocalize; import consulo.language.psi.PsiElement; @@ -98,7 +97,7 @@ public static void doProcessIntention(@Nonnull PsiSwitchStatement switchStatemen return; } CommentTracker commentTracker = new CommentTracker(); - boolean isSwitchOnString = switchExpressionType.equalsToText(JavaClassNames.JAVA_LANG_STRING); + boolean isSwitchOnString = switchExpressionType.equalsToText(CommonClassNames.JAVA_LANG_STRING); boolean useEquals = isSwitchOnString; if (!useEquals) { PsiClass aClass = PsiUtil.resolveClassInType(switchExpressionType); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java index ea8038d4e8..06ddfd8b8b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java @@ -10,7 +10,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.editor.inspection.LocalInspectionToolSession; import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.psi.PsiElement; @@ -153,7 +152,7 @@ public static ParseException checkContract(PsiMethod method, String text) { break; case TRUE_VALUE: case FALSE_VALUE: - if (!PsiType.BOOLEAN.equals(type) && !type.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN)) { + if (!PsiType.BOOLEAN.equals(type) && !type.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN)) { LocalizeValue message = LocalizeValue.localizeTODO( "Contract clause '" + contract + "': parameter #" + (i + 1) + " has '" + type.getPresentableText() + "' type (expected boolean)" diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/CastToConcreteClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/CastToConcreteClassInspection.java index 724a6dd013..1d157a22d7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/CastToConcreteClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/CastToConcreteClassInspection.java @@ -22,7 +22,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.psi.util.PsiTreeUtil; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -108,7 +107,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) { return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_CLASS.equals(className)) { + if (!CommonClassNames.JAVA_LANG_CLASS.equals(className)) { return; } final PsiType[] parameters = classType.getParameters(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ClassNewInstanceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ClassNewInstanceInspection.java index 9d12f1869a..beccfc24e9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ClassNewInstanceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ClassNewInstanceInspection.java @@ -22,7 +22,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.psi.scope.GlobalSearchScope; @@ -178,7 +177,7 @@ public void visitMethodCallExpression( return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_CLASS.equals(className)) { + if (!CommonClassNames.JAVA_LANG_CLASS.equals(className)) { return; } registerMethodCallError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CollectionAddedToSelfInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CollectionAddedToSelfInspection.java index 1531842d65..7c1cebddbc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CollectionAddedToSelfInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CollectionAddedToSelfInspection.java @@ -23,7 +23,6 @@ import com.siyeh.ig.psiutils.EquivalenceChecker; 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; @@ -97,10 +96,8 @@ public void visitMethodCallExpression( if (qualifierClass == null) { return; } - if (!InheritanceUtil.isInheritor(qualifierClass, - JavaClassNames.JAVA_UTIL_COLLECTION) && - !InheritanceUtil.isInheritor(qualifierClass, - JavaClassNames.JAVA_UTIL_MAP)) { + if (!InheritanceUtil.isInheritor(qualifierClass, CommonClassNames.JAVA_UTIL_COLLECTION) + && !InheritanceUtil.isInheritor(qualifierClass, CommonClassNames.JAVA_UTIL_MAP)) { return; } registerError(qualifier); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java index 53fc4cdfff..0714912fda 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparableImplementedButEqualsNotOverriddenInspection.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ig.bugs; +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.PsiMethod; @@ -25,7 +26,6 @@ import com.siyeh.ig.psiutils.MethodUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.scope.GlobalSearchScope; import consulo.project.Project; import jakarta.annotation.Nonnull; @@ -65,9 +65,7 @@ public void visitClass(PsiClass aClass) { final Project project = aClass.getProject(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); final GlobalSearchScope scope = aClass.getResolveScope(); - final PsiClass comparableClass = - psiFacade.findClass(JavaClassNames.JAVA_LANG_COMPARABLE, - scope); + final PsiClass comparableClass = psiFacade.findClass(CommonClassNames.JAVA_LANG_COMPARABLE, scope); if (comparableClass == null) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparatorMethodParameterNotUsedInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparatorMethodParameterNotUsedInspection.java index 558dbc71b2..7ba73e03da 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparatorMethodParameterNotUsedInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ComparatorMethodParameterNotUsedInspection.java @@ -16,13 +16,12 @@ package com.intellij.java.impl.ig.bugs; import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.MethodUtils; -import consulo.java.language.module.util.JavaClassNames; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; @@ -63,9 +62,14 @@ private static class CompareMethodDoesNotUseParameterVisitor @Override public void visitMethod(PsiMethod method) { super.visitMethod(method); - if (!MethodUtils.methodMatches(method, - JavaClassNames.JAVA_UTIL_COMPARATOR, - PsiType.INT, "compare", PsiType.NULL, PsiType.NULL)) { + if (!MethodUtils.methodMatches( + method, + CommonClassNames.JAVA_UTIL_COMPARATOR, + PsiType.INT, + "compare", + PsiType.NULL, + PsiType.NULL + )) { return; } final PsiCodeBlock body = method.getBody(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java index b0b576b01a..7b8c023438 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java @@ -16,10 +16,7 @@ package com.intellij.java.impl.ig.errorhandling; import com.intellij.java.impl.ig.ui.UiUtils; -import com.intellij.java.language.psi.PsiCatchSection; -import com.intellij.java.language.psi.PsiParameter; -import com.intellij.java.language.psi.PsiType; -import com.intellij.java.language.psi.PsiTypeElement; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.ui.ExternalizableStringSet; @@ -27,7 +24,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; @@ -48,9 +44,9 @@ public class BadExceptionCaughtInspection extends BaseInspection { */ public final ExternalizableStringSet exceptions = new ExternalizableStringSet( - JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, + CommonClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, "java.lang.IllegalMonitorStateException", - JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION + CommonClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION ); public BadExceptionCaughtInspection() { @@ -88,7 +84,7 @@ public JComponent createOptionsPanel() { return UiUtils.createAddRemoveTreeClassChooserPanel( table, InspectionGadgetsLocalize.chooseExceptionClass().get(), - JavaClassNames.JAVA_LANG_THROWABLE + CommonClassNames.JAVA_LANG_THROWABLE ); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java index 956502f341..61e3b6d719 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -18,10 +18,7 @@ import com.intellij.java.impl.ig.psiutils.LibraryUtil; import com.intellij.java.impl.ig.ui.UiUtils; import com.intellij.java.language.codeInsight.TestFrameworks; -import com.intellij.java.language.psi.PsiClass; -import com.intellij.java.language.psi.PsiJavaCodeReferenceElement; -import com.intellij.java.language.psi.PsiMethod; -import com.intellij.java.language.psi.PsiReferenceList; +import com.intellij.java.language.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -53,13 +50,13 @@ public class BadExceptionDeclaredInspection extends BaseInspection { * @noinspection PublicField */ public final ExternalizableStringSet exceptions = new ExternalizableStringSet( - JavaClassNames.JAVA_LANG_THROWABLE, - JavaClassNames.JAVA_LANG_EXCEPTION, - JavaClassNames.JAVA_LANG_ERROR, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, - JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, - JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION, - JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION + CommonClassNames.JAVA_LANG_THROWABLE, + CommonClassNames.JAVA_LANG_EXCEPTION, + CommonClassNames.JAVA_LANG_ERROR, + CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + CommonClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, + CommonClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION, + CommonClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION ); /** @@ -106,7 +103,7 @@ public JComponent createOptionsPanel() { JPanel tablePanel = UiUtils.createAddRemoveTreeClassChooserPanel( table, InspectionGadgetsLocalize.chooseExceptionClass().get(), - JavaClassNames.JAVA_LANG_THROWABLE + CommonClassNames.JAVA_LANG_THROWABLE ); final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java index 9bb6233b3e..6cdad9b5bf 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.ig.errorhandling; import com.intellij.java.impl.ig.ui.UiUtils; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiThrowStatement; import com.intellij.java.language.psi.PsiType; @@ -44,13 +45,13 @@ public class BadExceptionThrownInspection extends BaseInspection { @SuppressWarnings("PublicField") public final ExternalizableStringSet exceptions = new ExternalizableStringSet( - JavaClassNames.JAVA_LANG_THROWABLE, - JavaClassNames.JAVA_LANG_EXCEPTION, - JavaClassNames.JAVA_LANG_ERROR, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, - JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, - JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION, - JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION + CommonClassNames.JAVA_LANG_THROWABLE, + CommonClassNames.JAVA_LANG_EXCEPTION, + CommonClassNames.JAVA_LANG_ERROR, + CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + CommonClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, + CommonClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION, + CommonClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION ); public BadExceptionThrownInspection() { @@ -83,7 +84,7 @@ public JComponent createOptionsPanel() { return UiUtils.createAddRemoveTreeClassChooserPanel( table, InspectionGadgetsLocalize.chooseExceptionClass().get(), - JavaClassNames.JAVA_LANG_THROWABLE + CommonClassNames.JAVA_LANG_THROWABLE ); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/CheckedExceptionClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/CheckedExceptionClassInspection.java index 9768ee9e83..a6d6da9efe 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/CheckedExceptionClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/CheckedExceptionClassInspection.java @@ -15,13 +15,13 @@ */ package com.intellij.java.impl.ig.errorhandling; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.util.InheritanceUtil; import com.siyeh.ig.BaseInspection; 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; @ExtensionImpl @@ -48,12 +48,10 @@ private static class CheckedExceptionClassVisitor extends BaseInspectionVisitor { @Override public void visitClass(@Nonnull PsiClass aClass) { - if (!InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_THROWABLE)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_THROWABLE)) { return; } - if (InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { + if (InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { return; } registerClassError(aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/CharacterComparisonInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/CharacterComparisonInspection.java index e100e562d8..e72c3e62d0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/CharacterComparisonInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/CharacterComparisonInspection.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.PsiBinaryExpression; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiKeyword; @@ -24,7 +25,6 @@ import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -74,8 +74,8 @@ public void visitBinaryExpression(@Nonnull PsiBinaryExpression expression) { } private static boolean isCharacter(@Nullable PsiExpression expression) { - return ExpressionUtils.hasType(expression, PsiKeyword.CHAR) || - ExpressionUtils.hasType(expression, JavaClassNames.JAVA_LANG_CHARACTER); + return ExpressionUtils.hasType(expression, PsiKeyword.CHAR) + || ExpressionUtils.hasType(expression, CommonClassNames.JAVA_LANG_CHARACTER); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoBoxingInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoBoxingInspection.java index ad8c308418..57f247fac3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoBoxingInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoBoxingInspection.java @@ -26,7 +26,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.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.localize.LocalizeValue; @@ -53,22 +52,22 @@ public class AutoBoxingInspection extends BaseInspection { @NonNls static final Map s_boxingClasses = new HashMap(8); static { - s_boxingClasses.put("byte", JavaClassNames.JAVA_LANG_BYTE); - s_boxingClasses.put("short", JavaClassNames.JAVA_LANG_SHORT); - s_boxingClasses.put("int", JavaClassNames.JAVA_LANG_INTEGER); - s_boxingClasses.put("long", JavaClassNames.JAVA_LANG_LONG); - s_boxingClasses.put("float", JavaClassNames.JAVA_LANG_FLOAT); - s_boxingClasses.put("double", JavaClassNames.JAVA_LANG_DOUBLE); - s_boxingClasses.put("boolean", JavaClassNames.JAVA_LANG_BOOLEAN); - s_boxingClasses.put("char", JavaClassNames.JAVA_LANG_CHARACTER); + s_boxingClasses.put("byte", CommonClassNames.JAVA_LANG_BYTE); + s_boxingClasses.put("short", CommonClassNames.JAVA_LANG_SHORT); + s_boxingClasses.put("int", CommonClassNames.JAVA_LANG_INTEGER); + s_boxingClasses.put("long", CommonClassNames.JAVA_LANG_LONG); + s_boxingClasses.put("float", CommonClassNames.JAVA_LANG_FLOAT); + s_boxingClasses.put("double", CommonClassNames.JAVA_LANG_DOUBLE); + s_boxingClasses.put("boolean", CommonClassNames.JAVA_LANG_BOOLEAN); + s_boxingClasses.put("char", CommonClassNames.JAVA_LANG_CHARACTER); } @NonNls static final Set convertableBoxedClassNames = new HashSet(); static { - convertableBoxedClassNames.add(JavaClassNames.JAVA_LANG_BYTE); - convertableBoxedClassNames.add(JavaClassNames.JAVA_LANG_CHARACTER); - convertableBoxedClassNames.add(JavaClassNames.JAVA_LANG_SHORT); + convertableBoxedClassNames.add(CommonClassNames.JAVA_LANG_BYTE); + convertableBoxedClassNames.add(CommonClassNames.JAVA_LANG_CHARACTER); + convertableBoxedClassNames.add(CommonClassNames.JAVA_LANG_SHORT); } @Override @@ -163,44 +162,44 @@ private static boolean shortcutReplace(PsiExpression expression, String classToC if (qualifierExpression == null) { return false; } - if (classToConstruct.equals(JavaClassNames.JAVA_LANG_INTEGER)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_INTEGER, PsiType.INT, "intValue")) { + if (classToConstruct.equals(CommonClassNames.JAVA_LANG_INTEGER)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_INTEGER, PsiType.INT, "intValue")) { expression.replace(qualifierExpression); return true; } } - else if (classToConstruct.equals(JavaClassNames.JAVA_LANG_SHORT)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_SHORT, PsiType.SHORT, "shortValue")) { + else if (classToConstruct.equals(CommonClassNames.JAVA_LANG_SHORT)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_SHORT, PsiType.SHORT, "shortValue")) { expression.replace(qualifierExpression); return true; } } - else if (classToConstruct.equals(JavaClassNames.JAVA_LANG_BYTE)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_BYTE, PsiType.BYTE, "byteValue")) { + else if (classToConstruct.equals(CommonClassNames.JAVA_LANG_BYTE)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_BYTE, PsiType.BYTE, "byteValue")) { expression.replace(qualifierExpression); return true; } } - else if (classToConstruct.equals(JavaClassNames.JAVA_LANG_CHARACTER)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_CHARACTER, PsiType.CHAR, "charValue")) { + else if (classToConstruct.equals(CommonClassNames.JAVA_LANG_CHARACTER)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_CHARACTER, PsiType.CHAR, "charValue")) { expression.replace(qualifierExpression); return true; } } - else if (classToConstruct.equals(JavaClassNames.JAVA_LANG_LONG)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_LONG, PsiType.LONG, "longValue")) { + else if (classToConstruct.equals(CommonClassNames.JAVA_LANG_LONG)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_LONG, PsiType.LONG, "longValue")) { expression.replace(qualifierExpression); return true; } } - else if (classToConstruct.equals(JavaClassNames.JAVA_LANG_FLOAT)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_FLOAT, PsiType.FLOAT, "floatValue")) { + else if (classToConstruct.equals(CommonClassNames.JAVA_LANG_FLOAT)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_FLOAT, PsiType.FLOAT, "floatValue")) { expression.replace(qualifierExpression); return true; } } - else if (classToConstruct.equals(JavaClassNames.JAVA_LANG_DOUBLE)) { - if (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_DOUBLE, PsiType.DOUBLE, "doubleValue")) { + else if (classToConstruct.equals(CommonClassNames.JAVA_LANG_DOUBLE)) { + if (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_DOUBLE, PsiType.DOUBLE, "doubleValue")) { expression.replace(qualifierExpression); return true; } @@ -350,7 +349,7 @@ private boolean isAddedToCollection(PsiExpression expression) { return false; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - return TypeUtils.expressionHasTypeOrSubtype(qualifier, JavaClassNames.JAVA_UTIL_COLLECTION, JavaClassNames.JAVA_UTIL_MAP) != null; + return TypeUtils.expressionHasTypeOrSubtype(qualifier, CommonClassNames.JAVA_UTIL_COLLECTION, CommonClassNames.JAVA_UTIL_MAP) != null; } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoUnboxingInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoUnboxingInspection.java index 14e291e117..571080c1e2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoUnboxingInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/AutoUnboxingInspection.java @@ -29,7 +29,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.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -228,7 +227,7 @@ private static String buildNewExpressionText(PsiExpression expression, PsiPrimit } } final PsiType type = expression.getType(); - if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)) { + if (type != null && type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return "((" + unboxedType.getBoxedTypeName() + ')' + expressionText + ")." + boxMethodName + "()"; } return expressionText + '.' + boxMethodName + "()"; @@ -242,13 +241,13 @@ private static boolean isValueOfCall(PsiMethodCallExpression methodCallExpressio } final PsiExpression argument = arguments[0]; final PsiType type = argument.getType(); - return (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_INTEGER, null, "valueOf", PsiType.INT) && PsiType.INT.equals(type)) || - (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_SHORT, null, "valueOf", PsiType.SHORT) && PsiType.SHORT.equals(type)) || - (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_BYTE, null, "valueOf", PsiType.BYTE) && PsiType.BYTE.equals(type)) || - (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_LONG, null, "valueOf", PsiType.LONG) && PsiType.LONG.equals(type)) || - (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_CHARACTER, null, "valueOf", PsiType.CHAR) && PsiType.CHAR.equals(type)) || - (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_DOUBLE, null, "valueOf", PsiType.DOUBLE) && PsiType.DOUBLE.equals(type)) || - (MethodCallUtils.isCallToMethod(methodCallExpression, JavaClassNames.JAVA_LANG_FLOAT, null, "valueOf", PsiType.FLOAT) && PsiType.FLOAT.equals(type)); + return (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_INTEGER, null, "valueOf", PsiType.INT) && PsiType.INT.equals(type)) || + (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_SHORT, null, "valueOf", PsiType.SHORT) && PsiType.SHORT.equals(type)) || + (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_BYTE, null, "valueOf", PsiType.BYTE) && PsiType.BYTE.equals(type)) || + (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_LONG, null, "valueOf", PsiType.LONG) && PsiType.LONG.equals(type)) || + (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_CHARACTER, null, "valueOf", PsiType.CHAR) && PsiType.CHAR.equals(type)) || + (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_DOUBLE, null, "valueOf", PsiType.DOUBLE) && PsiType.DOUBLE.equals(type)) || + (MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_LANG_FLOAT, null, "valueOf", PsiType.FLOAT) && PsiType.FLOAT.equals(type)); } @NonNls @@ -267,7 +266,7 @@ private static String computeConstantBooleanText(PsiExpression expression) { return null; } final String qualifiedName = containingClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_BOOLEAN.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_LANG_BOOLEAN.equals(qualifiedName)) { return null; } @NonNls final String name = field.getName(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java index 84c590847f..9c944e7673 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ExpectedTypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -95,17 +94,15 @@ private static String getCollectionsMethodCallText( (PsiWildcardType) parameterType; final PsiType bound = wildcardType.getBound(); if (bound != null) { - if (!bound.equalsToText( - JavaClassNames.JAVA_LANG_OBJECT)) { + if (!bound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { useTypeParameter = true; } canonicalTexts[i] = bound.getCanonicalText(); } else { - canonicalTexts[i] = JavaClassNames.JAVA_LANG_OBJECT; + canonicalTexts[i] = CommonClassNames.JAVA_LANG_OBJECT; } } else { - if (!parameterType.equalsToText( - JavaClassNames.JAVA_LANG_OBJECT)) { + if (!parameterType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { useTypeParameter = true; } canonicalTexts[i] = parameterType.getCanonicalText(); @@ -192,7 +189,7 @@ public void visitReferenceExpression( return; } final String qualifiedName = containingClass.getQualifiedName(); - if (!JavaClassNames.JAVA_UTIL_COLLECTIONS.equals(qualifiedName)) { + if (!CommonClassNames.JAVA_UTIL_COLLECTIONS.equals(qualifiedName)) { return; } registerError(expression, expression, replacement); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java index eeb4788a24..5e8e5b0037 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java @@ -18,6 +18,7 @@ import com.intellij.java.impl.ig.fixes.RenameFix; import com.intellij.java.impl.ig.psiutils.LibraryUtil; import com.intellij.java.impl.ig.ui.UiUtils; +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.PsiType; @@ -30,7 +31,6 @@ import consulo.deadCodeNotWorking.impl.CheckBox; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; -import consulo.java.language.module.util.JavaClassNames; import consulo.util.xml.serializer.InvalidDataException; import consulo.util.xml.serializer.WriteExternalException; import jakarta.annotation.Nonnull; @@ -148,7 +148,7 @@ public void visitMethod(@Nonnull PsiMethod method) { if (returnType == null) { return; } else if (!returnType.equals(PsiType.BOOLEAN)) { - if (ignoreBooleanMethods || !returnType.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN)) { + if (ignoreBooleanMethods || !returnType.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/ConfusingMainMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/ConfusingMainMethodInspection.java index 2f1e50f328..9c8cabf4e0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/ConfusingMainMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/ConfusingMainMethodInspection.java @@ -24,7 +24,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 @@ -88,8 +87,7 @@ public void visitMethod(@Nonnull PsiMethod aMethod) { } final PsiParameter[] parameters = parameterList.getParameters(); final PsiType parameterType = parameters[0].getType(); - if (!TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_STRING + "[]", - parameterType)) { + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING + "[]", parameterType)) { registerMethodError(aMethod); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/CachedNumberConstructorCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/CachedNumberConstructorCallInspection.java index 8f989c0bc2..62474cb32b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/CachedNumberConstructorCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/CachedNumberConstructorCallInspection.java @@ -23,7 +23,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.util.IncorrectOperationException; import consulo.project.Project; @@ -39,10 +38,10 @@ public class CachedNumberConstructorCallInspection private static final Set cachedNumberTypes = new HashSet(); static { - cachedNumberTypes.add(JavaClassNames.JAVA_LANG_LONG); - cachedNumberTypes.add(JavaClassNames.JAVA_LANG_BYTE); - cachedNumberTypes.add(JavaClassNames.JAVA_LANG_INTEGER); - cachedNumberTypes.add(JavaClassNames.JAVA_LANG_SHORT); + cachedNumberTypes.add(CommonClassNames.JAVA_LANG_LONG); + cachedNumberTypes.add(CommonClassNames.JAVA_LANG_BYTE); + cachedNumberTypes.add(CommonClassNames.JAVA_LANG_INTEGER); + cachedNumberTypes.add(CommonClassNames.JAVA_LANG_SHORT); } @Override @@ -133,7 +132,7 @@ public void visitNewExpression( final PsiType argumentType = argument.getType(); if (argumentType == null || argumentType.equalsToText( - JavaClassNames.JAVA_LANG_STRING)) { + CommonClassNames.JAVA_LANG_STRING)) { return; } registerError(expression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ComparisonToNaNInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ComparisonToNaNInspection.java index 253500f6f4..fd9eeb91c4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ComparisonToNaNInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ComparisonToNaNInspection.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.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -140,7 +139,7 @@ private static boolean isNaN(PsiExpression expression) { return false; } final String qualifiedName = containingClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_DOUBLE.equals(qualifiedName) || JavaClassNames.JAVA_LANG_FLOAT.equals(qualifiedName); + return CommonClassNames.JAVA_LANG_DOUBLE.equals(qualifiedName) || CommonClassNames.JAVA_LANG_FLOAT.equals(qualifiedName); } } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java index 21f3cb8255..8d218d1f9a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java @@ -22,7 +22,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.util.IncorrectOperationException; import consulo.project.Project; @@ -345,8 +344,8 @@ public void visitMethodCallExpression( return; } final String className = referencedClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_MATH.equals(className) - && !JavaClassNames.JAVA_LANG_STRICT_MATH.equals(className)) { + if (!CommonClassNames.JAVA_LANG_MATH.equals(className) + && !CommonClassNames.JAVA_LANG_STRICT_MATH.equals(className)) { return; } registerMethodCallError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java index 38aa9a7150..ca79bb0f69 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BooleanConstructorInspection.java @@ -104,7 +104,7 @@ else if (languageLevel.equals(LanguageLevel.JDK_1_3)) { newExpression = buildText(argument, false); } else { - final PsiClass booleanClass = ClassUtils.findClass(JavaClassNames.JAVA_LANG_BOOLEAN, argument); + final PsiClass booleanClass = ClassUtils.findClass(CommonClassNames.JAVA_LANG_BOOLEAN, argument); boolean methodFound = false; if (booleanClass != null) { final PsiMethod[] methods = booleanClass.findMethodsByName("valueOf", false); @@ -151,13 +151,13 @@ private static class BooleanConstructorVisitor extends BaseInspectionVisitor { public void visitNewExpression(@Nonnull PsiNewExpression expression) { super.visitNewExpression(expression); final PsiType type = expression.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_BOOLEAN)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_BOOLEAN)) { return; } final PsiClass aClass = ClassUtils.getContainingClass(expression); if (aClass != null) { final String qualifiedName = aClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_BOOLEAN.equals(qualifiedName)) { + if (CommonClassNames.JAVA_LANG_BOOLEAN.equals(qualifiedName)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java index c0bb7dcaa6..bc42b2a0a0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/BoxingBoxedValueInspection.java @@ -44,14 +44,14 @@ public class BoxingBoxedValueInspection extends BaseInspection { new HashMap(8); static { - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_INTEGER, "int"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_SHORT, "short"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_BOOLEAN, "boolean"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_LONG, "long"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_BYTE, "byte"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_FLOAT, "float"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_DOUBLE, "double"); - boxedPrimitiveMap.put(JavaClassNames.JAVA_LANG_CHARACTER, "char"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_INTEGER, "int"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_SHORT, "short"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_BOOLEAN, "boolean"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_LONG, "long"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_BYTE, "byte"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_FLOAT, "float"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_DOUBLE, "double"); + boxedPrimitiveMap.put(CommonClassNames.JAVA_LANG_CHARACTER, "char"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java index 163998cfa8..a8a35619d1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionContainsUrlInspection.java @@ -121,10 +121,10 @@ private static ClassType isMapOrSet( return ClassType.OTHER; } @NonNls final String className = aClass.getQualifiedName(); - if (JavaClassNames.JAVA_UTIL_SET.equals(className)) { + if (CommonClassNames.JAVA_UTIL_SET.equals(className)) { return ClassType.SET; } - else if (JavaClassNames.JAVA_UTIL_MAP.equals(className)) { + else if (CommonClassNames.JAVA_UTIL_MAP.equals(className)) { return ClassType.MAP; } final PsiClass[] supers = aClass.getSupers(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java index 8b0f49de11..d8f258a738 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java @@ -15,27 +15,20 @@ */ package com.intellij.java.impl.ig.performance; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import jakarta.annotation.Nonnull; -import javax.swing.JComponent; - -import org.jdom.Element; -import org.jetbrains.annotations.NonNls; +import com.intellij.java.impl.ig.ui.UiUtils; +import com.intellij.java.language.psi.CommonClassNames; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; +import consulo.java.analysis.impl.JavaQuickFixBundle; +import consulo.util.collection.SmartList; import consulo.util.xml.serializer.InvalidDataException; import consulo.util.xml.serializer.WriteExternalException; -import consulo.java.language.module.util.JavaClassNames; -import consulo.util.collection.SmartList; -import com.intellij.java.impl.ig.ui.UiUtils; -import consulo.java.analysis.impl.JavaQuickFixBundle; +import jakarta.annotation.Nonnull; +import org.jdom.Element; +import org.jetbrains.annotations.NonNls; + +import javax.swing.*; +import java.util.*; /** * @author Dmitry Batkovich @@ -48,13 +41,13 @@ public abstract class CollectionsListSettings static { final SortedSet set = new TreeSet<>(); - set.add(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP); + set.add(CommonClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP); set.add("java.util.concurrent.PriorityBlockingQueue"); set.add("java.util.ArrayDeque"); - set.add(JavaClassNames.JAVA_UTIL_ARRAY_LIST); - set.add(JavaClassNames.JAVA_UTIL_HASH_MAP); + set.add(CommonClassNames.JAVA_UTIL_ARRAY_LIST); + set.add(CommonClassNames.JAVA_UTIL_HASH_MAP); set.add("java.util.Hashtable"); - set.add(JavaClassNames.JAVA_UTIL_HASH_SET); + set.add(CommonClassNames.JAVA_UTIL_HASH_SET); set.add("java.util.IdentityHashMap"); set.add("java.util.LinkedHashMap"); set.add("java.util.LinkedHashSet"); @@ -118,6 +111,6 @@ public JComponent createOptionsPanel() { final String title = JavaQuickFixBundle.message("collection.addall.can.be.replaced.with.constructor.fix.options.title"); final ListTable table = new ListTable(new ListWrappingTableModel(myCollectionClassesRequiringCapacity, title)); - return UiUtils.createAddRemoveTreeClassChooserPanel(table, title, JavaClassNames.JAVA_LANG_OBJECT); + return UiUtils.createAddRemoveTreeClassChooserPanel(table, title, CommonClassNames.JAVA_LANG_OBJECT); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ConstantStringInternInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ConstantStringInternInspection.java index 45cd304bd8..0a862beebb 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ConstantStringInternInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ConstantStringInternInspection.java @@ -22,7 +22,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; @@ -116,7 +115,7 @@ public void visitMethodCallExpression( return; } final String className = aClass.getQualifiedName(); - if (!JavaClassNames.JAVA_LANG_STRING.equals(className)) { + if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) { return; } registerMethodCallError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java index 7666286211..b3f80874b4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ComparatorNotSerializableInspection.java @@ -17,6 +17,7 @@ import com.intellij.java.impl.ig.fixes.MakeSerializableFix; import com.intellij.java.impl.ig.psiutils.SerializationUtils; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiAnonymousClass; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.util.InheritanceUtil; @@ -64,8 +65,7 @@ public void visitClass(PsiClass aClass) { if (aClass instanceof PsiAnonymousClass) { return; } - if (!InheritanceUtil.isInheritor(aClass, - JavaClassNames.JAVA_UTIL_COMPARATOR)) { + if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_UTIL_COMPARATOR)) { return; } if (SerializationUtils.isSerializable(aClass)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java index fcbc1ee138..2a3a42c44e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java @@ -22,7 +22,6 @@ import com.siyeh.ig.psiutils.MethodCallUtils; 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; @@ -112,17 +111,13 @@ public void visitMethodCallExpression( super.visitMethodCallExpression(expression); final Project project = expression.getProject(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - final PsiClass stringClass = - psiFacade.findClass(JavaClassNames.JAVA_LANG_STRING, - expression.getResolveScope()); + final PsiClass stringClass = psiFacade.findClass(CommonClassNames.JAVA_LANG_STRING, expression.getResolveScope()); if (stringClass == null) { return; } final PsiClassType stringType = psiFacade.getElementFactory().createType(stringClass); - if (!MethodCallUtils.isCallToMethod(expression, - JavaClassNames.JAVA_LANG_STRING, - stringType, "concat", stringType)) { + if (!MethodCallUtils.isCallToMethod(expression, CommonClassNames.JAVA_LANG_STRING, stringType, "concat", stringType)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/threading/CallToNativeMethodWhileLockedInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/threading/CallToNativeMethodWhileLockedInspection.java index c9a8aaef7f..b9cac469f0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/threading/CallToNativeMethodWhileLockedInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/threading/CallToNativeMethodWhileLockedInspection.java @@ -16,15 +16,11 @@ package com.intellij.java.impl.ig.threading; import com.intellij.java.impl.ig.psiutils.SynchronizationUtil; -import com.intellij.java.language.psi.PsiClass; -import com.intellij.java.language.psi.PsiMethod; -import com.intellij.java.language.psi.PsiMethodCallExpression; -import com.intellij.java.language.psi.PsiModifier; +import com.intellij.java.language.psi.*; import com.siyeh.ig.BaseInspection; 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; @ExtensionImpl @@ -66,7 +62,7 @@ public void visitMethodCallExpression( return; } final String className = containingClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(className)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(className)) { return; } if (!SynchronizationUtil.isInSynchronizedContext(expression)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java index c85d8e3ed9..ce2cc6732c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java @@ -15,12 +15,11 @@ */ package com.intellij.java.impl.ipp.chartostring; +import com.intellij.java.impl.ipp.base.PsiElementPredicate; import com.intellij.java.language.psi.*; -import consulo.util.lang.StringUtil; -import consulo.language.psi.*; import consulo.language.ast.IElementType; -import com.intellij.java.impl.ipp.base.PsiElementPredicate; -import consulo.java.language.module.util.JavaClassNames; +import consulo.language.psi.PsiElement; +import consulo.util.lang.StringUtil; import org.jetbrains.annotations.NonNls; class CharToStringPredicate implements PsiElementPredicate { @@ -57,7 +56,7 @@ private static boolean isInConcatenationContext(PsiElement element) { return false; } final String parentTypeText = parentType.getCanonicalText(); - return JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText); + return CommonClassNames.JAVA_LANG_STRING.equals(parentTypeText); } else if (parent instanceof PsiAssignmentExpression) { final PsiAssignmentExpression parentExpression = @@ -71,7 +70,7 @@ else if (parent instanceof PsiAssignmentExpression) { return false; } final String parentTypeText = parentType.getCanonicalText(); - return JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText); + return CommonClassNames.JAVA_LANG_STRING.equals(parentTypeText); } else if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); @@ -97,8 +96,8 @@ else if (parent instanceof PsiExpressionList) { return false; } final String className = type.getCanonicalText(); - if (JavaClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || - JavaClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { + if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(className) || + CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"append".equals(methodName) && @@ -108,7 +107,7 @@ else if (parent instanceof PsiExpressionList) { final PsiElement method = methodExpression.resolve(); return method != null; } - else if (JavaClassNames.JAVA_LANG_STRING.equals(className)) { + else if (CommonClassNames.JAVA_LANG_STRING.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"indexOf".equals(methodName) && diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java index c0556c6872..f6f3c6b30b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java @@ -17,13 +17,9 @@ import com.intellij.java.impl.ipp.base.Intention; import com.intellij.java.impl.ipp.base.PsiElementPredicate; -import com.intellij.java.language.psi.JavaTokenType; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiPolyadicExpression; -import com.intellij.java.language.psi.PsiType; +import com.intellij.java.language.psi.*; import com.siyeh.ig.psiutils.ExpressionUtils; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; @@ -55,7 +51,7 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe return; } final PsiType type = concatenationExpression.getType(); - if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return; } final StringBuilder text = buildConcatenationText(concatenationExpression, new StringBuilder()); diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java index 472abaa251..34b51113e7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java @@ -15,17 +15,12 @@ */ package com.intellij.java.impl.ipp.constant; -import com.intellij.java.language.psi.PsiClassObjectAccessExpression; -import consulo.java.language.module.util.JavaClassNames; -import consulo.language.psi.PsiElement; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiLiteralExpression; -import com.intellij.java.language.psi.PsiPolyadicExpression; -import com.intellij.java.language.psi.PsiType; +import com.intellij.java.impl.ipp.base.PsiElementPredicate; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.ConstantEvaluationOverflowException; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.psiutils.ExpressionUtils; -import com.intellij.java.impl.ipp.base.PsiElementPredicate; +import consulo.language.psi.PsiElement; class ConstantExpressionPredicate implements PsiElementPredicate { @@ -38,7 +33,7 @@ public boolean satisfiedBy(PsiElement element) { } final PsiPolyadicExpression expression = (PsiPolyadicExpression)element; final PsiType expressionType = expression.getType(); - if (expressionType == null || expressionType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (expressionType == null || expressionType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { // intention disabled for string concatenations because of performance issues on // relatively common large string expressions. return false; @@ -49,7 +44,7 @@ public boolean satisfiedBy(PsiElement element) { return false; } final PsiType type = operand.getType(); - if (type == null || type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return false; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java index 8a5a07d15e..337b579bd9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java @@ -15,18 +15,12 @@ */ package com.intellij.java.impl.ipp.constant; -import consulo.java.language.module.util.JavaClassNames; -import jakarta.annotation.Nullable; -import com.intellij.java.language.psi.JavaPsiFacade; -import consulo.language.psi.PsiElement; -import com.intellij.java.language.psi.PsiElementFactory; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiJavaToken; -import com.intellij.java.language.psi.PsiPolyadicExpression; -import com.intellij.java.language.psi.PsiType; +import com.intellij.java.impl.ipp.base.PsiElementPredicate; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.psiutils.ExpressionUtils; -import com.intellij.java.impl.ipp.base.PsiElementPredicate; +import consulo.language.psi.PsiElement; +import jakarta.annotation.Nullable; class ConstantSubexpressionPredicate implements PsiElementPredicate { @@ -52,7 +46,7 @@ public boolean satisfiedBy(PsiElement element) { } final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); - if (type == null || type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { + if (type == null || type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { // handled by JoinConcatenatedStringLiteralsIntention return false; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java index ca1a0ff732..5181b31ea9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java @@ -20,14 +20,12 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.NonNls; @ExtensionImpl @IntentionMetaData(ignoreId = "java.ConvertJUnit3TestCaseToJUnit4Intention", fileExtensions = "java", categories = {"Java", "JUnit"}) @@ -98,7 +96,7 @@ private static void transformSetUpOrTearDownMethod(PsiMethod method) { if (!modifierList.hasModifierProperty(PsiModifier.PUBLIC)) { modifierList.setModifierProperty(PsiModifier.PUBLIC, true); } - final PsiAnnotation overrideAnnotation = modifierList.findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); + final PsiAnnotation overrideAnnotation = modifierList.findAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE); if (overrideAnnotation != null) { overrideAnnotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/psiutils/ConcatenationUtils.java b/plugin/src/main/java/com/intellij/java/impl/ipp/psiutils/ConcatenationUtils.java index cd0c0b255d..f8a280e896 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/psiutils/ConcatenationUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/psiutils/ConcatenationUtils.java @@ -15,13 +15,9 @@ */ package com.intellij.java.impl.ipp.psiutils; -import com.intellij.java.language.psi.JavaTokenType; -import com.intellij.java.language.psi.PsiExpression; -import com.intellij.java.language.psi.PsiPolyadicExpression; -import com.intellij.java.language.psi.PsiType; -import consulo.language.psi.*; +import com.intellij.java.language.psi.*; import consulo.language.ast.IElementType; -import consulo.java.language.module.util.JavaClassNames; +import consulo.language.psi.PsiElement; public class ConcatenationUtils { @@ -49,11 +45,11 @@ public static boolean isConcatenation(PsiElement element) { } return false; } - return type.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return type.equalsToText(CommonClassNames.JAVA_LANG_STRING); } private static boolean hasStringType(PsiExpression expression) { final PsiType type = expression.getType(); - return type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return type != null && type.equalsToText(CommonClassNames.JAVA_LANG_STRING); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/ClassLiteralGetter.java b/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/ClassLiteralGetter.java index 3c8230fd5f..64cddfad70 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/ClassLiteralGetter.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/filters/getters/ClassLiteralGetter.java @@ -17,14 +17,10 @@ import com.intellij.java.impl.codeInsight.CodeInsightUtil; import com.intellij.java.impl.codeInsight.completion.JavaSmartCompletionParameters; -import com.intellij.java.language.psi.PsiClassType; -import com.intellij.java.language.psi.PsiType; -import com.intellij.java.language.psi.PsiTypeParameter; -import com.intellij.java.language.psi.PsiWildcardType; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PsiUtil; import consulo.application.util.matcher.PrefixMatcher; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.completion.AutoCompletionPolicy; import consulo.language.editor.completion.lookup.LookupElement; import consulo.language.psi.PsiElement; @@ -41,11 +37,11 @@ public class ClassLiteralGetter { public static void addCompletions(@Nonnull final JavaSmartCompletionParameters parameters, @Nonnull Consumer result, final PrefixMatcher matcher) { PsiType expectedType = parameters.getExpectedType(); - if (!InheritanceUtil.isInheritor(expectedType, JavaClassNames.JAVA_LANG_CLASS)) { + if (!InheritanceUtil.isInheritor(expectedType, CommonClassNames.JAVA_LANG_CLASS)) { return; } - PsiType classParameter = PsiUtil.substituteTypeParameter(expectedType, JavaClassNames.JAVA_LANG_CLASS, 0, false); + PsiType classParameter = PsiUtil.substituteTypeParameter(expectedType, CommonClassNames.JAVA_LANG_CLASS, 0, false); boolean addInheritors = false; PsiElement position = parameters.getPosition(); @@ -70,7 +66,7 @@ private static void addInheritorClassLiterals(final PsiFile context, final PsiType classParameter, final Consumer result, PrefixMatcher matcher) { final String canonicalText = classParameter.getCanonicalText(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(canonicalText) && StringUtil.isEmpty(matcher.getPrefix())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(canonicalText) && StringUtil.isEmpty(matcher.getPrefix())) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java index 24adc8ef76..aa0beb6b21 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java @@ -19,17 +19,15 @@ import com.intellij.java.language.impl.psi.impl.source.tree.JavaElementType; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.editor.refactoring.localize.RefactoringLocalize; -import consulo.util.lang.StringUtil; +import consulo.language.editor.refactoring.rename.AutomaticRenamer; +import consulo.language.impl.ast.TreeUtil; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiNamedElement; -import consulo.language.impl.ast.TreeUtil; import consulo.language.psi.util.PsiTreeUtil; -import consulo.language.editor.refactoring.RefactoringBundle; -import consulo.language.editor.refactoring.rename.AutomaticRenamer; import consulo.usage.UsageInfo; +import consulo.util.lang.StringUtil; import java.util.*; @@ -96,7 +94,7 @@ private void checkRenameVariable(final PsiElement element, final PsiVariable var } } else { PsiType collectionType = JavaPsiFacade.getInstance(variable.getProject()).getElementFactory() - .createTypeByFQClassName(JavaClassNames.JAVA_UTIL_COLLECTION, variable.getResolveScope()); + .createTypeByFQClassName(CommonClassNames.JAVA_UTIL_COLLECTION, variable.getResolveScope()); if (!collectionType.isAssignableFrom(variable.getType())) return; final PsiTypeElement[] typeParameterElements = ref.getParameterList().getTypeParameterElements(); for (PsiTypeElement typeParameterElement : typeParameterElements) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java index 9a010f77ff..fe13f9719f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java @@ -359,9 +359,9 @@ int[] classify2(final PsiType x, final PsiType y) { if (kindX + kindY == 5) { try { PsiElementFactory f = JavaPsiFacade.getInstance(myProject).getElementFactory(); - PsiType cloneable = f.createTypeFromText(JavaClassNames.JAVA_LANG_CLONEABLE, null); - PsiType object = f.createTypeFromText(JavaClassNames.JAVA_LANG_OBJECT, null); - PsiType serializable = f.createTypeFromText(JavaClassNames.JAVA_IO_SERIALIZABLE, null); + PsiType cloneable = f.createTypeFromText(CommonClassNames.JAVA_LANG_CLONEABLE, null); + PsiType object = f.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null); + PsiType serializable = f.createTypeFromText(CommonClassNames.JAVA_IO_SERIALIZABLE, null); PsiType type; int flag; @@ -684,7 +684,7 @@ public Binding balance(final PsiType x, final PsiType y, final Balancer balancer } else { /* ? super T1, T2 */ - if (xType != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(xType.getCanonicalText())) { + if (xType != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(xType.getCanonicalText())) { return null; } return create(); @@ -1065,9 +1065,9 @@ void intersect(final PsiType x, final PsiType y, final LinkedList 1) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(ancestor.getQualifiedName()) && ancestors.length > 1) { continue; }