From 4eaee762bcdd337f85e39c11b2be3b92d27441a5 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 9 May 2025 20:00:53 +0300 Subject: [PATCH] Replacing JavaClassNames with CommonClassNames (part 4). --- ...escriptionByAnotherPsiElementProvider.java | 22 +++++----- .../intellij/jam/JamTypeAttributeElement.java | 8 +--- .../jam/model/util/JamCommonUtil.java | 9 ++-- .../impl/analysis/GenericsHighlightUtil.java | 13 +++--- .../impl/analysis/HighlightClassUtil.java | 5 +-- .../impl/analysis/HighlightMethodUtil.java | 3 +- .../daemon/impl/analysis/HighlightUtil.java | 9 ++-- .../impl/analysis/HighlightVisitorImpl.java | 3 +- .../guess/impl/GuessManagerImpl.java | 3 +- .../dataFlow/HardcodedContracts.java | 5 +-- .../java15api/Java15APIUsageInspection.java | 3 +- .../java/language/psi/GenericsUtil.java | 21 +++++---- .../psi/util/IsConstantExpressionVisitor.java | 5 +-- .../impl/psi/impl/InheritanceImplUtil.java | 13 +++--- .../InferenceIncorporationPhase.java | 29 ++++-------- .../graphInference/InferenceSession.java | 5 +-- .../properties/impl/i18n/I18nInspection.java | 7 ++- .../impl/quickfix/GuessTypeParameters.java | 3 +- .../impl/quickfix/ImportClassFixBase.java | 3 +- .../IterateOverIterableIntention.java | 5 +-- .../GenerateConstructorHandler.java | 4 +- .../generation/GenerateDelegateHandler.java | 6 +-- .../generation/GenerateEqualsHelper.java | 7 ++- .../macro/IterableComponentTypeMacro.java | 3 +- .../template/macro/IterableVariableMacro.java | 5 +-- .../templates/FormatPostfixTemplate.java | 4 +- .../impl/generate/GenerateToStringWorker.java | 44 +++++++++---------- .../java/impl/ig/bugs/FormatDecode.java | 23 +++++----- .../bugs/ImplicitArrayToStringInspection.java | 12 +++-- ...torHasNextCallsIteratorNextInspection.java | 5 +-- ...ThrowNoSuchElementExceptionInspection.java | 16 +++---- .../ig/migration/IfCanBeSwitchInspection.java | 11 +++-- ...ndexOfReplaceableByContainsInspection.java | 8 +--- .../ImplicitNumericConversionInspection.java | 3 +- ...isionInFloatingPointContextInspection.java | 22 +++++----- .../java/impl/ig/psiutils/FormatUtils.java | 11 +++-- .../impl/ig/psiutils/InheritanceUtil.java | 14 +++--- .../java/impl/ig/psiutils/IteratorUtils.java | 20 +++------ .../ig/resources/IOResourceInspection.java | 3 +- .../style/ImplicitCallToSuperInspection.java | 4 +- .../ipp/asserttoif/IfStatementPredicate.java | 7 ++- .../forloop/IndexedForEachLoopPredicate.java | 19 ++++---- .../forloop/IterableForEachLoopPredicate.java | 11 +++-- .../JavaChangeSignatureDialog.java | 3 +- .../JavaChangeSignatureUsageProcessor.java | 3 +- .../InheritanceToDelegationHandler.java | 3 +- .../InheritanceToDelegationProcessor.java | 13 +++--- .../InheritanceToDelegationUtil.java | 4 +- .../inline/InlineToAnonymousClassHandler.java | 3 +- .../IntroduceConstantDialog.java | 3 +- 50 files changed, 191 insertions(+), 277 deletions(-) diff --git a/extract/gson-impl/src/main/java/consulo/java/impl/gson/GsonDescriptionByAnotherPsiElementProvider.java b/extract/gson-impl/src/main/java/consulo/java/impl/gson/GsonDescriptionByAnotherPsiElementProvider.java index 075ed51051..133b1328f1 100644 --- a/extract/gson-impl/src/main/java/consulo/java/impl/gson/GsonDescriptionByAnotherPsiElementProvider.java +++ b/extract/gson-impl/src/main/java/consulo/java/impl/gson/GsonDescriptionByAnotherPsiElementProvider.java @@ -27,7 +27,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.application.util.RecursionManager; import consulo.java.language.module.extension.JavaModuleExtension; -import consulo.java.language.module.util.JavaClassNames; import consulo.json.validation.NativeArray; import consulo.json.validation.descriptionByAnotherPsiElement.DescriptionByAnotherPsiElementProvider; import consulo.json.validation.descriptor.JsonObjectDescriptor; @@ -37,7 +36,6 @@ import consulo.project.Project; import consulo.ui.annotation.RequiredUIAccess; import consulo.util.collection.ContainerUtil; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -137,21 +135,21 @@ private static PropertyType toType(@Nonnull Project project, @Nullable PsiField PsiClass psiClass = classResolveResult.getElement(); if (psiClass != null) { String qualifiedName = psiClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { + if (CommonClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { return new PropertyType(String.class); - } else if (JavaClassNames.JAVA_LANG_BOOLEAN.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicBoolean".equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_BOOLEAN.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicBoolean".equals(qualifiedName)) { return new PropertyType(Boolean.class); - } else if (JavaClassNames.JAVA_LANG_BYTE.equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_BYTE.equals(qualifiedName)) { return new PropertyType(Number.class); - } else if (JavaClassNames.JAVA_LANG_SHORT.equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_SHORT.equals(qualifiedName)) { return new PropertyType(Number.class); - } else if (JavaClassNames.JAVA_LANG_INTEGER.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicInteger".equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_INTEGER.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicInteger".equals(qualifiedName)) { return new PropertyType(Number.class); - } else if (JavaClassNames.JAVA_LANG_LONG.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicLong".equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_LONG.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicLong".equals(qualifiedName)) { return new PropertyType(Number.class); - } else if (JavaClassNames.JAVA_LANG_FLOAT.equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_FLOAT.equals(qualifiedName)) { return new PropertyType(Number.class); - } else if (JavaClassNames.JAVA_LANG_DOUBLE.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicDouble".equals(qualifiedName)) { + } else if (CommonClassNames.JAVA_LANG_DOUBLE.equals(qualifiedName) || "java.util.concurrent.atomic.AtomicDouble".equals(qualifiedName)) { return new PropertyType(Number.class); } else if ("java.util.concurrent.atomic.AtomicIntegerArray".equals(qualifiedName)) { return new PropertyType(new NativeArray(Number.class)); @@ -161,7 +159,7 @@ private static PropertyType toType(@Nonnull Project project, @Nullable PsiField return new PropertyType(new NativeArray(Number.class)); } - PsiClass collectionClass = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_UTIL_COLLECTION, GlobalSearchScope.allScope(project)); + PsiClass collectionClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_UTIL_COLLECTION, GlobalSearchScope.allScope(project)); if (collectionClass != null) { if (InheritanceUtil.isInheritorOrSelf(psiClass, collectionClass, true)) { PsiSubstitutor superClassSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(collectionClass, psiClass, classResolveResult.getSubstitutor()); @@ -177,7 +175,7 @@ private static PropertyType toType(@Nonnull Project project, @Nullable PsiField } } - PsiClass mapClass = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_UTIL_MAP, GlobalSearchScope.allScope(project)); + PsiClass mapClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_UTIL_MAP, GlobalSearchScope.allScope(project)); if (mapClass != null) { if (InheritanceUtil.isInheritorOrSelf(psiClass, mapClass, true)) { PsiSubstitutor superClassSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(mapClass, psiClass, classResolveResult.getSubstitutor()); diff --git a/jam-api/src/main/java/com/intellij/jam/JamTypeAttributeElement.java b/jam-api/src/main/java/com/intellij/jam/JamTypeAttributeElement.java index 4df309301d..8ca1f13a2a 100644 --- a/jam-api/src/main/java/com/intellij/jam/JamTypeAttributeElement.java +++ b/jam-api/src/main/java/com/intellij/jam/JamTypeAttributeElement.java @@ -15,11 +15,7 @@ */ package com.intellij.jam; -import com.intellij.java.language.psi.PsiAnnotation; -import com.intellij.java.language.psi.PsiAnnotationMemberValue; -import com.intellij.java.language.psi.PsiClassObjectAccessExpression; -import com.intellij.java.language.psi.PsiType; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.*; import consulo.language.psi.PsiElementRef; import jakarta.annotation.Nonnull; @@ -47,7 +43,7 @@ public PsiType getValue() { if (psiAnnotationMemberValue instanceof PsiClassObjectAccessExpression) { psiType = ((PsiClassObjectAccessExpression) psiAnnotationMemberValue).getOperand().getType(); } - if (psiType != null && JavaClassNames.JAVA_LANG_OBJECT.equals(psiType.getCanonicalText())) { + if (psiType != null && CommonClassNames.JAVA_LANG_OBJECT.equals(psiType.getCanonicalText())) { return null; } return psiType; diff --git a/jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java b/jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java index 786b56c803..cf869f8ae1 100644 --- a/jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java +++ b/jam-api/src/main/java/com/intellij/jam/model/util/JamCommonUtil.java @@ -38,7 +38,6 @@ import consulo.application.util.function.Processor; import consulo.dataContext.DataContext; import consulo.java.jam.util.JamCommonService; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.util.PsiUtilBase; import consulo.language.pom.PomTarget; import consulo.language.pom.PomTargetPsiElement; @@ -69,10 +68,10 @@ import consulo.xml.psi.xml.XmlFile; import consulo.xml.psi.xml.XmlTag; import consulo.xml.util.xml.*; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; + import java.lang.annotation.ElementType; import java.lang.annotation.Target; import java.util.*; @@ -136,7 +135,7 @@ public static boolean processSuperClassList( @Nonnull final Collection supers, final Processor processor ) { - for (PsiClass curClass = firstClass; curClass != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(curClass.getQualifiedName()) && !supers.contains(curClass); curClass = curClass.getSuperClass()) { + for (PsiClass curClass = firstClass; curClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(curClass.getQualifiedName()) && !supers.contains(curClass); curClass = curClass.getSuperClass()) { ProgressManager.checkCanceled(); if (!processor.process(curClass)) { return false; @@ -619,7 +618,7 @@ public static PsiClass getPsiClass(@Nullable PsiAnnotationMemberValue psiAnnotat .findClass(className, psiAnnotationMemberValue.getResolveScope()); } } - if (psiClass != null && JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) { + if (psiClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) { return null; } return psiClass; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java index 445a682d23..f86bac60ac 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java @@ -32,7 +32,6 @@ import consulo.application.dumb.IndexNotReadyException; import consulo.document.util.TextRange; import consulo.java.language.impl.localize.JavaErrorLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.content.FileIndexFacade; import consulo.language.editor.intention.IntentionAction; import consulo.language.editor.intention.QuickFixActionRegistrar; @@ -318,7 +317,7 @@ private static HighlightInfo.Builder checkTypeParameterWithinItsBound( PsiClassType[] bounds = classParameter.getSuperTypes(); for (PsiClassType type1 : bounds) { PsiType bound = substitutor.substitute(type1); - if (!bound.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) + if (!bound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && GenericsUtil.checkNotInBounds(type, bound, referenceParameterList)) { PsiClass boundClass = bound instanceof PsiClassType boundClassType ? boundClassType.resolve() : null; @@ -507,7 +506,7 @@ public static HighlightInfo checkDefaultMethodOverrideEquivalentToObjectNonPriva for (HierarchicalMethodSignature methodSignature : sig.getSuperSignatures()) { PsiMethod objectMethod = methodSignature.getMethod(); PsiClass containingClass = objectMethod.getContainingClass(); - if (containingClass != null && JavaClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName()) + if (containingClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName()) && objectMethod.isPublic()) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(methodIdentifier) @@ -1247,7 +1246,7 @@ public static HighlightInfo.Builder checkOverrideAnnotation( PsiMethod psiMethod = superMethod.getMethod(); PsiClass containingClass = psiMethod.getContainingClass(); if (containingClass != null - && JavaClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName()) + && CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName()) && psiMethod.isProtected()) { superMethod = null; } @@ -1279,7 +1278,7 @@ public static HighlightInfo.Builder checkOverrideAnnotation( @RequiredReadAction public static HighlightInfo.Builder checkSafeVarargsAnnotation(PsiMethod method, LanguageLevel languageLevel) { PsiModifierList list = method.getModifierList(); - PsiAnnotation safeVarargsAnnotation = list.findAnnotation(JavaClassNames.JAVA_LANG_SAFE_VARARGS); + PsiAnnotation safeVarargsAnnotation = list.findAnnotation(CommonClassNames.JAVA_LANG_SAFE_VARARGS); if (safeVarargsAnnotation == null) { return null; } @@ -1505,7 +1504,7 @@ else if (parent instanceof PsiCallExpression call) { @Nullable @RequiredReadAction public static HighlightInfo.Builder checkCannotInheritFromEnum(PsiClass superClass, PsiElement elementToHighlight) { - if (JavaClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(elementToHighlight) .descriptionAndTooltip(JavaErrorLocalize.classesExtendsEnum()); @@ -1532,7 +1531,7 @@ public static HighlightInfo.Builder checkGenericCannotExtendException(PsiReferen } if (throwableClass == null) { throwableClass = JavaPsiFacade.getInstance(aClass.getProject()) - .findClass(JavaClassNames.JAVA_LANG_THROWABLE, aClass.getResolveScope()); + .findClass(CommonClassNames.JAVA_LANG_THROWABLE, aClass.getResolveScope()); } if (InheritanceUtil.isInheritorOrSelf(psiClass, throwableClass, true)) { PsiClassType classType = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory() diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightClassUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightClassUtil.java index bcfe67fb65..763faa384d 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightClassUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightClassUtil.java @@ -35,7 +35,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.document.util.TextRange; import consulo.java.language.impl.localize.JavaErrorLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.rawHighlight.HighlightInfo; import consulo.language.editor.rawHighlight.HighlightInfoType; import consulo.language.psi.*; @@ -305,7 +304,7 @@ public static HighlightInfo.Builder checkPublicClassInRightFile(PsiClass aClass) public static HighlightInfo.Builder checkClassAndPackageConflict(@Nonnull PsiClass aClass) { String name = aClass.getQualifiedName(); - if (JavaClassNames.DEFAULT_PACKAGE.equals(name)) { + if (CommonClassNames.DEFAULT_PACKAGE.equals(name)) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(HighlightNamesUtil.getClassDeclarationTextRange(aClass)) .descriptionAndTooltip(JavaErrorLocalize.classClashesWithPackage(name)); @@ -667,7 +666,7 @@ public static PsiClass getCircularClass(PsiClass aClass, Collection us PsiClass[] superTypes = aClass.getSupers(); for (PsiElement superType : superTypes) { while (superType instanceof PsiClass) { - if (!JavaClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)superType).getQualifiedName())) { + if (!CommonClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)superType).getQualifiedName())) { PsiClass circularClass = getCircularClass((PsiClass)superType, usedClasses); if (circularClass != null) { return circularClass; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index 82520ec68d..5916fdd548 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -36,7 +36,6 @@ import consulo.document.util.TextRange; import consulo.document.util.TextRangeUtil; import consulo.java.language.impl.localize.JavaErrorLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalQuickFixOnPsiElementAsIntentionAdapter; import consulo.language.editor.intention.IntentionAction; import consulo.language.editor.intention.QuickFixActionRegistrar; @@ -242,7 +241,7 @@ private static HighlightInfo.Builder checkSuperMethodSignature( } PsiClass superContainingClass = superMethod.getContainingClass(); if (superContainingClass != null - && JavaClassNames.JAVA_LANG_OBJECT.equals(superContainingClass.getQualifiedName()) + && CommonClassNames.JAVA_LANG_OBJECT.equals(superContainingClass.getQualifiedName()) && !superMethod.isPublic()) { PsiClass containingClass = method.getContainingClass(); if (containingClass != null && containingClass.isInterface() && !superContainingClass.isInterface()) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java index 2b6fd679dd..7173dbf7b3 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -45,7 +45,6 @@ import consulo.annotation.access.RequiredReadAction; import consulo.document.util.TextRange; import consulo.java.language.impl.localize.JavaErrorLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.CodeInsightUtilCore; import consulo.language.editor.highlight.HighlightUsagesDescriptionLocation; @@ -832,7 +831,7 @@ private static void registerCollectionToArrayFixAction( PsiType arrayComponentType = arrayType.getComponentType(); if (!(arrayComponentType instanceof PsiPrimitiveType) && !(PsiUtil.resolveClassInType(arrayComponentType) instanceof PsiTypeParameter) - && InheritanceUtil.isInheritor(fromType, JavaClassNames.JAVA_UTIL_COLLECTION)) { + && InheritanceUtil.isInheritor(fromType, CommonClassNames.JAVA_UTIL_COLLECTION)) { PsiType collectionItemType = JavaGenericsUtil.getCollectionItemType(fromType, expression.getResolveScope()); if (collectionItemType != null && arrayComponentType.isAssignableFrom(collectionItemType)) { hlBuilder.registerFix(QuickFixFactory.getInstance().createCollectionToArrayFix(expression, arrayType)); @@ -1878,7 +1877,7 @@ private static SelectorKind getSwitchSelectorKind(@Nonnull PsiType type) { if (psiClass.isEnum()) { return SelectorKind.ENUM; } - if (Comparing.strEqual(psiClass.getQualifiedName(), JavaClassNames.JAVA_LANG_STRING)) { + if (Comparing.strEqual(psiClass.getQualifiedName(), CommonClassNames.JAVA_LANG_STRING)) { return SelectorKind.STRING; } } @@ -2256,7 +2255,7 @@ public static HighlightInfo.Builder checkTryResourceIsAutoCloseable(@Nonnull Psi } PsiElementFactory factory = JavaPsiFacade.getInstance(resource.getProject()).getElementFactory(); - PsiClassType autoCloseable = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, resource.getResolveScope()); + PsiClassType autoCloseable = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, resource.getResolveScope()); if (TypeConversionUtil.isAssignable(autoCloseable, type)) { return null; } @@ -3394,7 +3393,7 @@ public static HighlightInfo.Builder checkMustBeThrowable( return null; } PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory(); - PsiClassType throwable = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_THROWABLE, context.getResolveScope()); + PsiClassType throwable = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_THROWABLE, context.getResolveScope()); if (!TypeConversionUtil.isAssignable(throwable, type)) { HighlightInfo.Builder hlBuilder = createIncompatibleTypeHighlightInfo(throwable, type, context.getTextRange(), 0); if (addCastIntention && TypeConversionUtil.areTypesConvertible(type, throwable) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 2c45aedec6..0d5d719115 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -41,7 +41,6 @@ import consulo.document.Document; import consulo.document.util.TextRange; import consulo.java.language.impl.localize.JavaErrorLocalize; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.DaemonCodeAnalyzer; import consulo.language.editor.Pass; import consulo.language.editor.rawHighlight.HighlightInfo; @@ -282,7 +281,7 @@ public void visitAnnotation(@Nonnull PsiAnnotation annotation) { if (!myHolder.hasErrorResults()) { add(AnnotationsHighlightUtil.checkRepeatableAnnotation(annotation)); } - if (JavaClassNames.JAVA_LANG_OVERRIDE.equals(annotation.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OVERRIDE.equals(annotation.getQualifiedName())) { PsiAnnotationOwner owner = annotation.getOwner(); PsiElement parent = owner instanceof PsiModifierList modifierList ? modifierList.getParent() : null; if (parent instanceof PsiMethod method) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/guess/impl/GuessManagerImpl.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/guess/impl/GuessManagerImpl.java index 2d99f7f82a..7aafd1d80b 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/guess/impl/GuessManagerImpl.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/guess/impl/GuessManagerImpl.java @@ -18,7 +18,6 @@ import consulo.application.util.CachedValueProvider; import consulo.content.scope.SearchScope; import consulo.document.util.TextRange; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.*; import consulo.language.psi.resolve.PsiElementProcessor; import consulo.language.psi.resolve.PsiElementProcessorAdapter; @@ -462,7 +461,7 @@ private static List getPotentiallyAffectingElements(PsiExpression pl private static class GuessTypeVisitor extends JavaElementVisitor { private static final CallMatcher OBJECT_GET_CLASS = - CallMatcher.exactInstanceCall(JavaClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0); + CallMatcher.exactInstanceCall(CommonClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0); @Nonnull private final PsiExpression myPlace; PsiType mySpecificType; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java index 12f5301f5a..87a392b92c 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java @@ -10,14 +10,13 @@ import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.psiutils.MethodUtils; import com.siyeh.ig.psiutils.TypeUtils; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.inject.InjectedLanguageManager; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.psi.SyntaxTraverser; import jakarta.annotation.Nonnull; - import jakarta.annotation.Nullable; + import java.util.*; import static com.intellij.java.analysis.impl.codeInspection.dataFlow.ContractReturnValue.*; @@ -528,7 +527,7 @@ public static MutationSignature getHardcodedMutation(PsiMethod method) { } String name = method.getName(); - if (JavaClassNames.JAVA_UTIL_OBJECTS.equals(className) && "requireNonNull".equals(name)) { + if (CommonClassNames.JAVA_UTIL_OBJECTS.equals(className) && "requireNonNull".equals(name)) { PsiParameter[] parameters = method.getParameterList().getParameters(); if (parameters.length == 2 && parameters[1].getType().getCanonicalText().contains("Supplier")) { return MutationSignature.unknown(); diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/java15api/Java15APIUsageInspection.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/java15api/Java15APIUsageInspection.java index cb8d7a1978..9116c73b4e 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/java15api/Java15APIUsageInspection.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/java15api/Java15APIUsageInspection.java @@ -14,7 +14,6 @@ import com.intellij.java.language.psi.util.PsiUtil; import consulo.annotation.access.RequiredReadAction; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.*; import consulo.language.editor.inspection.localize.InspectionLocalize; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; @@ -421,7 +420,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { public void visitMethod(@Nonnull PsiMethod method) { super.visitMethod(method); PsiAnnotation annotation = !method.isConstructor() - ? AnnotationUtil.findAnnotation(method, JavaClassNames.JAVA_LANG_OVERRIDE) : null; + ? AnnotationUtil.findAnnotation(method, CommonClassNames.JAVA_LANG_OVERRIDE) : null; if (annotation != null) { Module module = annotation.getModule(); LanguageLevel sinceLanguageLevel = null; diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/GenericsUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/GenericsUtil.java index 27fa1f9f07..108d4152a1 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/GenericsUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/GenericsUtil.java @@ -19,20 +19,19 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; import com.intellij.java.language.psi.util.TypesDistinctProver; -import consulo.util.lang.Comparing; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.util.PsiTreeUtil; -import consulo.util.collection.ContainerUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.logging.Logger; +import consulo.util.collection.ContainerUtil; +import consulo.util.lang.Comparing; import consulo.util.lang.Couple; import consulo.util.lang.Pair; -import org.jetbrains.annotations.Contract; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.Contract; + import java.util.*; /** @@ -88,11 +87,11 @@ private static PsiType getLeastUpperBound(PsiType type1, PsiType type2, Set checkedClasses) { @@ -72,7 +71,7 @@ private static boolean isInheritor(@Nonnull PsiManager manager, @Nonnull PsiClas JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject()); if (hasObjectQualifiedName(baseClass)) { - PsiClass objectClass = facade.findClass(JavaClassNames.JAVA_LANG_OBJECT, candidateClass.getResolveScope()); + PsiClass objectClass = facade.findClass(CommonClassNames.JAVA_LANG_OBJECT, candidateClass.getResolveScope()); if (manager.areElementsEquivalent(baseClass, objectClass)) { if (manager.areElementsEquivalent(candidateClass, objectClass)) { return false; @@ -91,10 +90,10 @@ private static boolean isInheritor(@Nonnull PsiManager manager, @Nonnull PsiClas return false; } - if (JavaClassNames.JAVA_LANG_ENUM.equals(baseQName) && candidateClass.isEnum()) { + if (CommonClassNames.JAVA_LANG_ENUM.equals(baseQName) && candidateClass.isEnum()) { return facade.findClass(baseQName, candidateClass.getResolveScope()) != null; } - if (JavaClassNames.JAVA_LANG_ANNOTATION_ANNOTATION.equals(baseQName) && candidateClass.isAnnotationType()) { + if (CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION.equals(baseQName) && candidateClass.isAnnotationType()) { return facade.findClass(baseQName, candidateClass.getResolveScope()) != null; } diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java index 484e96475c..c58d134a2b 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java @@ -15,33 +15,20 @@ */ package com.intellij.java.language.impl.psi.impl.source.resolve.graphInference; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import consulo.util.lang.Pair; -import consulo.java.language.module.util.JavaClassNames; -import com.intellij.java.language.psi.GenericsUtil; -import com.intellij.java.language.psi.PsiClass; -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.impl.psi.impl.source.resolve.graphInference.constraints.ConstraintFormula; import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.constraints.StrictSubtypingConstraint; import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.constraints.TypeCompatibilityConstraint; import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.constraints.TypeEqualityConstraint; +import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.application.util.function.Processor; -import consulo.util.lang.SystemProperties; -import consulo.util.collection.ContainerUtil; import consulo.logging.Logger; +import consulo.util.collection.ContainerUtil; +import consulo.util.lang.Pair; +import consulo.util.lang.SystemProperties; + +import java.util.*; /** * User: anna @@ -237,11 +224,11 @@ else if(((PsiWildcardType) aType).isExtends()) { if(mySession.getInferenceVariable(upperBound) == null) { - if(paramBounds.length == 1 && paramBounds[0].equalsToText(JavaClassNames.JAVA_LANG_OBJECT) || paramBounds.length == 0) + if(paramBounds.length == 1 && paramBounds[0].equalsToText(CommonClassNames.JAVA_LANG_OBJECT) || paramBounds.length == 0) { addConstraint(new StrictSubtypingConstraint(upperBound, extendsBound)); } - else if(extendsBound.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) && glb != null) + else if(extendsBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && glb != null) { addConstraint(new StrictSubtypingConstraint(upperBound, mySession.substituteWithInferenceVariables(glb))); } diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceSession.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceSession.java index b2bb54e32f..2b1282581e 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceSession.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/InferenceSession.java @@ -24,7 +24,6 @@ import com.intellij.java.language.psi.util.*; import consulo.application.util.CachedValueProvider; import consulo.application.util.function.Processor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; import consulo.language.psi.PsiModificationTracker; @@ -1203,10 +1202,10 @@ private boolean reduceConstraints() { private boolean isThrowable(List upperBounds) { boolean commonThrowable = false; for (PsiType upperBound : upperBounds) { - if (upperBound.equalsToText(JavaClassNames.JAVA_LANG_OBJECT) || !isProperType(upperBound)) { + if (upperBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) || !isProperType(upperBound)) { continue; } - if (upperBound.equalsToText(JavaClassNames.JAVA_LANG_EXCEPTION) || upperBound.equalsToText(JavaClassNames.JAVA_LANG_THROWABLE)) { + if (upperBound.equalsToText(CommonClassNames.JAVA_LANG_EXCEPTION) || upperBound.equalsToText(CommonClassNames.JAVA_LANG_THROWABLE)) { commonThrowable = true; } else { diff --git a/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nInspection.java b/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nInspection.java index 851695b286..6963a45bcd 100644 --- a/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nInspection.java +++ b/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nInspection.java @@ -37,7 +37,6 @@ import consulo.annotation.component.ExtensionImpl; import consulo.document.Document; import consulo.java.analysis.impl.util.JavaI18nUtil; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; @@ -313,7 +312,7 @@ protected String findItemToAdd() { createInheritanceClassChooser( CodeInsightLocalize.inspectionI18nOptionIgnoreForSpecifiedExceptionConstructorArguments().get(), scope, - JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, scope), + JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_THROWABLE, scope), true, true, null @@ -844,7 +843,7 @@ private static boolean isToString(final PsiLiteralExpression expression) { return TO_STRING.equals(method.getName()) && method.getParameterList().getParametersCount() == 0 && returnType != null - && JavaClassNames.JAVA_LANG_STRING.equals(returnType.getCanonicalText()); + && CommonClassNames.JAVA_LANG_STRING.equals(returnType.getCanonicalText()); } private static boolean isArgOfJUnitAssertion(PsiExpression expression) { @@ -913,7 +912,7 @@ private static boolean isArgOfExceptionConstructor(PsiExpression expression) { } final Project project = expression.getProject(); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); - final PsiClass throwable = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, scope); + final PsiClass throwable = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_THROWABLE, scope); return throwable != null && aClass.isInheritor(throwable, true); } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java index 687f47bb16..f26fd9e284 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java @@ -20,7 +20,6 @@ import com.intellij.java.impl.codeInsight.intention.impl.TypeExpression; import com.intellij.java.language.psi.*; import consulo.annotation.access.RequiredWriteAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.template.TemplateBuilder; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; @@ -193,7 +192,7 @@ private int substituteToTypeParameters( if (!types.isEmpty()) { Project project = typeElement.getProject(); PsiType substituted = rawingSubstitutor.substitute(type); - if (!JavaClassNames.JAVA_LANG_OBJECT.equals(substituted.getCanonicalText()) && (toplevel || substituted.equals(type))) { + if (!CommonClassNames.JAVA_LANG_OBJECT.equals(substituted.getCanonicalText()) && (toplevel || substituted.equals(type))) { types.add(substituted); } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java index 0831205a57..6072a7bb0f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java @@ -28,7 +28,6 @@ import consulo.codeEditor.Editor; import consulo.document.util.TextRange; import consulo.java.analysis.impl.JavaQuickFixBundle; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.AutoImportHelper; import consulo.language.editor.CodeInsightSettings; import consulo.language.editor.DaemonCodeAnalyzerSettings; @@ -288,7 +287,7 @@ protected static List filterBySuperMethods(PsiParameter parameter, Lis if (parent instanceof PsiParameterList) { PsiElement granny = parent.getParent(); if (granny instanceof PsiMethod method) { - if (method.getModifierList().findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE) != null) { + if (method.getModifierList().findAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE) != null) { PsiClass aClass = method.getContainingClass(); final Set probableTypes = new HashSet<>(); InheritanceUtil.processSupers(aClass, false, psiClass -> diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/IterateOverIterableIntention.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/IterateOverIterableIntention.java index 30097be476..519a0788ea 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/IterateOverIterableIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/IterateOverIterableIntention.java @@ -22,7 +22,6 @@ import consulo.codeEditor.SelectionModel; import consulo.document.util.TextRange; import consulo.ide.impl.idea.codeInsight.template.impl.InvokeTemplateAction; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.IntentionAction; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.editor.template.Template; @@ -106,7 +105,7 @@ private static PsiExpression getIterableExpression(Editor editor, PsiFile file) PsiElement parent = PsiTreeUtil.findCommonParent(elementAtStart, elementAtEnd); if (parent instanceof PsiExpression) { final PsiType type = ((PsiExpression)parent).getType(); - return type instanceof PsiArrayType || InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_ITERABLE) + return type instanceof PsiArrayType || InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_ITERABLE) ? (PsiExpression)parent : null; } @@ -125,7 +124,7 @@ private static PsiExpression getIterableExpression(Editor editor, PsiFile file) if (parent instanceof PsiMethodCallExpression) continue; if (!(parent instanceof PsiExpressionStatement)) return null; final PsiType type = ((PsiExpression)element).getType(); - if (type instanceof PsiArrayType || InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_ITERABLE)) return (PsiExpression)element; + if (type instanceof PsiArrayType || InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_ITERABLE)) return (PsiExpression)element; } return null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateConstructorHandler.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateConstructorHandler.java index 8d66720efa..b94a56f892 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateConstructorHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateConstructorHandler.java @@ -27,9 +27,7 @@ import consulo.annotation.access.RequiredReadAction; import consulo.component.extension.ExtensionPoint; import consulo.ide.impl.idea.ide.util.MemberChooser; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; -import consulo.language.editor.CodeInsightBundle; import consulo.language.editor.ImplicitUsageProvider; import consulo.language.editor.generation.ClassMember; import consulo.language.editor.localize.CodeInsightLocalize; @@ -265,7 +263,7 @@ public static PsiMethod generateConstructorPrototype( if (baseConstructor != null) { PsiClass superClass = aClass.getSuperClass(); LOG.assertTrue(superClass != null); - if (!JavaClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { + if (!CommonClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { isNotEnum = true; if (baseConstructor instanceof PsiCompiledElement) { // to get some parameter names PsiClass dummyClass = JVMElementFactories.requireFactory(baseConstructor.getLanguage(), baseConstructor.getProject()) diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateDelegateHandler.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateDelegateHandler.java index 5e3a5e9fc6..9ed1eeae36 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateDelegateHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateDelegateHandler.java @@ -28,13 +28,11 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.annotation.access.RequiredReadAction; import consulo.annotation.component.ExtensionImpl; -import consulo.application.ApplicationManager; import consulo.codeEditor.Editor; import consulo.codeEditor.ScrollType; import consulo.document.FileDocumentManager; import consulo.ide.impl.idea.codeInsight.CodeInsightUtilBase; import consulo.ide.impl.idea.ide.util.MemberChooser; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.Language; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.generation.ClassMember; @@ -284,7 +282,7 @@ private PsiMethodMember[] chooseMethods(PsiElementClassMember targetMember, PsiF JavaPsiFacade facade = JavaPsiFacade.getInstance(target.getProject()); for (PsiMethod method : allMethods) { final PsiClass superClass = method.getContainingClass(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) { continue; } if (method.isConstructor()) { @@ -424,7 +422,7 @@ private static void collectTargetsInClass(PsiElement element, final PsiClass aCl final PsiMethod[] methods = aClass.getAllMethods(); for (PsiMethod method : methods) { final PsiClass containingClass = method.getContainingClass(); - if (containingClass == null || JavaClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { + if (containingClass == null || CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) { continue; } final PsiType returnType = method.getReturnType(); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateEqualsHelper.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateEqualsHelper.java index 5052c58480..90f6625790 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateEqualsHelper.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateEqualsHelper.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.codeInsight.generation; +import com.intellij.java.impl.generate.GenerationUtil; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import com.intellij.java.language.psi.codeStyle.VariableKind; @@ -22,7 +23,6 @@ import com.intellij.java.language.psi.util.MethodSignatureUtil; import com.intellij.java.language.psi.util.PsiUtil; import consulo.application.ApplicationManager; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.codeStyle.CodeStyleSettings; import consulo.language.codeStyle.CodeStyleSettingsManager; @@ -35,7 +35,6 @@ import consulo.project.Project; import consulo.util.collection.ContainerUtil; import org.jetbrains.annotations.NonNls; -import com.intellij.java.impl.generate.GenerationUtil; import java.util.*; @@ -222,7 +221,7 @@ private boolean superMethodExists(MethodSignature methodSignature) { if (superEquals.hasModifierProperty(PsiModifier.ABSTRACT)) { return false; } - return !JavaClassNames.JAVA_LANG_OBJECT.equals(superEquals.getContainingClass().getQualifiedName()); + return !CommonClassNames.JAVA_LANG_OBJECT.equals(superEquals.getContainingClass().getQualifiedName()); } private PsiMethod createHashCode() throws IncorrectOperationException { @@ -282,7 +281,7 @@ public static boolean isArrayOfObjects(PsiType aType) { return false; } final String qName = psiClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_OBJECT.equals(qName); + return CommonClassNames.JAVA_LANG_OBJECT.equals(qName); } public static MethodSignature getHashCodeSignature() { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableComponentTypeMacro.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableComponentTypeMacro.java index 700752eda3..8bb5696a8b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableComponentTypeMacro.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableComponentTypeMacro.java @@ -22,7 +22,6 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import consulo.annotation.access.RequiredReadAction; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.localize.CodeInsightLocalize; import consulo.language.editor.template.Expression; import consulo.language.editor.template.ExpressionContext; @@ -76,7 +75,7 @@ public Result calculateResult(@Nonnull Expression[] params, ExpressionContext co PsiClass aClass = resolveResult.getElement(); if (aClass != null) { - PsiClass iterableClass = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_ITERABLE, aClass.getResolveScope()); + PsiClass iterableClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_ITERABLE, aClass.getResolveScope()); if (iterableClass != null) { PsiSubstitutor substitutor = TypeConversionUtil.getClassSubstitutor(iterableClass, aClass, resolveResult.getSubstitutor()); if (substitutor != null) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableVariableMacro.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableVariableMacro.java index 1bfd782003..888134211f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableVariableMacro.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/macro/IterableVariableMacro.java @@ -19,7 +19,6 @@ import com.intellij.java.language.psi.*; import consulo.annotation.access.RequiredReadAction; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.localize.CodeInsightLocalize; import consulo.language.editor.template.Expression; import consulo.language.editor.template.ExpressionContext; @@ -73,8 +72,8 @@ protected PsiElement[] getVariables(Expression[] params, final ExpressionContext final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory(); final GlobalSearchScope scope = file.getResolveScope(); - PsiType iterableType = elementFactory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_ITERABLE, scope); - PsiType mapType = elementFactory.createTypeByFQClassName(JavaClassNames.JAVA_UTIL_MAP, scope); + PsiType iterableType = elementFactory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_ITERABLE, scope); + PsiType mapType = elementFactory.createTypeByFQClassName(CommonClassNames.JAVA_UTIL_MAP, scope); PsiVariable[] variables = MacroUtil.getVariablesVisibleAt(place, ""); for (PsiVariable var : variables) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/FormatPostfixTemplate.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/FormatPostfixTemplate.java index bcab99966f..88bcfb5f6e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/FormatPostfixTemplate.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/template/postfix/templates/FormatPostfixTemplate.java @@ -2,8 +2,8 @@ package com.intellij.java.impl.codeInsight.template.postfix.templates; import com.intellij.java.language.LanguageLevel; +import com.intellij.java.language.psi.CommonClassNames; import consulo.application.dumb.DumbAware; -import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import java.util.Collections; @@ -15,7 +15,7 @@ public FormatPostfixTemplate(@Nonnull JavaPostfixTemplateProvider provider) { "String.format($EXPR$, $END$)", "String.format(expr)", Collections.singleton( - new JavaPostfixTemplateExpressionCondition.JavaPostfixTemplateExpressionFqnCondition(JavaClassNames.JAVA_LANG_STRING) + new JavaPostfixTemplateExpressionCondition.JavaPostfixTemplateExpressionFqnCondition(CommonClassNames.JAVA_LANG_STRING) ), LanguageLevel.JDK_1_3, false, provider ); diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringWorker.java b/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringWorker.java index e6578dc3ed..423f06d3a0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringWorker.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringWorker.java @@ -13,45 +13,41 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * @author max - */ package com.intellij.java.impl.generate; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - import com.intellij.java.analysis.impl.generate.config.Config; import com.intellij.java.analysis.impl.generate.config.DuplicationPolicy; import com.intellij.java.analysis.impl.generate.config.InsertWhere; -import com.intellij.java.language.psi.*; -import consulo.java.language.module.util.JavaClassNames; -import consulo.language.editor.hint.HintManager; -import jakarta.annotation.Nullable; -import org.jetbrains.java.generate.GenerateToStringContext; import com.intellij.java.impl.generate.config.*; import com.intellij.java.impl.generate.exception.GenerateCodeException; -import org.jetbrains.java.generate.psi.PsiAdapter; import com.intellij.java.impl.generate.template.TemplateResource; import com.intellij.java.impl.generate.view.MethodExistsDialog; +import com.intellij.java.language.psi.*; +import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; +import com.intellij.java.language.psi.javadoc.PsiDocComment; import consulo.application.ApplicationManager; -import consulo.undoRedo.CommandProcessor; -import consulo.logging.Logger; import consulo.codeEditor.Editor; import consulo.codeEditor.ScrollType; import consulo.codeEditor.VisualPosition; -import consulo.util.lang.StringUtil; -import com.intellij.java.language.psi.JVMElementFactory; -import com.intellij.java.language.psi.PsiClass; -import consulo.language.psi.PsiFile; import consulo.language.codeStyle.CodeStyleManager; -import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; -import com.intellij.java.language.psi.javadoc.PsiDocComment; +import consulo.language.editor.hint.HintManager; +import consulo.language.psi.PsiFile; import consulo.language.util.IncorrectOperationException; +import consulo.logging.Logger; +import consulo.undoRedo.CommandProcessor; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nullable; +import org.jetbrains.java.generate.GenerateToStringContext; +import org.jetbrains.java.generate.psi.PsiAdapter; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + +/** + * @author max + */ public class GenerateToStringWorker { private static final Logger logger = Logger.getInstance(GenerateToStringWorker.class); @@ -125,7 +121,7 @@ private PsiMethod createToStringMethod(Collection selectedMembers, if(hasOverrideAnnotation) { - toStringMethod.getModifierList().addAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); + toStringMethod.getModifierList().addAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE); } // applyJavaDoc conflict resolution policy (add or keep existing) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/FormatDecode.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/FormatDecode.java index 639d35a711..6b396715cc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/FormatDecode.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/FormatDecode.java @@ -15,9 +15,8 @@ */ package com.intellij.java.impl.ig.bugs; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiType; -import consulo.util.collection.ContainerUtil; import java.util.ArrayList; import java.util.HashMap; @@ -187,9 +186,9 @@ public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.LONG.equals(type) || - JavaClassNames.JAVA_LANG_LONG.equals(text) || - JavaClassNames.JAVA_UTIL_DATE.equals(text) || - JavaClassNames.JAVA_UTIL_CALENDAR.equals(text); + CommonClassNames.JAVA_LANG_LONG.equals(text) || + CommonClassNames.JAVA_UTIL_DATE.equals(text) || + CommonClassNames.JAVA_UTIL_CALENDAR.equals(text); } public String type() { @@ -202,7 +201,7 @@ private static class CharValidator implements Validator { public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.CHAR.equals(type) || - JavaClassNames.JAVA_LANG_CHARACTER.equals(text); + CommonClassNames.JAVA_LANG_CHARACTER.equals(text); } public String type() { @@ -215,13 +214,13 @@ private static class IntValidator implements Validator { public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.INT.equals(type) || - JavaClassNames.JAVA_LANG_INTEGER.equals(text) || + CommonClassNames.JAVA_LANG_INTEGER.equals(text) || PsiType.LONG.equals(type) || - JavaClassNames.JAVA_LANG_LONG.equals(text) || + CommonClassNames.JAVA_LANG_LONG.equals(text) || PsiType.SHORT.equals(type) || - JavaClassNames.JAVA_LANG_SHORT.equals(text) || + CommonClassNames.JAVA_LANG_SHORT.equals(text) || PsiType.BYTE.equals(type) || - JavaClassNames.JAVA_LANG_BYTE.equals(text) || + CommonClassNames.JAVA_LANG_BYTE.equals(text) || "java.math.BigInteger".equals(text); } @@ -235,9 +234,9 @@ private static class FloatValidator implements Validator { public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.DOUBLE.equals(type) || - JavaClassNames.JAVA_LANG_DOUBLE.equals(text) || + CommonClassNames.JAVA_LANG_DOUBLE.equals(text) || PsiType.FLOAT.equals(type) || - JavaClassNames.JAVA_LANG_FLOAT.equals(text) || + CommonClassNames.JAVA_LANG_FLOAT.equals(text) || "java.math.BigDecimal".equals(text); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ImplicitArrayToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ImplicitArrayToStringInspection.java index 6ffef9ba0f..eccfd304cb 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ImplicitArrayToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ImplicitArrayToStringInspection.java @@ -24,7 +24,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 consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -263,8 +262,7 @@ private static boolean isImplicitArrayToStringCall( if (arguments.length != 1) { return false; } - return InheritanceUtil.isInheritor(containingClass, - JavaClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER); + return InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER); } else if ("valueOf".equals(methodName)) { if (arguments.length != 1) { @@ -272,7 +270,7 @@ else if ("valueOf".equals(methodName)) { } final String qualifiedName = containingClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_STRING.equals(qualifiedName); + return CommonClassNames.JAVA_LANG_STRING.equals(qualifiedName); } if (!"print".equals(methodName) && !"println".equals(methodName)) { @@ -305,13 +303,13 @@ else if ("valueOf".equals(methodName)) { } final String qualifiedName = containingClass.getQualifiedName(); if ("java.util.Formatter".equals(qualifiedName) || - JavaClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { + CommonClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { return true; } - if (InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_IO_PRINT_STREAM)) { + if (InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_IO_PRINT_STREAM)) { return true; } - else if (InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_IO_PRINT_WRITER)) { + else if (InheritanceUtil.isInheritor(containingClass, CommonClassNames.JAVA_IO_PRINT_WRITER)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java index 74859c2495..6c031eba5c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.ig.bugs; import com.intellij.java.impl.ig.psiutils.IteratorUtils; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiMethod; import com.siyeh.HardcodedMethodConstants; import com.siyeh.ig.BaseInspection; @@ -23,7 +24,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 jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -52,8 +52,7 @@ private static class IteratorHasNextCallsIteratorNext public void visitMethod(@Nonnull PsiMethod method) { // note: no call to super @NonNls final String name = method.getName(); - if (!MethodUtils.methodMatches(method, JavaClassNames.JAVA_UTIL_ITERATOR, null, - HardcodedMethodConstants.HAS_NEXT)) { + if (!MethodUtils.methodMatches(method, CommonClassNames.JAVA_UTIL_ITERATOR, null, HardcodedMethodConstants.HAS_NEXT)) { return; } if (!IteratorUtils.containsCallToIteratorNext(method, null, true)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java index acd9ec7b5a..ea128838f9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java @@ -15,19 +15,16 @@ */ package com.intellij.java.impl.ig.bugs; +import com.intellij.java.impl.ig.psiutils.ExceptionUtils; +import com.intellij.java.impl.ig.psiutils.IteratorUtils; import com.intellij.java.language.psi.*; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.*; import com.siyeh.HardcodedMethodConstants; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.java.impl.ig.psiutils.ExceptionUtils; -import com.intellij.java.impl.ig.psiutils.IteratorUtils; import com.siyeh.ig.psiutils.MethodUtils; -import consulo.java.language.module.util.JavaClassNames; - +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import java.util.Set; @@ -65,8 +62,7 @@ private static class IteratorNextDoesNotThrowNoSuchElementExceptionVisitor @Override public void visitMethod(@Nonnull PsiMethod method) { // note: no call to super - if (!MethodUtils.methodMatches(method, JavaClassNames.JAVA_UTIL_ITERATOR, null, - HardcodedMethodConstants.NEXT)) { + if (!MethodUtils.methodMatches(method, CommonClassNames.JAVA_UTIL_ITERATOR, null, HardcodedMethodConstants.NEXT)) { return; } final Set exceptions = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/IfCanBeSwitchInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/IfCanBeSwitchInspection.java index 00fbad6a7c..b0987051ca 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/IfCanBeSwitchInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/IfCanBeSwitchInspection.java @@ -26,7 +26,6 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiComment; @@ -221,7 +220,7 @@ else if (elseBranch == null) { @NonNls final StringBuilder switchStatementText = new StringBuilder(); switchStatementText.append("switch(").append(switchExpression.getText()).append("){"); final PsiType type = switchExpression.getType(); - final boolean castToInt = type != null && type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER); + final boolean castToInt = type != null && type.equalsToText(CommonClassNames.JAVA_LANG_INTEGER); for (IfStatementBranch branch : branches) { boolean hasConflicts = false; for (IfStatementBranch testBranch : branches) { @@ -519,10 +518,10 @@ public void visitIfStatement(PsiIfStatement statement) { final PsiType type = switchExpression.getType(); if (!suggestIntSwitches) { if (type instanceof PsiClassType) { - if (type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER) || - type.equalsToText(JavaClassNames.JAVA_LANG_SHORT) || - type.equalsToText(JavaClassNames.JAVA_LANG_BYTE) || - type.equalsToText(JavaClassNames.JAVA_LANG_CHARACTER)) { + if (type.equalsToText(CommonClassNames.JAVA_LANG_INTEGER) || + type.equalsToText(CommonClassNames.JAVA_LANG_SHORT) || + type.equalsToText(CommonClassNames.JAVA_LANG_BYTE) || + type.equalsToText(CommonClassNames.JAVA_LANG_CHARACTER)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/IndexOfReplaceableByContainsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/IndexOfReplaceableByContainsInspection.java index 696731e485..52d1e591db 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/IndexOfReplaceableByContainsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/IndexOfReplaceableByContainsInspection.java @@ -26,7 +26,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 consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -247,9 +246,7 @@ private static boolean isIndexOfCall( return false; } final PsiType argumentType = arguments[0].getType(); - if (argumentType == null || - !argumentType.equalsToText( - JavaClassNames.JAVA_LANG_STRING)) { + if (argumentType == null || !argumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) { return false; } final PsiExpression qualifier = @@ -258,8 +255,7 @@ private static boolean isIndexOfCall( return false; } final PsiType qualifierType = qualifier.getType(); - return qualifierType != null && - qualifierType.equalsToText(JavaClassNames.JAVA_LANG_STRING); + return qualifierType != null && qualifierType.equalsToText(CommonClassNames.JAVA_LANG_STRING); } } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ImplicitNumericConversionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ImplicitNumericConversionInspection.java index d1f3ab4592..554b1570f7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ImplicitNumericConversionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ImplicitNumericConversionInspection.java @@ -27,7 +27,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -361,7 +360,7 @@ private boolean isArgumentOfStringIndexOf(PsiElement parent) { return false; } final String className = aClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_STRING.equals(className); + return CommonClassNames.JAVA_LANG_STRING.equals(className); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java index e090fcdf2a..cbaaf2496d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/IntegerDivisionInFloatingPointContextInspection.java @@ -16,17 +16,15 @@ package com.intellij.java.impl.ig.numeric; import com.intellij.java.language.psi.*; -import com.siyeh.localize.InspectionGadgetsLocalize; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.*; -import consulo.language.ast.IElementType; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpectedTypeUtils; -import consulo.java.language.module.util.JavaClassNames; -import org.jetbrains.annotations.NonNls; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.ast.IElementType; +import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.NonNls; import java.util.HashSet; import java.util.Set; @@ -47,11 +45,11 @@ public class IntegerDivisionInFloatingPointContextInspection s_integralTypes.add("short"); s_integralTypes.add("byte"); s_integralTypes.add("char"); - s_integralTypes.add(JavaClassNames.JAVA_LANG_INTEGER); - s_integralTypes.add(JavaClassNames.JAVA_LANG_LONG); - s_integralTypes.add(JavaClassNames.JAVA_LANG_SHORT); - s_integralTypes.add(JavaClassNames.JAVA_LANG_BYTE); - s_integralTypes.add(JavaClassNames.JAVA_LANG_CHARACTER); + s_integralTypes.add(CommonClassNames.JAVA_LANG_INTEGER); + s_integralTypes.add(CommonClassNames.JAVA_LANG_LONG); + s_integralTypes.add(CommonClassNames.JAVA_LANG_SHORT); + s_integralTypes.add(CommonClassNames.JAVA_LANG_BYTE); + s_integralTypes.add(CommonClassNames.JAVA_LANG_CHARACTER); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/FormatUtils.java b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/FormatUtils.java index d6a80769fd..2d3f94a841 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/FormatUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/FormatUtils.java @@ -16,11 +16,10 @@ package com.intellij.java.impl.ig.psiutils; import com.intellij.java.language.psi.*; -import consulo.language.psi.*; +import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; -import consulo.java.language.module.util.JavaClassNames; -import org.jetbrains.annotations.NonNls; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; import java.util.HashSet; import java.util.Set; @@ -41,10 +40,10 @@ public class FormatUtils { formatMethodNames.add("format"); formatMethodNames.add("printf"); - formatClassNames.add(JavaClassNames.JAVA_IO_PRINT_WRITER); - formatClassNames.add(JavaClassNames.JAVA_IO_PRINT_STREAM); + formatClassNames.add(CommonClassNames.JAVA_IO_PRINT_WRITER); + formatClassNames.add(CommonClassNames.JAVA_IO_PRINT_STREAM); formatClassNames.add("java.util.Formatter"); - formatClassNames.add(JavaClassNames.JAVA_LANG_STRING); + formatClassNames.add(CommonClassNames.JAVA_LANG_STRING); } private FormatUtils() {} diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/InheritanceUtil.java b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/InheritanceUtil.java index 2c9c3acb95..53bafc8ad1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/InheritanceUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/InheritanceUtil.java @@ -15,16 +15,16 @@ */ package com.intellij.java.impl.ig.psiutils; -import consulo.application.progress.ProgressManager; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.indexing.search.searches.ClassInheritorsSearch; +import com.intellij.java.language.psi.CommonClassNames; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiModifier; import com.intellij.java.language.psi.PsiTypeParameter; -import consulo.language.psi.scope.GlobalSearchScope; -import consulo.content.scope.SearchScope; -import com.intellij.java.indexing.search.searches.ClassInheritorsSearch; +import consulo.application.progress.ProgressManager; import consulo.application.util.function.Processor; import consulo.application.util.query.Query; +import consulo.content.scope.SearchScope; +import consulo.language.psi.scope.GlobalSearchScope; import java.util.concurrent.atomic.AtomicInteger; @@ -47,11 +47,11 @@ else if (class2 instanceof PsiTypeParameter) { } final String className = class1.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(className)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(className)) { return true; } final String class2Name = class2.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(class2Name)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(class2Name)) { return true; } if (class1.isInheritor(class2, true) || diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/IteratorUtils.java b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/IteratorUtils.java index f18cb7676f..f5b6d744fe 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/IteratorUtils.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/psiutils/IteratorUtils.java @@ -16,12 +16,11 @@ package com.intellij.java.impl.ig.psiutils; import com.intellij.java.language.psi.*; -import consulo.language.psi.PsiElement; import com.siyeh.HardcodedMethodConstants; import com.siyeh.ig.psiutils.MethodCallUtils; -import consulo.java.language.module.util.JavaClassNames; - +import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; + import java.util.regex.Pattern; public class IteratorUtils { @@ -55,8 +54,7 @@ public static boolean containsCallToScannerNext(PsiElement context, public static boolean isCallToHasNext( PsiMethodCallExpression methodCallExpression) { - return MethodCallUtils.isCallToMethod(methodCallExpression, - JavaClassNames.JAVA_UTIL_ITERATOR, PsiType.BOOLEAN, "hasNext"); + return MethodCallUtils.isCallToMethod(methodCallExpression, CommonClassNames.JAVA_UTIL_ITERATOR, PsiType.BOOLEAN, "hasNext"); } private static class CallsIteratorNextVisitor @@ -92,17 +90,11 @@ public void visitMethodCallExpression( } super.visitMethodCallExpression(expression); if (checkScanner) { - if (!MethodCallUtils.isCallToMethod(expression, - JavaClassNames.JAVA_UTIL_ITERATOR, null, - SCANNER_PATTERN)) { - return; - } - } else { - if (!MethodCallUtils.isCallToMethod(expression, - JavaClassNames.JAVA_UTIL_ITERATOR, null, - HardcodedMethodConstants.NEXT)) { + if (!MethodCallUtils.isCallToMethod(expression, CommonClassNames.JAVA_UTIL_ITERATOR, null, SCANNER_PATTERN)) { return; } + } else if (!MethodCallUtils.isCallToMethod(expression, CommonClassNames.JAVA_UTIL_ITERATOR, null, HardcodedMethodConstants.NEXT)) { + return; } if (checkTarget) { final PsiReferenceExpression methodExpression = diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/resources/IOResourceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/resources/IOResourceInspection.java index cc912d3038..43ef69c4fc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/resources/IOResourceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/resources/IOResourceInspection.java @@ -24,7 +24,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.language.psi.PsiElement; import consulo.language.psi.PsiReference; import consulo.language.psi.util.PsiTreeUtil; @@ -182,7 +181,7 @@ public static boolean isIOResourceFactoryMethodCall(PsiMethodCallExpression expr if (qualifier == null) { return false; } - return TypeUtils.expressionHasTypeOrSubtype(qualifier, JavaClassNames.JAVA_LANG_CLASS, "java.lang.ClassLoader") != null; + return TypeUtils.expressionHasTypeOrSubtype(qualifier, CommonClassNames.JAVA_LANG_CLASS, "java.lang.ClassLoader") != null; } public boolean isIOResource(PsiExpression expression) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/ImplicitCallToSuperInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/ImplicitCallToSuperInspection.java index 29114916ef..98f61a4bd1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/ImplicitCallToSuperInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/ImplicitCallToSuperInspection.java @@ -23,7 +23,6 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -118,8 +117,7 @@ public void visitMethod(@Nonnull PsiMethod method) { final PsiClass superClass = containingClass.getSuperClass(); if (superClass != null) { final String superClassName = superClass.getQualifiedName(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals( - superClassName)) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superClassName)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/asserttoif/IfStatementPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/asserttoif/IfStatementPredicate.java index 56ddebb6e4..5bc42e112f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/asserttoif/IfStatementPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/asserttoif/IfStatementPredicate.java @@ -15,10 +15,9 @@ */ package com.intellij.java.impl.ipp.asserttoif; -import com.intellij.java.language.psi.*; -import consulo.language.psi.*; import com.intellij.java.impl.ipp.base.PsiElementPredicate; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.*; +import consulo.language.psi.PsiElement; class IfStatementPredicate implements PsiElementPredicate { @@ -63,7 +62,7 @@ private static boolean isThrowNewAssertionError(PsiElement element) { } final PsiClass aClass = (PsiClass)target; final String qualifiedName = aClass.getQualifiedName(); - return JavaClassNames.JAVA_LANG_ASSERTION_ERROR.equals(qualifiedName); + return CommonClassNames.JAVA_LANG_ASSERTION_ERROR.equals(qualifiedName); } else if (element instanceof PsiBlockStatement) { final PsiBlockStatement blockStatement = diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IndexedForEachLoopPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IndexedForEachLoopPredicate.java index 9bb05bc576..9e251e42e1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IndexedForEachLoopPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IndexedForEachLoopPredicate.java @@ -15,15 +15,14 @@ */ package com.intellij.java.impl.ipp.forloop; -import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.psi.scope.GlobalSearchScope; -import consulo.language.ast.IElementType; -import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.impl.ipp.base.PsiElementPredicate; import com.intellij.java.impl.ipp.psiutils.ErrorUtil; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.*; +import com.intellij.java.language.psi.util.InheritanceUtil; +import consulo.language.ast.IElementType; +import consulo.language.psi.PsiElement; +import consulo.language.psi.scope.GlobalSearchScope; +import consulo.project.Project; class IndexedForEachLoopPredicate implements PsiElementPredicate { @@ -59,11 +58,9 @@ public boolean satisfiedBy(PsiElement element) { final Project project = element.getProject(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); final PsiClass listInterface = - psiFacade.findClass(JavaClassNames.JAVA_UTIL_LIST, - GlobalSearchScope.allScope(project)); + psiFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, GlobalSearchScope.allScope(project)); if (listInterface == null || - !InheritanceUtil.isInheritorOrSelf(aClass, - listInterface, true)) { + !InheritanceUtil.isInheritorOrSelf(aClass, listInterface, true)) { return false; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IterableForEachLoopPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IterableForEachLoopPredicate.java index a0090d6fb1..155752f367 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IterableForEachLoopPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/forloop/IterableForEachLoopPredicate.java @@ -15,13 +15,12 @@ */ package com.intellij.java.impl.ipp.forloop; -import com.intellij.java.language.psi.*; -import consulo.language.psi.*; -import consulo.language.ast.IElementType; -import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.impl.ipp.base.PsiElementPredicate; import com.intellij.java.impl.ipp.psiutils.ErrorUtil; -import consulo.java.language.module.util.JavaClassNames; +import com.intellij.java.language.psi.*; +import com.intellij.java.language.psi.util.InheritanceUtil; +import consulo.language.ast.IElementType; +import consulo.language.psi.PsiElement; class IterableForEachLoopPredicate implements PsiElementPredicate { @@ -44,7 +43,7 @@ public boolean satisfiedBy(PsiElement element) { return false; } final PsiType type = iteratedValue.getType(); - if (!InheritanceUtil.isInheritor(type, JavaClassNames.JAVA_LANG_ITERABLE)) { + if (!InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_LANG_ITERABLE)) { return false; } return !ErrorUtil.containsError(foreachStatement); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureDialog.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureDialog.java index 6a04b0e259..c97d35a1b1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureDialog.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureDialog.java @@ -43,7 +43,6 @@ import consulo.ide.impl.idea.util.ui.table.JBListTable; import consulo.ide.impl.idea.util.ui.table.JBTableRow; import consulo.ide.impl.idea.util.ui.table.JBTableRowEditor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.WriteCommandAction; import consulo.language.editor.completion.CompletionResultSet; import consulo.language.editor.completion.lookup.LookupElementBuilder; @@ -631,7 +630,7 @@ protected String validateAndCommitData() { } PsiClassType throwable = JavaPsiFacade.getInstance(myProject).getElementFactory() - .createTypeByFQClassName(JavaClassNames.JAVA_LANG_THROWABLE, type.getResolveScope()); + .createTypeByFQClassName(CommonClassNames.JAVA_LANG_THROWABLE, type.getResolveScope()); if (!throwable.isAssignableFrom(type)) { return RefactoringLocalize.changesignatureNotThrowableType(typeCodeFragment.getText()).get(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java index 5169e19aee..699d7cebed 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java @@ -41,7 +41,6 @@ import consulo.application.Application; import consulo.ide.impl.idea.refactoring.changeSignature.DefaultValueChooser; import consulo.java.impl.refactoring.changeSignature.ChangeSignatureUsageProcessorEx; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.refactoring.ResolveSnapshotProvider; import consulo.language.editor.refactoring.changeSignature.ChangeInfo; @@ -1140,7 +1139,7 @@ private void addMethodConflicts(MultiMap conflicts) { PsiType parameterType = info.createType(method, manager); if (parameterType == null) { parameterType = JavaPsiFacade.getElementFactory(method.getProject()) - .createTypeFromText(JavaClassNames.JAVA_LANG_OBJECT, method); + .createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, method); } PsiParameter param = factory.createParameter(info.getName(), parameterType); prototype.getParameterList().add(param); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java index 1e160b2d0d..7799bf3b5d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java @@ -32,7 +32,6 @@ import consulo.codeEditor.Editor; import consulo.codeEditor.ScrollType; import consulo.dataContext.DataContext; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.refactoring.RefactoringBundle; import consulo.language.editor.refactoring.action.RefactoringActionHandler; import consulo.language.editor.refactoring.localize.RefactoringLocalize; @@ -106,7 +105,7 @@ public void invoke(@Nonnull Project project, @Nonnull PsiElement[] elements, Dat if (!CommonRefactoringUtil.checkReadOnlyStatus(project, aClass)) return; final PsiClass[] bases = aClass.getSupers(); - @NonNls final String javaLangObject = JavaClassNames.JAVA_LANG_OBJECT; + @NonNls final String javaLangObject = CommonClassNames.JAVA_LANG_OBJECT; if (bases.length == 0 || bases.length == 1 && javaLangObject.equals(bases[0].getQualifiedName())) { LocalizeValue message = RefactoringLocalize.cannotPerformRefactoringWithReason( RefactoringLocalize.classDoesNotHaveBaseClassesOrInterfaces(aClass.getQualifiedName()) diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java index 18919295a5..8477649a13 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java @@ -33,7 +33,6 @@ import com.intellij.java.language.psi.util.*; import com.intellij.java.language.util.VisibilityUtil; import consulo.ide.impl.find.PsiElement2UsageTargetAdapter; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.refactoring.BaseRefactoringProcessor; import consulo.language.editor.refactoring.localize.RefactoringLocalize; @@ -109,7 +108,7 @@ public InheritanceToDelegationProcessor( myBaseClass = targetBaseClass; LOG.assertTrue( myBaseClass != null // && !myBaseClass.isInterface() - && (myBaseClass.getQualifiedName() == null || !myBaseClass.getQualifiedName().equals(JavaClassNames.JAVA_LANG_OBJECT)) + && (myBaseClass.getQualifiedName() == null || !myBaseClass.getQualifiedName().equals(CommonClassNames.JAVA_LANG_OBJECT)) ); myBaseClassMembers = getAllBaseClassMembers(); myBaseClassBases = getAllBases(); @@ -197,7 +196,7 @@ protected boolean preprocessUsages(Ref refUsages) { if (objectUpcastedUsageInfos.length > 0) { final LocalizeValue message = RefactoringLocalize.instancesOf0UpcastedTo1WereFound( RefactoringUIUtil.getDescription(myClass, true), - CommonRefactoringUtil.htmlEmphasize(JavaClassNames.JAVA_LANG_OBJECT) + CommonRefactoringUtil.htmlEmphasize(CommonClassNames.JAVA_LANG_OBJECT) ); conflicts.putValue(myClass, message.get()); @@ -231,7 +230,7 @@ private void analyzeConflicts(UsageInfo[] usage, MultiMap co HashMap> reportedUpcasts = new HashMap>(); // HashSet reportedObjectUpcasts = new HashSet(); - // final String nameJavaLangObject = ConflictsUtil.htmlEmphasize(JavaClassNames.JAVA_LANG_OBJECT); + // final String nameJavaLangObject = ConflictsUtil.htmlEmphasize(CommonClassNames.JAVA_LANG_OBJECT); final String classDescription = RefactoringUIUtil.getDescription(myClass, false); for (UsageInfo aUsage : usage) { @@ -908,7 +907,7 @@ private PsiMethod findSuperMethodInBaseClass(PsiMethod method) { PsiClass containingClass = superMethod.getContainingClass(); if (InheritanceUtil.isInheritorOrSelf(myBaseClass, containingClass, true)) { String qName = containingClass.getQualifiedName(); - if (qName == null || !JavaClassNames.JAVA_LANG_OBJECT.equals(qName)) { + if (qName == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) { return superMethod; } } @@ -930,7 +929,7 @@ private Set getAllBaseClassMembers() { //remove java.lang.Object members for (Iterator iterator = result.iterator(); iterator.hasNext(); ) { PsiMember member = iterator.next(); - if (JavaClassNames.JAVA_LANG_OBJECT.equals(member.getContainingClass().getQualifiedName())) { + if (CommonClassNames.JAVA_LANG_OBJECT.equals(member.getContainingClass().getQualifiedName())) { iterator.remove(); } } @@ -1224,7 +1223,7 @@ private void processTypedUsage(PsiType type, PsiExpression instanceRef) { return; } String qName = aClass.getQualifiedName(); - if (qName != null && JavaClassNames.JAVA_LANG_OBJECT.equals(qName)) { + if (qName != null && CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) { myUsageInfoStorage.add(new ObjectUpcastedUsageInfo(instanceRef, aClass, getFieldAccessibility(instanceRef))); } else { if (myBaseClassBases.contains(aClass) diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java index a1cb4fa2cb..cea0b70d3c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java @@ -15,10 +15,10 @@ */ package com.intellij.java.impl.refactoring.inheritanceToDelegation; +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.PsiModifier; -import consulo.java.language.module.util.JavaClassNames; /** * @author dsl @@ -38,7 +38,7 @@ public static boolean isInnerClassNeeded(PsiClass aClass, PsiClass baseClass) { if (baseMethod != null) { PsiClass containingClass = baseMethod.getContainingClass(); String qName = containingClass.getQualifiedName(); - if (qName == null || !JavaClassNames.JAVA_LANG_OBJECT.equals(qName)) return true; + if (qName == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) return true; } } return false; diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java index 77f885350e..e76e0da1dc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java @@ -27,7 +27,6 @@ import consulo.application.progress.ProgressManager; import consulo.application.util.function.Processor; import consulo.codeEditor.Editor; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.TargetElementUtil; import consulo.language.editor.refactoring.localize.RefactoringLocalize; import consulo.language.editor.refactoring.util.CommonRefactoringUtil; @@ -285,7 +284,7 @@ public static String getCannotInlineMessage(final PsiClass psiClass) return "Class cannot be inlined because an interface implemented by it cannot be resolved"; } final PsiClass superClass = psiClass.getSuperClass(); - if (superClass != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) + if (superClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) { PsiClassType interfaceType = interfaces[0]; if (!isRedundantImplements(superClass, interfaceType)) diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java index 9df0856c54..a1682736f2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java @@ -35,7 +35,6 @@ import consulo.document.event.DocumentAdapter; import consulo.document.event.DocumentEvent; import consulo.ide.impl.idea.ide.util.PropertiesComponent; -import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.refactoring.localize.RefactoringLocalize; import consulo.language.editor.refactoring.rename.SuggestedNameInfo; import consulo.language.editor.refactoring.ui.NameSuggestionsField; @@ -260,7 +259,7 @@ else if (myCbReplaceAll != null) { final PsiManager psiManager = PsiManager.getInstance(myProject); if ( ( - myTypeSelectorManager.isSuggestedType(JavaClassNames.JAVA_LANG_STRING) + myTypeSelectorManager.isSuggestedType(CommonClassNames.JAVA_LANG_STRING) || (myLocalVariable != null && AnnotationUtil.isAnnotated(myLocalVariable, AnnotationUtil.NON_NLS, false, false)) ) && PsiUtil.isLanguageLevel5OrHigher(myParentClass)