From 2e68841755b19ef314b532d0895923cc80a80f03 Mon Sep 17 00:00:00 2001 From: UNV Date: Tue, 6 May 2025 21:17:28 +0300 Subject: [PATCH 1/3] Reformatting JavaClassNames. --- .../language/module/util/JavaClassNames.java | 194 +++++++++--------- 1 file changed, 102 insertions(+), 92 deletions(-) diff --git a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java b/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java index 49e739ba06..c0a944abf0 100644 --- a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java +++ b/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java @@ -1,98 +1,108 @@ -/* * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may -obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is -distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations -under the License. */ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package consulo.java.language.module.util; /** * @author peter */ -public interface JavaClassNames -{ - String DEFAULT_PACKAGE = "java.lang"; - String JAVA_UTIL_OBJECTS = "java.util.Objects"; - String JAVA_LANG_OBJECT = "java.lang.Object"; - String JAVA_LANG_OBJECT_SHORT = "Object"; - String JAVA_LANG_CLASS = "java.lang.Class"; - String JAVA_LANG_OVERRIDE = "java.lang.Override"; - String JAVA_LANG_ENUM = "java.lang.Enum"; - String JAVA_LANG_RECORD = "java.lang.Record"; - String JAVA_LANG_VOID = "java.lang.Void"; - String JAVA_LANG_THROWABLE = "java.lang.Throwable"; - String JAVA_LANG_EXCEPTION = "java.lang.Exception"; - String JAVA_LANG_ERROR = "java.lang.Error"; - String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError"; - String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException"; - String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable"; - String JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION = "java.lang.IllegalArgumentException"; - String JAVA_LANG_ITERABLE = "java.lang.Iterable"; - String JAVA_UTIL_ITERATOR = "java.util.Iterator"; - String JAVA_LANG_RUNNABLE = "java.lang.Runnable"; - String JAVA_LANG_DEPRECATED = "java.lang.Deprecated"; - String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target"; - String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited"; - String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation"; - String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention"; - String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable"; - String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array"; - String JAVA_UTIL_ARRAYS = "java.util.Arrays"; - String JAVA_UTIL_COLLECTIONS = "java.util.Collections"; - String JAVA_UTIL_COLLECTION = "java.util.Collection"; - String JAVA_UTIL_MAP = "java.util.Map"; - String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry"; - String JAVA_UTIL_HASH_MAP = "java.util.HashMap"; - String JAVA_UTIL_LIST = "java.util.List"; - String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList"; - String JAVA_UTIL_SORTED_SET = "java.util.SortedSet"; - String JAVA_UTIL_QUEUE = "java.util.Queue"; - String JAVA_UTIL_SET = "java.util.Set"; - String JAVA_UTIL_HASH_SET = "java.util.HashSet"; - String JAVA_UTIL_PROPERTIES = "java.util.Properties"; - String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle"; - String JAVA_UTIL_DATE = "java.util.Date"; - String JAVA_UTIL_CALENDAR = "java.util.Calendar"; - String JAVA_UTIL_DICTIONARY = "java.util.Dictionary"; - String JAVA_UTIL_COMPARATOR = "java.util.Comparator"; - String JAVA_UTIL_OPTIONAL = "java.util.Optional"; - String JAVA_IO_SERIALIZABLE = "java.io.Serializable"; - String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable"; - String JAVA_IO_FILE = "java.io.File"; - String JAVA_LANG_STRING = "java.lang.String"; - String JAVA_LANG_STRING_SHORT = "String"; - String JAVA_LANG_NUMBER = "java.lang.Number"; - String JAVA_LANG_BOOLEAN = "java.lang.Boolean"; - String JAVA_LANG_BYTE = "java.lang.Byte"; - String JAVA_LANG_SHORT = "java.lang.Short"; - String JAVA_LANG_INTEGER = "java.lang.Integer"; - String JAVA_LANG_LONG = "java.lang.Long"; - String JAVA_LANG_FLOAT = "java.lang.Float"; - String JAVA_LANG_DOUBLE = "java.lang.Double"; - String JAVA_LANG_CHARACTER = "java.lang.Character"; - String JAVA_LANG_CHAR_SEQUENCE = "java.lang.CharSequence"; - String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer"; - String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder"; - String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder"; - String JAVA_LANG_MATH = "java.lang.Math"; - String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath"; - String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; - String JAVA_LANG_COMPARABLE = "java.lang.Comparable"; - String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException"; - String JAVA_UTIL_CONCURRENT_HASH_MAP = "java.util.concurrent.ConcurrentHashMap"; - String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future"; - String JAVA_UTIL_CONCURRENT_CALLABLE = "java.util.concurrent.Callable"; - String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature"; - String JAVA_LANG_SAFE_VARARGS = "java.lang.SafeVarargs"; - String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface"; - String JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated"; - String JAVA_UTIL_FUNCTION_BI_FUNCTION = "java.util.function.BiFunction"; - String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream"; - String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream"; - String JAVA_UTIL_STREAM_INT_STREAM = "java.util.stream.IntStream"; - String JAVA_UTIL_STREAM_LONG_STREAM = "java.util.stream.LongStream"; - String JAVA_UTIL_STREAM_DOUBLE_STREAM = "java.util.stream.DoubleStream"; - String JAVA_UTIL_STREAM_COLLECTORS = "java.util.stream.Collectors"; - String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate"; - String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer"; - String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function"; - String JAVA_UTIL_FUNCTION_BIFUNCTION = "java.util.function.BiFunction"; +public interface JavaClassNames { + String DEFAULT_PACKAGE = "java.lang"; + String JAVA_UTIL_OBJECTS = "java.util.Objects"; + String JAVA_LANG_OBJECT = "java.lang.Object"; + String JAVA_LANG_OBJECT_SHORT = "Object"; + String JAVA_LANG_CLASS = "java.lang.Class"; + String JAVA_LANG_OVERRIDE = "java.lang.Override"; + String JAVA_LANG_ENUM = "java.lang.Enum"; + String JAVA_LANG_RECORD = "java.lang.Record"; + String JAVA_LANG_VOID = "java.lang.Void"; + String JAVA_LANG_THROWABLE = "java.lang.Throwable"; + String JAVA_LANG_EXCEPTION = "java.lang.Exception"; + String JAVA_LANG_ERROR = "java.lang.Error"; + String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError"; + String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException"; + String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable"; + String JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION = "java.lang.IllegalArgumentException"; + String JAVA_LANG_ITERABLE = "java.lang.Iterable"; + String JAVA_UTIL_ITERATOR = "java.util.Iterator"; + String JAVA_LANG_RUNNABLE = "java.lang.Runnable"; + String JAVA_LANG_DEPRECATED = "java.lang.Deprecated"; + String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target"; + String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited"; + String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation"; + String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention"; + String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable"; + String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array"; + String JAVA_UTIL_ARRAYS = "java.util.Arrays"; + String JAVA_UTIL_COLLECTIONS = "java.util.Collections"; + String JAVA_UTIL_COLLECTION = "java.util.Collection"; + String JAVA_UTIL_MAP = "java.util.Map"; + String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry"; + String JAVA_UTIL_HASH_MAP = "java.util.HashMap"; + String JAVA_UTIL_LIST = "java.util.List"; + String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList"; + String JAVA_UTIL_SORTED_SET = "java.util.SortedSet"; + String JAVA_UTIL_QUEUE = "java.util.Queue"; + String JAVA_UTIL_SET = "java.util.Set"; + String JAVA_UTIL_HASH_SET = "java.util.HashSet"; + String JAVA_UTIL_PROPERTIES = "java.util.Properties"; + String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle"; + String JAVA_UTIL_DATE = "java.util.Date"; + String JAVA_UTIL_CALENDAR = "java.util.Calendar"; + String JAVA_UTIL_DICTIONARY = "java.util.Dictionary"; + String JAVA_UTIL_COMPARATOR = "java.util.Comparator"; + String JAVA_UTIL_OPTIONAL = "java.util.Optional"; + String JAVA_IO_SERIALIZABLE = "java.io.Serializable"; + String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable"; + String JAVA_IO_FILE = "java.io.File"; + String JAVA_LANG_STRING = "java.lang.String"; + String JAVA_LANG_STRING_SHORT = "String"; + String JAVA_LANG_NUMBER = "java.lang.Number"; + String JAVA_LANG_BOOLEAN = "java.lang.Boolean"; + String JAVA_LANG_BYTE = "java.lang.Byte"; + String JAVA_LANG_SHORT = "java.lang.Short"; + String JAVA_LANG_INTEGER = "java.lang.Integer"; + String JAVA_LANG_LONG = "java.lang.Long"; + String JAVA_LANG_FLOAT = "java.lang.Float"; + String JAVA_LANG_DOUBLE = "java.lang.Double"; + String JAVA_LANG_CHARACTER = "java.lang.Character"; + String JAVA_LANG_CHAR_SEQUENCE = "java.lang.CharSequence"; + String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer"; + String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder"; + String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder"; + String JAVA_LANG_MATH = "java.lang.Math"; + String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath"; + String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; + String JAVA_LANG_COMPARABLE = "java.lang.Comparable"; + String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException"; + String JAVA_UTIL_CONCURRENT_HASH_MAP = "java.util.concurrent.ConcurrentHashMap"; + String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future"; + String JAVA_UTIL_CONCURRENT_CALLABLE = "java.util.concurrent.Callable"; + String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature"; + String JAVA_LANG_SAFE_VARARGS = "java.lang.SafeVarargs"; + String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface"; + String JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated"; + String JAVA_UTIL_FUNCTION_BI_FUNCTION = "java.util.function.BiFunction"; + String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream"; + String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream"; + String JAVA_UTIL_STREAM_INT_STREAM = "java.util.stream.IntStream"; + String JAVA_UTIL_STREAM_LONG_STREAM = "java.util.stream.LongStream"; + String JAVA_UTIL_STREAM_DOUBLE_STREAM = "java.util.stream.DoubleStream"; + String JAVA_UTIL_STREAM_COLLECTORS = "java.util.stream.Collectors"; + String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate"; + String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer"; + String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function"; + String JAVA_UTIL_FUNCTION_BIFUNCTION = "java.util.function.BiFunction"; } \ No newline at end of file From 997943d2719f9209039b218ba7a354dedfbd83c0 Mon Sep 17 00:00:00 2001 From: UNV Date: Tue, 6 May 2025 21:40:14 +0300 Subject: [PATCH 2/3] Sorting JavaClassNames. --- .../language/module/util/JavaClassNames.java | 131 +++++++++--------- 1 file changed, 65 insertions(+), 66 deletions(-) diff --git a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java b/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java index c0a944abf0..d10e41821f 100644 --- a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java +++ b/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java @@ -20,89 +20,88 @@ */ public interface JavaClassNames { String DEFAULT_PACKAGE = "java.lang"; - String JAVA_UTIL_OBJECTS = "java.util.Objects"; - String JAVA_LANG_OBJECT = "java.lang.Object"; - String JAVA_LANG_OBJECT_SHORT = "Object"; - String JAVA_LANG_CLASS = "java.lang.Class"; - String JAVA_LANG_OVERRIDE = "java.lang.Override"; - String JAVA_LANG_ENUM = "java.lang.Enum"; - String JAVA_LANG_RECORD = "java.lang.Record"; - String JAVA_LANG_VOID = "java.lang.Void"; - String JAVA_LANG_THROWABLE = "java.lang.Throwable"; - String JAVA_LANG_EXCEPTION = "java.lang.Exception"; - String JAVA_LANG_ERROR = "java.lang.Error"; - String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError"; - String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException"; - String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable"; - String JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION = "java.lang.IllegalArgumentException"; - String JAVA_LANG_ITERABLE = "java.lang.Iterable"; - String JAVA_UTIL_ITERATOR = "java.util.Iterator"; - String JAVA_LANG_RUNNABLE = "java.lang.Runnable"; - String JAVA_LANG_DEPRECATED = "java.lang.Deprecated"; - String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target"; - String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited"; - String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation"; - String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention"; - String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable"; - String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array"; - String JAVA_UTIL_ARRAYS = "java.util.Arrays"; - String JAVA_UTIL_COLLECTIONS = "java.util.Collections"; - String JAVA_UTIL_COLLECTION = "java.util.Collection"; - String JAVA_UTIL_MAP = "java.util.Map"; - String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry"; - String JAVA_UTIL_HASH_MAP = "java.util.HashMap"; - String JAVA_UTIL_LIST = "java.util.List"; - String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList"; - String JAVA_UTIL_SORTED_SET = "java.util.SortedSet"; - String JAVA_UTIL_QUEUE = "java.util.Queue"; - String JAVA_UTIL_SET = "java.util.Set"; - String JAVA_UTIL_HASH_SET = "java.util.HashSet"; - String JAVA_UTIL_PROPERTIES = "java.util.Properties"; - String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle"; - String JAVA_UTIL_DATE = "java.util.Date"; - String JAVA_UTIL_CALENDAR = "java.util.Calendar"; - String JAVA_UTIL_DICTIONARY = "java.util.Dictionary"; - String JAVA_UTIL_COMPARATOR = "java.util.Comparator"; - String JAVA_UTIL_OPTIONAL = "java.util.Optional"; - String JAVA_IO_SERIALIZABLE = "java.io.Serializable"; String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable"; String JAVA_IO_FILE = "java.io.File"; - String JAVA_LANG_STRING = "java.lang.String"; - String JAVA_LANG_STRING_SHORT = "String"; - String JAVA_LANG_NUMBER = "java.lang.Number"; + String JAVA_IO_SERIALIZABLE = "java.io.Serializable"; + String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder"; + String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation"; + String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited"; + String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable"; + String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention"; + String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target"; + String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError"; + String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable"; String JAVA_LANG_BOOLEAN = "java.lang.Boolean"; String JAVA_LANG_BYTE = "java.lang.Byte"; - String JAVA_LANG_SHORT = "java.lang.Short"; - String JAVA_LANG_INTEGER = "java.lang.Integer"; - String JAVA_LANG_LONG = "java.lang.Long"; - String JAVA_LANG_FLOAT = "java.lang.Float"; - String JAVA_LANG_DOUBLE = "java.lang.Double"; String JAVA_LANG_CHARACTER = "java.lang.Character"; String JAVA_LANG_CHAR_SEQUENCE = "java.lang.CharSequence"; - String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer"; - String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder"; - String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder"; - String JAVA_LANG_MATH = "java.lang.Math"; - String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath"; + String JAVA_LANG_CLASS = "java.lang.Class"; String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; String JAVA_LANG_COMPARABLE = "java.lang.Comparable"; + String JAVA_LANG_DEPRECATED = "java.lang.Deprecated"; + String JAVA_LANG_DOUBLE = "java.lang.Double"; + String JAVA_LANG_ENUM = "java.lang.Enum"; + String JAVA_LANG_ERROR = "java.lang.Error"; + String JAVA_LANG_EXCEPTION = "java.lang.Exception"; + String JAVA_LANG_FLOAT = "java.lang.Float"; + String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface"; + String JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION = "java.lang.IllegalArgumentException"; + String JAVA_LANG_INTEGER = "java.lang.Integer"; + String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature"; + String JAVA_LANG_ITERABLE = "java.lang.Iterable"; + String JAVA_LANG_LONG = "java.lang.Long"; String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException"; + String JAVA_LANG_NUMBER = "java.lang.Number"; + String JAVA_LANG_OBJECT = "java.lang.Object"; + String JAVA_LANG_OBJECT_SHORT = "Object"; + String JAVA_LANG_OVERRIDE = "java.lang.Override"; + String JAVA_LANG_RECORD = "java.lang.Record"; + String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array"; + String JAVA_LANG_RUNNABLE = "java.lang.Runnable"; + String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException"; + String JAVA_LANG_SAFE_VARARGS = "java.lang.SafeVarargs"; + String JAVA_LANG_SHORT = "java.lang.Short"; + String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath"; + String JAVA_LANG_STRING = "java.lang.String"; + String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer"; + String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder"; + String JAVA_LANG_STRING_SHORT = "String"; + String JAVA_LANG_THROWABLE = "java.lang.Throwable"; + String JAVA_LANG_VOID = "java.lang.Void"; String JAVA_UTIL_CONCURRENT_HASH_MAP = "java.util.concurrent.ConcurrentHashMap"; String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future"; String JAVA_UTIL_CONCURRENT_CALLABLE = "java.util.concurrent.Callable"; - String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature"; - String JAVA_LANG_SAFE_VARARGS = "java.lang.SafeVarargs"; - String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface"; - String JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated"; + String JAVA_UTIL_ITERATOR = "java.util.Iterator"; + String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList"; + String JAVA_UTIL_ARRAYS = "java.util.Arrays"; + String JAVA_UTIL_CALENDAR = "java.util.Calendar"; + String JAVA_UTIL_COLLECTION = "java.util.Collection"; + String JAVA_UTIL_COLLECTIONS = "java.util.Collections"; + String JAVA_UTIL_COMPARATOR = "java.util.Comparator"; + String JAVA_UTIL_DATE = "java.util.Date"; + String JAVA_UTIL_DICTIONARY = "java.util.Dictionary"; String JAVA_UTIL_FUNCTION_BI_FUNCTION = "java.util.function.BiFunction"; + String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate"; + String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer"; + String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function"; + String JAVA_UTIL_FUNCTION_BIFUNCTION = "java.util.function.BiFunction"; + String JAVA_UTIL_HASH_MAP = "java.util.HashMap"; + String JAVA_UTIL_HASH_SET = "java.util.HashSet"; + String JAVA_UTIL_LIST = "java.util.List"; + String JAVA_UTIL_MAP = "java.util.Map"; + String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry"; + String JAVA_UTIL_OBJECTS = "java.util.Objects"; + String JAVA_UTIL_OPTIONAL = "java.util.Optional"; + String JAVA_UTIL_PROPERTIES = "java.util.Properties"; + String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle"; + String JAVA_UTIL_QUEUE = "java.util.Queue"; + String JAVA_UTIL_SET = "java.util.Set"; + String JAVA_UTIL_SORTED_SET = "java.util.SortedSet"; String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream"; String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream"; String JAVA_UTIL_STREAM_INT_STREAM = "java.util.stream.IntStream"; String JAVA_UTIL_STREAM_LONG_STREAM = "java.util.stream.LongStream"; String JAVA_UTIL_STREAM_DOUBLE_STREAM = "java.util.stream.DoubleStream"; String JAVA_UTIL_STREAM_COLLECTORS = "java.util.stream.Collectors"; - String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate"; - String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer"; - String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function"; - String JAVA_UTIL_FUNCTION_BIFUNCTION = "java.util.function.BiFunction"; + String JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated"; } \ No newline at end of file From 4b855761af5fda70410ebdbc2d7c770b87134fb4 Mon Sep 17 00:00:00 2001 From: UNV Date: Tue, 6 May 2025 23:11:45 +0300 Subject: [PATCH 3/3] Replacing strings with fully-qualified class names with JavaClassNames constant. Added several new often used class names to JavaClassNames. --- .../impl/analysis/HighlightMethodUtil.java | 1 - .../daemon/impl/analysis/HighlightUtil.java | 2 +- .../impl/analysis/JavaHighlightUtil.java | 3 +- .../dataFlow/ControlFlowAnalyzer.java | 11 +- .../dataFlow/CustomMethodHandlers.java | 3 +- .../dataFlow/HardcodedContracts.java | 3 +- ...tendsConcreteCollectionInspectionBase.java | 3 +- .../com/siyeh/ig/psiutils/ClassUtils.java | 2 +- .../siyeh/ig/psiutils/CollectionUtils.java | 18 +-- .../com/siyeh/ig/psiutils/EqualityCheck.java | 3 +- .../siyeh/ig/psiutils/ExpressionUtils.java | 4 +- .../com/siyeh/ig/psiutils/MethodUtils.java | 4 +- .../siyeh/ig/psiutils/SideEffectChecker.java | 3 +- .../java/com/siyeh/ig/psiutils/TypeUtils.java | 16 ++- .../FieldNotUsedInToStringInspection.java | 5 +- .../java/generate/psi/PsiAdapter.java | 9 +- .../imports/StaticImportInspectionTest.java | 3 +- ...icFieldLockedOnInstanceInspectionTest.java | 3 +- .../impl/cache/JavaDependencyProcessor.java | 4 +- .../compiler/impl/cache/JavaMakeUtil.java | 5 +- .../expression/BoxingEvaluator.java | 123 +++++++++--------- .../impl/settings/NodeRendererSettings.java | 2 +- .../ui/breakpoints/ExceptionBreakpoint.java | 3 +- .../JavaExceptionBreakpointType.java | 7 +- .../ui/tree/render/FileObjectRenderer.java | 3 +- .../config/MethodParameterInjection.java | 5 +- .../intellij/java/language/psi/PsiType.java | 18 +-- .../psi/util/IsConstantExpressionVisitor.java | 2 +- .../psi/util/PsiConcatenationUtil.java | 13 +- .../language/psi/util/TypeConversionUtil.java | 20 +-- .../language/module/util/JavaClassNames.java | 8 +- .../impl/psi/impl/PsiClassImplUtil.java | 2 +- .../language/impl/psi/impl/PsiImplUtil.java | 9 +- .../impl/psi/impl/compiled/ClsFieldImpl.java | 5 +- .../psi/impl/source/PsiEnumConstantImpl.java | 5 +- .../impl/psi/impl/source/PsiFieldImpl.java | 3 +- .../tree/java/PsiLocalVariableImpl.java | 3 +- .../properties/impl/i18n/I18nInspection.java | 4 +- .../codeInsight/ExpectedTypesProvider.java | 6 +- .../CollectionsUtilityMethodsProvider.java | 5 +- .../impl/quickfix/CreateClassFromNewFix.java | 2 +- .../quickfix/CreateClassFromUsageBaseFix.java | 2 +- .../quickfix/RemoveUnusedVariableUtil.java | 3 +- .../ReplaceAddAllArrayToCollectionFix.java | 3 +- .../wordSelection/LiteralSelectioner.java | 3 +- .../JavaWithTryCatchSurrounder.java | 3 +- .../impl/AddOverrideAnnotationAction.java | 9 +- .../macro/IterableComponentTypeMacro.java | 3 +- .../template/macro/IterableVariableMacro.java | 2 +- ...ossibleHeapPollutionVarargsInspection.java | 7 +- .../impl/generate/GenerateToStringWorker.java | 3 +- .../BaseSmartPointerPsiNode.java | 10 +- .../bugs/ImplicitArrayToStringInspection.java | 6 +- .../bugs/MathRandomCastToIntInspection.java | 3 +- ...atchedCollectionQueryUpdateInspection.java | 13 +- .../ig/bugs/ParameterClassCheckVisitor.java | 4 +- ...ionForUnavailableAnnotationInspection.java | 3 +- .../ig/classlayout/EmptyClassInspection.java | 3 +- .../FinalPrivateMethodInspection.java | 3 +- .../MissingOverrideAnnotationInspection.java | 3 +- .../ReturnOfCollectionFieldInspection.java | 16 +-- .../BadExceptionCaughtInspection.java | 7 +- .../BadExceptionDeclaredInspection.java | 22 ++-- .../BadExceptionThrownInspection.java | 17 +-- .../ThrowsRuntimeExceptionInspection.java | 3 +- ...thodOverridesAbstractMethodInspection.java | 3 +- .../StringConcatenationInspection.java | 3 +- .../ig/jdk/VarargParameterInspection.java | 3 +- ...tatedMethodInJUnit3TestCaseInspection.java | 3 +- ...erCountMatchesArgumentCountInspection.java | 3 +- .../numeric/ConstantMathCallInspection.java | 5 +- .../NonReproducibleMathCallInspection.java | 3 +- ...AsListWithZeroOrOneArgumentInspection.java | 3 +- .../performance/CollectionsListSettings.java | 8 +- .../MapReplaceableByEnumMapInspection.java | 2 +- .../MethodMayBeStaticInspection.java | 27 ++-- .../java/impl/ig/psiutils/FormatUtils.java | 4 +- ...lizableClassInSecureContextInspection.java | 3 +- ...lizableClassInSecureContextInspection.java | 3 +- ...ecureRandomNumberGenerationInspection.java | 3 +- ...thoutPublicNoArgConstructorInspection.java | 3 +- ...ngBufferReplaceableByStringInspection.java | 2 +- ...ecessaryCallToStringValueOfInspection.java | 6 +- .../UnnecessaryToStringCallInspection.java | 6 +- ...SafeStaticFieldFromInstanceInspection.java | 5 +- .../ThreadWithDefaultRunMethodInspection.java | 7 +- .../adapter/AdapterToListenerIntention.java | 3 +- .../chartostring/CharToStringPredicate.java | 6 +- .../chartostring/StringToCharPredicate.java | 12 +- ...oncatenatedStringToClipboardIntention.java | 3 +- ...oncatenationWithFormatStringIntention.java | 5 +- .../constant/ConstantExpressionPredicate.java | 5 +- .../ConstantSubexpressionPredicate.java | 3 +- ...onvertJUnit3TestCaseToJUnit4Intention.java | 3 +- .../beanProperties/CreateBeanPropertyFix.java | 3 +- .../impl/source/javadoc/ExceptionTagInfo.java | 8 +- .../JavaChangeSignatureDialog.java | 3 +- .../extractclass/ExtractClassProcessor.java | 9 +- .../InheritanceToDelegationProcessor.java | 2 +- .../memberPushDown/PushDownProcessor.java | 3 +- .../naming/AutomaticVariableRenamer.java | 3 +- .../TurnRefsToSuperProcessorBase.java | 2 +- .../deductive/builder/SystemBuilder.java | 2 +- .../deductive/resolver/BindingFactory.java | 18 +-- .../TypeMigrationStatementProcessor.java | 3 +- .../daemon/GenericsHighlightingTest.java | 3 +- .../codeInsight/daemon/ImportHelperTest.java | 27 ++-- .../codeInsight/template/MacroParserTest.java | 3 +- .../intellij/psi/ClsRepositoryUseTest.java | 16 +-- .../com/intellij/psi/CodeFragmentsTest.java | 3 +- .../com/intellij/psi/ConstantValuesTest.java | 3 +- .../intellij/psi/Src15RepositoryUseTest.java | 13 +- .../intellij/psi/SrcRepositoryUseTest.java | 14 +- .../java_/com/intellij/psi/TypesTest.java | 9 +- .../tree/java/ExtendsBoundListTest.java | 6 +- .../psi/resolve/ResolveClassTest.java | 3 +- .../psi/resolve/ResolveMethod15Test.java | 10 +- .../psi/resolve/TypeInferenceTest.java | 8 +- .../intellij/psi/util/PropertyUtilTest.java | 4 +- .../ChangeSignaturePropagationTest.java | 4 +- .../refactoring/ChangeSignatureTest.java | 9 +- .../intellij/refactoring/CopyClassTest.java | 3 +- .../refactoring/IntroduceVariableTest.java | 44 +++---- .../ChangeClassSignatureTest.java | 7 +- .../refactoring/migration/MigrationTest.java | 3 +- 125 files changed, 487 insertions(+), 410 deletions(-) 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 e1e1190d2c..52d90c9881 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 @@ -39,7 +39,6 @@ import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalQuickFixOnPsiElementAsIntentionAdapter; import consulo.language.editor.intention.IntentionAction; -import consulo.language.editor.intention.QuickFixAction; import consulo.language.editor.intention.QuickFixActionRegistrar; import consulo.language.editor.intention.UnresolvedReferenceQuickFixProvider; import consulo.language.editor.localize.DaemonLocalize; 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 a41031dc46..da9219588a 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 @@ -3398,7 +3398,7 @@ public static HighlightInfo.Builder checkMustBeThrowable( return null; } PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory(); - PsiClassType throwable = factory.createTypeByFQClassName("java.lang.Throwable", context.getResolveScope()); + PsiClassType throwable = factory.createTypeByFQClassName(JavaClassNames.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/JavaHighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java index a0a2914105..6f3925ab54 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java @@ -34,7 +34,8 @@ public class JavaHighlightUtil { public static boolean isSerializable(@Nonnull PsiClass aClass) { PsiManager manager = aClass.getManager(); - PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.io.Serializable", aClass.getResolveScope()); + PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject()) + .findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope()); return serializableClass != null && aClass.isInheritor(serializableClass, true); } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java index 894c34825f..e99e74ac8e 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java @@ -23,6 +23,7 @@ import com.intellij.java.language.psi.util.TypeConversionUtil; import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.psiutils.*; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.ImplicitUsageProvider; import consulo.language.psi.PsiElement; @@ -1258,8 +1259,9 @@ public void visitArrayAccessExpression(PsiArrayAccessExpression expression) { if (toPush == null) { toPush = myFactory.getObjectType(expression.getType(), Nullability.UNKNOWN); } - DfaControlTransferValue transfer = - shouldHandleException() ? myFactory.controlTransfer(myExceptionCache.get("java.lang.ArrayIndexOutOfBoundsException"), myTrapStack) : null; + DfaControlTransferValue transfer = shouldHandleException() + ? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack) + : null; addInstruction(new ArrayAccessInstruction(toPush, expression, transfer)); addNullCheck(expression); finishElement(expression); @@ -2022,8 +2024,9 @@ public void visitTypeCastExpression(PsiTypeCastExpression castExpression) { final PsiTypeElement typeElement = castExpression.getCastType(); if (typeElement != null && operand != null && operand.getType() != null && !(typeElement.getType() instanceof PsiPrimitiveType)) { - DfaControlTransferValue transfer = - shouldHandleException() ? myFactory.controlTransfer(myExceptionCache.get("java.lang.ClassCastException"), myTrapStack) : null; + DfaControlTransferValue transfer = shouldHandleException() + ? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack) + : null; addInstruction(new TypeCastInstruction(castExpression, operand, typeElement.getType(), transfer)); } finishElement(castExpression); diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java index 8dde896d97..afdbed4117 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java @@ -18,6 +18,7 @@ import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.psiutils.TypeUtils; import consulo.application.util.CachedValueProvider; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.util.LanguageCachedValueUtil; import consulo.util.collection.ArrayUtil; import consulo.util.lang.reflect.ReflectionUtil; @@ -50,7 +51,7 @@ final class CustomMethodHandlers { staticCall(JAVA_LANG_FLOAT, "toString", "toHexString").parameterTypes("float"), staticCall(JAVA_LANG_BYTE, "toString").parameterTypes("byte"), staticCall(JAVA_LANG_SHORT, "toString").parameterTypes("short"), - staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes("java.lang.String"), + staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes(JavaClassNames.JAVA_LANG_STRING), staticCall(JAVA_LANG_INTEGER, "compare", "compareUnsigned").parameterTypes("int", "int"), staticCall(JAVA_LANG_LONG, "compare", "compareUnsigned").parameterTypes("long", "long"), staticCall(JAVA_LANG_DOUBLE, "compare").parameterTypes("double", "double"), diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java index 260eb65b38..12f5301f5a 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,6 +10,7 @@ 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; @@ -527,7 +528,7 @@ public static MutationSignature getHardcodedMutation(PsiMethod method) { } String name = method.getName(); - if ("java.util.Objects".equals(className) && "requireNonNull".equals(name)) { + if (JavaClassNames.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/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java b/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java index b96f4b0181..86077c1cd2 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java @@ -21,6 +21,7 @@ import com.siyeh.ig.psiutils.CollectionUtils; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; public abstract class ExtendsConcreteCollectionInspectionBase extends BaseInspection { @@ -64,7 +65,7 @@ public void visitClass(@Nonnull PsiClass aClass) { final String qualifiedName = superClass.getQualifiedName(); if ("java.util.LinkedHashMap".equals(qualifiedName)) { final PsiMethod[] methods = aClass.findMethodsByName("removeEldestEntry", false); - final PsiClassType entryType = TypeUtils.getType("java.util.Map.Entry", aClass); + final PsiClassType entryType = TypeUtils.getType(JavaClassNames.JAVA_UTIL_MAP_ENTRY, aClass); for (PsiMethod method : methods) { if (!PsiType.BOOLEAN.equals(method.getReturnType())) { continue; diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java index 3fcbaa7496..e515357a5a 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java @@ -78,7 +78,7 @@ public class ClassUtils { immutableTypes.add("java.math.MathContext"); immutableTypes.add("java.nio.channels.FileLock"); immutableTypes.add("java.nio.charset.Charset"); - immutableTypes.add("java.io.File"); + immutableTypes.add(JavaClassNames.JAVA_IO_FILE); immutableTypes.add("java.net.URI"); immutableTypes.add("java.util.regex.Pattern"); } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java index 562f92fc21..fe0d5b80e5 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java @@ -47,7 +47,7 @@ public class CollectionUtils { allCollectionClassesAndInterfaces.add("java.util.AbstractQueue"); allCollectionClassesAndInterfaces.add("java.util.AbstractSequentialList"); allCollectionClassesAndInterfaces.add("java.util.AbstractSet"); - allCollectionClassesAndInterfaces.add("java.util.ArrayList"); + allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_ARRAY_LIST); allCollectionClassesAndInterfaces.add("java.util.ArrayDeque"); allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_COLLECTION); allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_DICTIONARY); @@ -62,10 +62,10 @@ public class CollectionUtils { allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_LIST); allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_MAP); allCollectionClassesAndInterfaces.add("java.util.PriorityQueue"); - allCollectionClassesAndInterfaces.add("java.util.Queue"); + allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_QUEUE); allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SET); - allCollectionClassesAndInterfaces.add("java.util.SortedMap"); - allCollectionClassesAndInterfaces.add("java.util.SortedSet"); + allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SORTED_MAP); + allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SORTED_SET); allCollectionClassesAndInterfaces.add("java.util.Stack"); allCollectionClassesAndInterfaces.add("java.util.TreeMap"); allCollectionClassesAndInterfaces.add("java.util.TreeSet"); @@ -74,7 +74,7 @@ public class CollectionUtils { allCollectionClassesAndInterfaces.add("java.util.concurrent.ArrayBlockingQueue"); allCollectionClassesAndInterfaces.add("java.util.concurrent.BlockingDeque"); allCollectionClassesAndInterfaces.add("java.util.concurrent.BlockingQueue"); - allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentHashMap"); + allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP); allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentLinkedDeque"); allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentLinkedQueue"); allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentMap"); @@ -120,17 +120,17 @@ public class CollectionUtils { s_interfaceForCollection.put("TreeSet", "SortedSet"); s_interfaceForCollection.put("Vector", "List"); s_interfaceForCollection.put("WeakHashMap", "Map"); - s_interfaceForCollection.put("java.util.ArrayList", JavaClassNames.JAVA_UTIL_LIST); + s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_ARRAY_LIST, JavaClassNames.JAVA_UTIL_LIST); s_interfaceForCollection.put("java.util.EnumMap", JavaClassNames.JAVA_UTIL_MAP); s_interfaceForCollection.put("java.util.EnumSet", JavaClassNames.JAVA_UTIL_SET); - s_interfaceForCollection.put("java.util.HashMap", JavaClassNames.JAVA_UTIL_MAP); - s_interfaceForCollection.put("java.util.HashSet", JavaClassNames.JAVA_UTIL_SET); + s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_HASH_MAP, JavaClassNames.JAVA_UTIL_MAP); + s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_HASH_SET, JavaClassNames.JAVA_UTIL_SET); s_interfaceForCollection.put("java.util.Hashtable", JavaClassNames.JAVA_UTIL_MAP); s_interfaceForCollection.put("java.util.IdentityHashMap", JavaClassNames.JAVA_UTIL_MAP); s_interfaceForCollection.put("java.util.LinkedHashMap", JavaClassNames.JAVA_UTIL_MAP); s_interfaceForCollection.put("java.util.LinkedHashSet", JavaClassNames.JAVA_UTIL_SET); s_interfaceForCollection.put("java.util.LinkedList", JavaClassNames.JAVA_UTIL_LIST); - s_interfaceForCollection.put("java.util.PriorityQueue", "java.util.Queue"); + s_interfaceForCollection.put("java.util.PriorityQueue", JavaClassNames.JAVA_UTIL_QUEUE); s_interfaceForCollection.put("java.util.TreeMap", JavaClassNames.JAVA_UTIL_MAP); s_interfaceForCollection.put("java.util.TreeSet", JavaClassNames.JAVA_UTIL_SET); s_interfaceForCollection.put("java.util.Vector", JavaClassNames.JAVA_UTIL_LIST); diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java index e70385f694..7cd5baa5c0 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java @@ -7,6 +7,7 @@ import com.intellij.java.language.psi.PsiReferenceExpression; import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.ig.callMatcher.CallMatcher; +import consulo.java.language.module.util.JavaClassNames; import consulo.util.collection.ArrayUtil; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Contract; @@ -18,7 +19,7 @@ */ public class EqualityCheck { private static final CallMatcher OBJECT_EQUALS = CallMatcher.anyOf( - CallMatcher.staticCall("java.util.Objects", "equals").parameterCount(2), + CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_OBJECTS, "equals").parameterCount(2), CallMatcher.staticCall("com.google.common.base.Objects", "equal").parameterCount(2)); private final @Nonnull diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java index 8d56c66027..f153dba7d5 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpressionUtils.java @@ -50,8 +50,8 @@ import static consulo.util.lang.ObjectUtil.tryCast; public class ExpressionUtils { - static final Set STRING_BUILDER_CLASS_NAMES = Set.of("java.lang.StringBuilder", "java.lang.StringBuffer"); - static final Set PRINT_CLASS_NAMES = Set.of("java.io.PrintStream", "java.io.PrintWriter"); + static final Set STRING_BUILDER_CLASS_NAMES = Set.of(JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER); + static final Set PRINT_CLASS_NAMES = Set.of(JavaClassNames.JAVA_IO_PRINT_STREAM, JavaClassNames.JAVA_IO_PRINT_WRITER); static final Set PRINT_METHOD_NAMES = Set.of("print", "println"); static final Set SLF4J_LOGGING_CLASS_NAMES = Set.of("org.slf4j.Logger"); static final Set SLF4J_LOGGING_METHOD_NAMES = Set.of("trace", "debug", "info", "warn", "error"); diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java index 13c25710ac..490aa1f857 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodUtils.java @@ -61,7 +61,7 @@ public static boolean isCompareToIgnoreCase(@Nullable PsiMethod method) { return false; } final PsiClassType stringType = TypeUtils.getStringType(method); - return methodMatches(method, "java.lang.String", PsiType.INT, "compareToIgnoreCase", stringType); + return methodMatches(method, JavaClassNames.JAVA_LANG_STRING, PsiType.INT, "compareToIgnoreCase", stringType); } @Contract("null -> false") @@ -98,7 +98,7 @@ public static boolean isEqualsIgnoreCase(@Nullable PsiMethod method) { return false; } final PsiClassType stringType = TypeUtils.getStringType(method); - return methodMatches(method, "java.lang.String", PsiType.BOOLEAN, HardcodedMethodConstants.EQUALS_IGNORE_CASE, stringType); + return methodMatches(method, JavaClassNames.JAVA_LANG_STRING, PsiType.BOOLEAN, HardcodedMethodConstants.EQUALS_IGNORE_CASE, stringType); } /** diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/SideEffectChecker.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/SideEffectChecker.java index 9c0ee4d98e..2760d61ccc 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/SideEffectChecker.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/SideEffectChecker.java @@ -21,6 +21,7 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PropertyUtil; import com.intellij.java.language.psi.util.PsiUtil; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiDirectory; import consulo.language.psi.PsiElement; @@ -332,7 +333,7 @@ private static boolean isSideEffectFreeConstructor(@Nonnull PsiNewExpression new // all Throwable descendants from java.lang are side effects free if (CommonClassNames.DEFAULT_PACKAGE.equals(packageName) || "java.io".equals(packageName)) { - PsiClass throwableClass = JavaPsiFacade.getInstance(aClass.getProject()).findClass("java.lang.Throwable", aClass.getResolveScope()); + PsiClass throwableClass = JavaPsiFacade.getInstance(aClass.getProject()).findClass(JavaClassNames.JAVA_LANG_THROWABLE, aClass.getResolveScope()); if (throwableClass != null && InheritanceUtil.isInheritorOrSelf(aClass, throwableClass, true)) { return true; } diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java index 04995ebb6a..31651660e2 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/TypeUtils.java @@ -245,15 +245,19 @@ public static PsiType unaryNumericPromotion(PsiType type) { if (type == null) { return null; } - if (type.equalsToText("java.lang.Byte") || type.equalsToText("java.lang.Short") || - type.equalsToText("java.lang.Character") || type.equalsToText("java.lang.Integer") || - type.equals(PsiType.BYTE) || type.equals(PsiType.SHORT) || type.equals(PsiType.CHAR)) { + if (type.equalsToText(JavaClassNames.JAVA_LANG_BYTE) + || type.equalsToText(JavaClassNames.JAVA_LANG_SHORT) + || type.equalsToText(JavaClassNames.JAVA_LANG_CHARACTER) + || type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER) + || type.equals(PsiType.BYTE) + || type.equals(PsiType.SHORT) + || type.equals(PsiType.CHAR)) { return PsiType.INT; - } else if (type.equalsToText("java.lang.Long")) { + } else if (type.equalsToText(JavaClassNames.JAVA_LANG_LONG)) { return PsiType.LONG; - } else if (type.equalsToText("java.lang.Float")) { + } else if (type.equalsToText(JavaClassNames.JAVA_LANG_FLOAT)) { return PsiType.FLOAT; - } else if (type.equalsToText("java.lang.Double")) { + } else if (type.equalsToText(JavaClassNames.JAVA_LANG_DOUBLE)) { return PsiType.DOUBLE; } return type; diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java index 24d5e7d437..c19a5cb35e 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java @@ -18,6 +18,7 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PropertyUtil; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemHighlightType; import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.psi.PsiElement; @@ -158,10 +159,10 @@ private boolean usesReflection(PsiMethod method) { } @NonNls final String qualifiedName = containingClass.getQualifiedName(); if ("getDeclaredFields".equals(name)) { - return "java.lang.Class".equals(qualifiedName); + return JavaClassNames.JAVA_LANG_CLASS.equals(qualifiedName); } else if ("toString".equals(name)) { return "org.apache.commons.lang.builder.ReflectionToStringBuilder".equals(qualifiedName) || - "java.util.Objects".equals(qualifiedName); + JavaClassNames.JAVA_UTIL_OBJECTS.equals(qualifiedName); } return false; } diff --git a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java index f8a3b29a0d..8bd7ff4acd 100644 --- a/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java +++ b/java-analysis-impl/src/main/java/org/jetbrains/java/generate/psi/PsiAdapter.java @@ -23,6 +23,7 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PropertyUtil; import com.intellij.java.language.psi.util.PsiUtil; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.psi.PsiComment; import consulo.language.psi.PsiElement; @@ -134,7 +135,7 @@ public static boolean isStringArrayType(PsiType type) { * @return true if it's a Collection type. */ public static boolean isCollectionType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, "java.util.Collection"); + return isTypeOf(factory, type, JAVA_UTIL_COLLECTION); } /** @@ -200,7 +201,7 @@ public static boolean isObjectType(PsiElementFactory factory, PsiType type) { * @return true if it's a Date type. */ public static boolean isDateType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, "java.util.Date"); + return isTypeOf(factory, type, JAVA_UTIL_DATE); } /** @@ -211,7 +212,7 @@ public static boolean isDateType(PsiElementFactory factory, PsiType type) { * @return true if it's a Calendar type. */ public static boolean isCalendarType(PsiElementFactory factory, PsiType type) { - return isTypeOf(factory, type, "java.util.Calendar"); + return isTypeOf(factory, type, JAVA_UTIL_CALENDAR); } /** @@ -246,7 +247,7 @@ public static boolean isNumericType(PsiElementFactory factory, PsiType type) { return "byte".equals(s) || "double".equals(s) || "float".equals(s) || "int".equals(s) || "long".equals(s) || "short".equals(s); } else { // test for Object type of numeric - return isTypeOf(factory, type, "java.lang.Number"); + return isTypeOf(factory, type, JAVA_LANG_NUMBER); } } diff --git a/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java b/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java index 91b66792d0..ed707b21fc 100644 --- a/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java +++ b/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java @@ -1,12 +1,13 @@ package com.siyeh.ig.imports; import com.siyeh.ig.IGInspectionTestCase; +import consulo.java.language.module.util.JavaClassNames; public class StaticImportInspectionTest extends IGInspectionTestCase { public void test() throws Exception { final StaticImportInspection tool = new StaticImportInspection(); - tool.allowedClasses.add("java.util.Map"); + tool.allowedClasses.add(JavaClassNames.JAVA_UTIL_MAP); doTest("com/siyeh/igtest/imports/static_import", tool); } diff --git a/java-analysis-impl/testsrc/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspectionTest.java b/java-analysis-impl/testsrc/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspectionTest.java index f1ec35f229..5af36b1deb 100644 --- a/java-analysis-impl/testsrc/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspectionTest.java +++ b/java-analysis-impl/testsrc/com/siyeh/ig/threading/AccessToStaticFieldLockedOnInstanceInspectionTest.java @@ -1,12 +1,13 @@ package com.siyeh.ig.threading; import com.siyeh.ig.IGInspectionTestCase; +import consulo.java.language.module.util.JavaClassNames; public class AccessToStaticFieldLockedOnInstanceInspectionTest extends IGInspectionTestCase { public void test() throws Exception { final AccessToStaticFieldLockedOnInstanceInspection tool = new AccessToStaticFieldLockedOnInstanceInspection(); - tool.ignoredClasses.add("java.util.List"); + tool.ignoredClasses.add(JavaClassNames.JAVA_UTIL_LIST); doTest("com/siyeh/igtest/threading/access_to_static_field_locked_on_instance_data", tool); } } \ No newline at end of file diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java index 04b3591ad0..951742b26c 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaDependencyProcessor.java @@ -482,8 +482,8 @@ private boolean hasAnnotationSemanticsChanged(final Cache oldCache, final Cache final IntObjectMap oldAnnotations = fetchAllAnnotations(oldCache); final IntObjectMap newAnnotations = fetchAllAnnotations(newCache); // filter certain known annotation which are processed separately - final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId("java.lang.annotation.Retention"); - final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId("java.lang.annotation.Target"); + final int retentionAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION); + final int targetAnnotation = myJavaDependencyCache.getSymbolTable().getId(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET); oldAnnotations.remove(retentionAnnotation); oldAnnotations.remove(targetAnnotation); newAnnotations.remove(retentionAnnotation); diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java index f096586064..9a969c4181 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/JavaMakeUtil.java @@ -28,6 +28,7 @@ import consulo.compiler.ModuleCompilerPathsManager; import consulo.compiler.util.MakeUtil; import consulo.internal.org.objectweb.asm.Opcodes; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.content.ProductionContentFolderTypeProvider; import consulo.logging.Logger; import consulo.module.Module; @@ -177,7 +178,7 @@ public static int getAnnotationTargets(final Cache cache, final int annotationQName, final SymbolTable symbolTable) throws CacheCorruptedException { final AnnotationConstantValue - targetAnnotation = findAnnotation("java.lang.annotation.Target", cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); + targetAnnotation = findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_TARGET, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); if (targetAnnotation == null) { return AnnotationTargets.ALL; // all program elements are annotation targets by default } @@ -223,7 +224,7 @@ public static int getAnnotationRetentionPolicy( final SymbolTable symbolTable ) throws CacheCorruptedException { final AnnotationConstantValue retentionPolicyAnnotation = - findAnnotation("java.lang.annotation.Retention", cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); + findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION, cache.getRuntimeVisibleAnnotations(annotationQName), symbolTable); if (retentionPolicyAnnotation == null) { return RetentionPolicies.CLASS; // default retention policy } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java index d60095e1f5..5dd77a1218 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/evaluation/expression/BoxingEvaluator.java @@ -25,76 +25,83 @@ import com.intellij.java.debugger.engine.evaluation.expression.Modifier; import consulo.internal.com.sun.jdi.*; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nullable; /** * @author Eugene Zhuravlev - * Date: Feb 8, 2010 + * @since 2010-02-08 */ -public class BoxingEvaluator implements Evaluator{ - private final Evaluator myOperand; +public class BoxingEvaluator implements Evaluator { + private final Evaluator myOperand; - public BoxingEvaluator(Evaluator operand) { - myOperand = DisableGC.create(operand); - } - - public Object evaluate(EvaluationContextImpl context) throws EvaluateException { - final Object result = myOperand.evaluate(context); - if (result == null || result instanceof ObjectReference) { - return result; + public BoxingEvaluator(Evaluator operand) { + myOperand = DisableGC.create(operand); } - if (result instanceof BooleanValue) { - return convertToWrapper(context, (BooleanValue)result, "java.lang.Boolean"); - } - if (result instanceof ByteValue) { - return convertToWrapper(context, (ByteValue)result, "java.lang.Byte"); - } - if (result instanceof CharValue) { - return convertToWrapper(context, (CharValue)result, "java.lang.Character"); - } - if (result instanceof ShortValue) { - return convertToWrapper(context, (ShortValue)result, "java.lang.Short"); - } - if (result instanceof IntegerValue) { - return convertToWrapper(context, (IntegerValue)result, "java.lang.Integer"); - } - if (result instanceof LongValue) { - return convertToWrapper(context, (LongValue)result, "java.lang.Long"); - } - if (result instanceof FloatValue) { - return convertToWrapper(context, (FloatValue)result, "java.lang.Float"); + @Override + public Object evaluate(EvaluationContextImpl context) throws EvaluateException { + Object result = myOperand.evaluate(context); + if (result == null || result instanceof ObjectReference) { + return result; + } + + if (result instanceof BooleanValue booleanValue) { + return convertToWrapper(context, booleanValue, JavaClassNames.JAVA_LANG_BOOLEAN); + } + if (result instanceof ByteValue byteValue) { + return convertToWrapper(context, byteValue, JavaClassNames.JAVA_LANG_BYTE); + } + if (result instanceof CharValue charValue) { + return convertToWrapper(context, charValue, JavaClassNames.JAVA_LANG_CHARACTER); + } + if (result instanceof ShortValue shortValue) { + return convertToWrapper(context, shortValue, JavaClassNames.JAVA_LANG_SHORT); + } + if (result instanceof IntegerValue integerValue) { + return convertToWrapper(context, integerValue, JavaClassNames.JAVA_LANG_INTEGER); + } + if (result instanceof LongValue longValue) { + return convertToWrapper(context, longValue, JavaClassNames.JAVA_LANG_LONG); + } + if (result instanceof FloatValue floatValue) { + return convertToWrapper(context, floatValue, JavaClassNames.JAVA_LANG_FLOAT); + } + if (result instanceof DoubleValue doubleValue) { + return convertToWrapper(context, doubleValue, JavaClassNames.JAVA_LANG_DOUBLE); + } + throw new EvaluateException("Cannot perform boxing conversion for a value of type " + ((Value)result).type().name()); } - if (result instanceof DoubleValue) { - return convertToWrapper(context, (DoubleValue)result, "java.lang.Double"); + + @Nullable + @Override + public Modifier getModifier() { + return null; } - throw new EvaluateException("Cannot perform boxing conversion for a value of type " + ((Value)result).type().name()); - } - @Nullable - public Modifier getModifier() { - return null; - } + private static Value convertToWrapper(EvaluationContextImpl context, PrimitiveValue value, String wrapperTypeName) + throws EvaluateException { + DebugProcessImpl process = context.getDebugProcess(); + ClassType wrapperClass = (ClassType)process.findClass(context, wrapperTypeName, null); + String methodSignature = "(" + JVMNameUtil.getPrimitiveSignature(value.type().name()) + ")" + + "L" + wrapperTypeName.replace('.', '/') + ";"; - private static Value convertToWrapper(EvaluationContextImpl context, PrimitiveValue value, String wrapperTypeName) throws - EvaluateException { - final DebugProcessImpl process = context.getDebugProcess(); - final ClassType wrapperClass = (ClassType)process.findClass(context, wrapperTypeName, null); - final String methodSignature = "(" + JVMNameUtil.getPrimitiveSignature(value.type().name()) + ")L" + wrapperTypeName.replace('.', '/') + ";"; + List methods = wrapperClass.methodsByName("valueOf", methodSignature); + if (methods.size() == 0) { // older JDK version + methods = wrapperClass.methodsByName("", methodSignature); + } + if (methods.size() == 0) { + throw new EvaluateException( + "Cannot construct wrapper object for value of type " + value.type() + + ": Unable to find either valueOf() or constructor method" + ); + } - List methods = wrapperClass.methodsByName("valueOf", methodSignature); - if (methods.size() == 0) { // older JDK version - methods = wrapperClass.methodsByName("", methodSignature); - } - if (methods.size() == 0) { - throw new EvaluateException("Cannot construct wrapper object for value of type " + value.type() + ": Unable to find either valueOf() or constructor method"); - } - - final Method factoryMethod = methods.get(0); + Method factoryMethod = methods.get(0); + + List args = new ArrayList<>(); + args.add(value); - final ArrayList args = new ArrayList(); - args.add(value); - - return process.invokeMethod(context, wrapperClass, factoryMethod, args); - } + return process.invokeMethod(context, wrapperClass, factoryMethod, args); + } } diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java index 9b03a48128..5ff26441ff 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NodeRendererSettings.java @@ -111,7 +111,7 @@ public class NodeRendererSettings implements PersistentStateComponent { new ListObjectRenderer(this), createCompoundReferenceRenderer( "Collection", - "java.util.Collection", + JavaClassNames.JAVA_UTIL_COLLECTION, createLabelRenderer(" size = ", "size()", null), createExpressionChildrenRenderer("toArray()", "!isEmpty()") ) diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java index cbf9cbbf5c..fa6c843bde 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/ExceptionBreakpoint.java @@ -43,6 +43,7 @@ import consulo.internal.com.sun.jdi.event.ExceptionEvent; import consulo.internal.com.sun.jdi.event.LocatableEvent; import consulo.internal.com.sun.jdi.request.ExceptionRequest; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiElement; import consulo.language.psi.scope.GlobalSearchScope; @@ -184,7 +185,7 @@ protected ObjectReference getThisObject(SuspendContextImpl context, LocatableEve @Override public String getEventMessage(LocatableEvent event) { - String exceptionName = (getQualifiedName() != null) ? getQualifiedName() : "java.lang.Throwable"; + String exceptionName = (getQualifiedName() != null) ? getQualifiedName() : JavaClassNames.JAVA_LANG_THROWABLE; String threadName = null; if (event instanceof ExceptionEvent) { ExceptionEvent exceptionEvent = (ExceptionEvent) event; diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java index b5ada1a80b..fcab26fc13 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/JavaExceptionBreakpointType.java @@ -30,6 +30,7 @@ import consulo.execution.debug.breakpoint.XBreakpoint; import consulo.execution.debug.breakpoint.ui.XBreakpointCustomPropertiesPanel; import consulo.execution.debug.icon.ExecutionDebugIconGroup; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.scope.GlobalSearchScope; import consulo.project.Project; import consulo.ui.image.Image; @@ -110,10 +111,10 @@ public XBreakpoint createDefaultBreakpoint(@N @Override public XBreakpoint addBreakpoint(final Project project, JComponent parentComponent) { final PsiClass throwableClass = - JavaPsiFacade.getInstance(project).findClass("java.lang.Throwable", GlobalSearchScope.allScope(project)); + JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(project)); TreeClassChooser chooser = - TreeClassChooserFactory.getInstance(project).createInheritanceClassChooser(DebuggerBundle.message("add.exception" + - ".breakpoint.classchooser.title"), + TreeClassChooserFactory.getInstance(project).createInheritanceClassChooser( + DebuggerBundle.message("add.exception.breakpoint.classchooser.title"), GlobalSearchScope.allScope(project), throwableClass, true, diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java index 2bdd6dffa5..9e0ec24d58 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/tree/render/FileObjectRenderer.java @@ -17,6 +17,7 @@ import com.intellij.java.debugger.impl.settings.NodeRendererSettings; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import jakarta.inject.Inject; /** @@ -27,7 +28,7 @@ public class FileObjectRenderer extends ToStringBasedRenderer { @Inject public FileObjectRenderer(final NodeRendererSettings rendererSettings) { super(rendererSettings, "File", null, NodeRendererSettings.createExpressionChildrenRenderer("listFiles()", null)); - setClassName("java.io.File"); + setClassName(JavaClassNames.JAVA_IO_FILE); setEnabled(true); } } \ No newline at end of file diff --git a/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java b/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java index 00ee830785..cc30b10ff6 100644 --- a/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java +++ b/java-intellilang/src/main/java/consulo/java/impl/intelliLang/config/MethodParameterInjection.java @@ -18,6 +18,7 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiFormatUtil; import consulo.java.impl.intelliLang.JavaLanguageInjectionSupport; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.inject.advanced.BaseInjection; import consulo.language.inject.advanced.InjectionPlace; import consulo.language.inject.advanced.pattern.PatternCompiler; @@ -219,10 +220,10 @@ public static boolean isInjectable(@Nullable final PsiType type, final Project p if (project.isDefault()) { @NonNls final String text = type.getPresentableText(); if (text == null) return false; - return text.equals("java.lang.String") || text.equals("java.lang.String...") || text.equals("java.lang.String[]"); + return text.equals(JavaClassNames.JAVA_LANG_STRING) || text.equals("java.lang.String...") || text.equals("java.lang.String[]"); } else { - return type.equalsToText("java.lang.String") || type.equalsToText("java.lang.String...") || type.equalsToText("java.lang.String[]"); + return type.equalsToText(JavaClassNames.JAVA_LANG_STRING) || type.equalsToText("java.lang.String...") || type.equalsToText("java.lang.String[]"); } } diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiType.java b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiType.java index f023f6b642..1b517d748b 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiType.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiType.java @@ -31,23 +31,23 @@ */ public abstract class PsiType implements PsiAnnotationOwner, Cloneable, JvmType { @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType BYTE = new PsiPrimitiveType("byte", "java.lang.Byte"); + public static final PsiPrimitiveType BYTE = new PsiPrimitiveType("byte", JavaClassNames.JAVA_LANG_BYTE); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType CHAR = new PsiPrimitiveType("char", "java.lang.Character"); + public static final PsiPrimitiveType CHAR = new PsiPrimitiveType("char", JavaClassNames.JAVA_LANG_CHARACTER); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType DOUBLE = new PsiPrimitiveType("double", "java.lang.Double"); + public static final PsiPrimitiveType DOUBLE = new PsiPrimitiveType("double", JavaClassNames.JAVA_LANG_DOUBLE); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType FLOAT = new PsiPrimitiveType("float", "java.lang.Float"); + public static final PsiPrimitiveType FLOAT = new PsiPrimitiveType("float", JavaClassNames.JAVA_LANG_FLOAT); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType INT = new PsiPrimitiveType("int", "java.lang.Integer"); + public static final PsiPrimitiveType INT = new PsiPrimitiveType("int", JavaClassNames.JAVA_LANG_INTEGER); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType LONG = new PsiPrimitiveType("long", "java.lang.Long"); + public static final PsiPrimitiveType LONG = new PsiPrimitiveType("long", JavaClassNames.JAVA_LANG_LONG); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType SHORT = new PsiPrimitiveType("short", "java.lang.Short"); + public static final PsiPrimitiveType SHORT = new PsiPrimitiveType("short", JavaClassNames.JAVA_LANG_SHORT); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType BOOLEAN = new PsiPrimitiveType("boolean", "java.lang.Boolean"); + public static final PsiPrimitiveType BOOLEAN = new PsiPrimitiveType("boolean", JavaClassNames.JAVA_LANG_BOOLEAN); @SuppressWarnings("StaticInitializerReferencesSubClass") - public static final PsiPrimitiveType VOID = new PsiPrimitiveType("void", "java.lang.Void"); + public static final PsiPrimitiveType VOID = new PsiPrimitiveType("void", JavaClassNames.JAVA_LANG_VOID); @SuppressWarnings("StaticInitializerReferencesSubClass") public static final PsiPrimitiveType NULL = new PsiPrimitiveType("null", (String) null); diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/IsConstantExpressionVisitor.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/IsConstantExpressionVisitor.java index aec6f68846..d8bf688589 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/IsConstantExpressionVisitor.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/IsConstantExpressionVisitor.java @@ -65,7 +65,7 @@ public boolean isConstant() { } PsiType type = element.getType(); if (type instanceof PsiPrimitiveType) return; - if (type.equalsToText("java.lang.String")) return; + if (type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) return; myIsConstant = false; } diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java index 1928ac0988..921de7314d 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/PsiConcatenationUtil.java @@ -16,6 +16,7 @@ package com.intellij.java.language.psi.util; import com.intellij.java.language.psi.*; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiWhiteSpace; import consulo.language.psi.scope.GlobalSearchScope; @@ -48,12 +49,12 @@ public static void buildFormatString( } else if (expression instanceof PsiPolyadicExpression) { final PsiType type = expression.getType(); - if (type != null && type.equalsToText("java.lang.String")) { + if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { final PsiPolyadicExpression binaryExpression = (PsiPolyadicExpression)expression; PsiExpression[] operands = binaryExpression.getOperands(); PsiType left = operands[0].getType(); - boolean stringStarted = left != null && left.equalsToText("java.lang.String"); + boolean stringStarted = left != null && left.equalsToText(JavaClassNames.JAVA_LANG_STRING); if (stringStarted) { buildFormatString(operands[0], formatString, formatParameters, printfFormat); } @@ -61,7 +62,7 @@ else if (expression instanceof PsiPolyadicExpression) { PsiExpression op = operands[i]; PsiType optype = op.getType(); PsiType r = TypeConversionUtil.calcTypeForBinaryExpression(left, optype, binaryExpression.getOperationTokenType(), true); - if (r != null && r.equalsToText("java.lang.String") && !stringStarted) { + if (r != null && r.equalsToText(JavaClassNames.JAVA_LANG_STRING) && !stringStarted) { stringStarted = true; PsiElement element = binaryExpression.getTokenBeforeOperand(op); if (element.getPrevSibling() instanceof PsiWhiteSpace) element = element.getPrevSibling(); @@ -71,7 +72,7 @@ else if (expression instanceof PsiPolyadicExpression) { addFormatParameter(subExpression, formatString, formatParameters, printfFormat); } if (stringStarted) { - if (optype != null && (optype.equalsToText("java.lang.String") || PsiType.CHAR.equals(optype))) { + if (optype != null && (optype.equalsToText(JavaClassNames.JAVA_LANG_STRING) || PsiType.CHAR.equals(optype))) { buildFormatString(op, formatString, formatParameters, printfFormat); } else { @@ -100,8 +101,8 @@ private static void addFormatParameter(PsiExpression expression, else if (type != null && (type.equalsToText("long") || type.equalsToText("int") || - type.equalsToText("java.lang.Long") || - type.equalsToText("java.lang.Integer"))) { + type.equalsToText(JavaClassNames.JAVA_LANG_LONG) || + type.equalsToText(JavaClassNames.JAVA_LANG_INTEGER))) { formatString.append("%d"); } else { diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java b/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java index ea097a94ff..0a33694778 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/util/TypeConversionUtil.java @@ -922,8 +922,8 @@ private static boolean isAssignable(@Nonnull PsiType left, @Nonnull PsiType righ return false; } if (lClass.isInterface()) { - final String qualifiedName = lClass.getQualifiedName(); - return "java.io.Serializable".equals(qualifiedName) || "java.lang.Cloneable".equals(qualifiedName); + String qualifiedName = lClass.getQualifiedName(); + return JavaClassNames.JAVA_IO_SERIALIZABLE.equals(qualifiedName) || JavaClassNames.JAVA_LANG_CLONEABLE.equals(qualifiedName); } else { return left.equalsToText(JavaClassNames.JAVA_LANG_OBJECT); } @@ -1377,14 +1377,14 @@ private static PsiType unbox(@Nonnull PsiType type) { private static final Set PRIMITIVE_WRAPPER_TYPES = new HashSet(8); static { - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Byte"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Character"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Double"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Float"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Long"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Integer"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Short"); - PRIMITIVE_WRAPPER_TYPES.add("java.lang.Boolean"); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_BYTE); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_CHARACTER); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_DOUBLE); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_FLOAT); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_LONG); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_INTEGER); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_SHORT); + PRIMITIVE_WRAPPER_TYPES.add(JavaClassNames.JAVA_LANG_BOOLEAN); } public static boolean isIntegerNumber(String typeName) { diff --git a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java b/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java index d10e41821f..e9174d5322 100644 --- a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java +++ b/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java @@ -22,6 +22,9 @@ public interface JavaClassNames { String DEFAULT_PACKAGE = "java.lang"; String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable"; String JAVA_IO_FILE = "java.io.File"; + String JAVA_IO_IO_EXCEPTION = "java.io.IOException"; + String JAVA_IO_PRINT_STREAM = "java.io.PrintStream"; + String JAVA_IO_PRINT_WRITER = "java.io.PrintWriter"; String JAVA_IO_SERIALIZABLE = "java.io.Serializable"; String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder"; String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation"; @@ -29,6 +32,7 @@ public interface JavaClassNames { String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable"; String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention"; String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target"; + String JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION = "java.lang.ArrayIndexOutOfBoundsException"; String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError"; String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable"; String JAVA_LANG_BOOLEAN = "java.lang.Boolean"; @@ -36,6 +40,7 @@ public interface JavaClassNames { String JAVA_LANG_CHARACTER = "java.lang.Character"; String JAVA_LANG_CHAR_SEQUENCE = "java.lang.CharSequence"; String JAVA_LANG_CLASS = "java.lang.Class"; + String JAVA_LANG_CLASS_CAST_EXCEPTION = "java.lang.ClassCastException"; String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; String JAVA_LANG_COMPARABLE = "java.lang.Comparable"; String JAVA_LANG_DEPRECATED = "java.lang.Deprecated"; @@ -50,6 +55,7 @@ public interface JavaClassNames { String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature"; String JAVA_LANG_ITERABLE = "java.lang.Iterable"; String JAVA_LANG_LONG = "java.lang.Long"; + String JAVA_LANG_MATH = "java.lang.Math"; String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException"; String JAVA_LANG_NUMBER = "java.lang.Number"; String JAVA_LANG_OBJECT = "java.lang.Object"; @@ -84,7 +90,6 @@ public interface JavaClassNames { String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate"; String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer"; String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function"; - String JAVA_UTIL_FUNCTION_BIFUNCTION = "java.util.function.BiFunction"; String JAVA_UTIL_HASH_MAP = "java.util.HashMap"; String JAVA_UTIL_HASH_SET = "java.util.HashSet"; String JAVA_UTIL_LIST = "java.util.List"; @@ -96,6 +101,7 @@ public interface JavaClassNames { String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle"; String JAVA_UTIL_QUEUE = "java.util.Queue"; String JAVA_UTIL_SET = "java.util.Set"; + String JAVA_UTIL_SORTED_MAP = "java.util.SortedMap"; String JAVA_UTIL_SORTED_SET = "java.util.SortedSet"; String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream"; String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream"; diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java index 26ff6b1754..3200441d38 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiClassImplUtil.java @@ -1095,7 +1095,7 @@ static boolean isInReferenceList(@Nullable PsiReferenceList list, @Nonnull PsiCl if (typeParam != -1) { name = name.substring(0, typeParam); } - // baseName=="ArrayList" classStub.getReferenceNames()[i]=="java.util.ArrayList" + // baseName=="ArrayList" classStub.getReferenceNames()[i]==JavaClassNames.JAVA_UTIL_ARRAY_LIST if (name.endsWith(baseName)) { PsiClassType[] referencedTypes = classStub.getReferencedTypes(); PsiClass resolved = referencedTypes[i].resolve(); diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java index 4f513f9434..a67ac74f83 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/PsiImplUtil.java @@ -33,6 +33,7 @@ import consulo.annotation.access.RequiredWriteAction; import consulo.application.Application; import consulo.content.scope.SearchScope; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.ast.FileASTNode; import consulo.language.ast.IElementType; @@ -326,9 +327,9 @@ public static PsiType[] typesByTypeElements(@Nonnull PsiTypeElement[] typeElemen public static PsiType getType(@Nonnull PsiClassObjectAccessExpression classAccessExpression) { GlobalSearchScope resolveScope = classAccessExpression.getResolveScope(); PsiManager manager = classAccessExpression.getManager(); - PsiClass classClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Class", resolveScope); + PsiClass classClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_CLASS, resolveScope); if (classClass == null) { - return new PsiClassReferenceType(new LightClassReference(manager, "Class", "java.lang.Class", resolveScope), null); + return new PsiClassReferenceType(new LightClassReference(manager, "Class", JavaClassNames.JAVA_LANG_CLASS, resolveScope), null); } if (!PsiUtil.isLanguageLevel5OrHigher(classAccessExpression)) { //Raw java.lang.Class @@ -341,7 +342,7 @@ public static PsiType getType(@Nonnull PsiClassObjectAccessExpression classAcces if (PsiType.VOID.equals(primitiveType)) { operandType = JavaPsiFacade.getInstance(manager.getProject()) .getElementFactory() - .createTypeByFQClassName("java.lang.Void", classAccessExpression.getResolveScope()); + .createTypeByFQClassName(JavaClassNames.JAVA_LANG_VOID, classAccessExpression.getResolveScope()); } else { operandType = primitiveType.getBoxedType(classAccessExpression); @@ -545,7 +546,7 @@ public static PsiElement setName(@Nonnull PsiElement element, @Nonnull String na public static boolean isDeprecatedByAnnotation(@Nonnull PsiModifierListOwner owner) { PsiModifierList modifierList = owner.getModifierList(); - return modifierList != null && modifierList.findAnnotation("java.lang.Deprecated") != null; + return modifierList != null && modifierList.findAnnotation(JavaClassNames.JAVA_LANG_DEPRECATED) != null; } public static boolean isDeprecatedByDocTag(@Nonnull PsiJavaDocumentedElement owner) { diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java index 6e6ba5cc40..3a8fcaaa3e 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/compiled/ClsFieldImpl.java @@ -26,6 +26,7 @@ import consulo.application.dumb.IndexNotReadyException; import consulo.component.extension.Extensions; import consulo.content.scope.SearchScope; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.impl.ast.TreeElement; import consulo.language.impl.psi.SourceTreeToPsiMap; import consulo.language.psi.PsiElement; @@ -127,7 +128,7 @@ public Object computeConstantValue(Set visitedVars) { PsiClass containingClass = getContainingClass(); if (containingClass != null) { String qName = containingClass.getQualifiedName(); - if ("java.lang.Float".equals(qName)) { + if (JavaClassNames.JAVA_LANG_FLOAT.equals(qName)) { String name = getName(); if ("POSITIVE_INFINITY".equals(name)) { return Float.POSITIVE_INFINITY; @@ -139,7 +140,7 @@ public Object computeConstantValue(Set visitedVars) { return Float.NaN; } } - else if ("java.lang.Double".equals(qName)) { + else if (JavaClassNames.JAVA_LANG_DOUBLE.equals(qName)) { String name = getName(); if ("POSITIVE_INFINITY".equals(name)) { return Double.POSITIVE_INFINITY; diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java index f6d2aee986..ce1f97c1cd 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiEnumConstantImpl.java @@ -23,6 +23,7 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.javadoc.PsiDocComment; import consulo.document.util.TextRange; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; @@ -200,8 +201,8 @@ public boolean isDeprecated() { } PsiDocComment docComment = getDocComment(); - return docComment != null && docComment.findTagByName("deprecated") != null || getModifierList().findAnnotation("java.lang.Deprecated") != - null; + return docComment != null && docComment.findTagByName("deprecated") != null + || getModifierList().findAnnotation(JavaClassNames.JAVA_LANG_DEPRECATED) != null; } @Override diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java index 0f0cef5494..6d6399dfc7 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/PsiFieldImpl.java @@ -30,6 +30,7 @@ import com.intellij.java.language.psi.javadoc.PsiDocComment; import consulo.application.util.Queryable; import consulo.content.scope.SearchScope; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.file.light.LightVirtualFile; import consulo.language.impl.ast.CompositeElement; @@ -295,7 +296,7 @@ public Object execute(@Nonnull PsiVariable variable, Set visitedVar private Object _computeConstantValue(Set visitedVars) { PsiType type = getType(); // javac rejects all non primitive and non String constants, although JLS states constants "variables whose initializers are constant expressions" - if (!(type instanceof PsiPrimitiveType) && !type.equalsToText("java.lang.String")) { + if (!(type instanceof PsiPrimitiveType) && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { return null; } diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/tree/java/PsiLocalVariableImpl.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/tree/java/PsiLocalVariableImpl.java index 45a19921c9..8960862c5a 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/tree/java/PsiLocalVariableImpl.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/tree/java/PsiLocalVariableImpl.java @@ -25,6 +25,7 @@ import com.intellij.java.language.impl.psi.impl.source.tree.JavaSharedImplUtil; import com.intellij.java.language.psi.*; import consulo.content.scope.SearchScope; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.ast.ChildRoleBase; import consulo.language.ast.IElementType; @@ -156,7 +157,7 @@ public Object computeConstantValue(Set visitedVars) { PsiType type = getType(); // javac rejects all non primitive and non String constants, although JLS states constants "variables whose initializers are constant expressions" - if (!(type instanceof PsiPrimitiveType) && !type.equalsToText("java.lang.String")) return null; + if (!(type instanceof PsiPrimitiveType) && !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) return null; PsiExpression initializer = getInitializer(); if (initializer == null) return null; 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 ccfa8cb0dd..851695b286 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 @@ -313,7 +313,7 @@ protected String findItemToAdd() { createInheritanceClassChooser( CodeInsightLocalize.inspectionI18nOptionIgnoreForSpecifiedExceptionConstructorArguments().get(), scope, - JavaPsiFacade.getInstance(project).findClass("java.lang.Throwable", scope), + JavaPsiFacade.getInstance(project).findClass(JavaClassNames.JAVA_LANG_THROWABLE, scope), true, true, null @@ -844,7 +844,7 @@ private static boolean isToString(final PsiLiteralExpression expression) { return TO_STRING.equals(method.getName()) && method.getParameterList().getParametersCount() == 0 && returnType != null - && "java.lang.String".equals(returnType.getCanonicalText()); + && JavaClassNames.JAVA_LANG_STRING.equals(returnType.getCanonicalText()); } private static boolean isArgOfJUnitAssertion(PsiExpression expression) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExpectedTypesProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExpectedTypesProvider.java index ee1b6dd3e9..e05c9af143 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExpectedTypesProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExpectedTypesProvider.java @@ -551,7 +551,7 @@ public void visitSwitchStatement(@Nonnull PsiSwitchStatement statement) { PsiManager manager = statement.getManager(); PsiClassType enumType = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory() - .createTypeByFQClassName("java.lang.Enum", statement.getResolveScope()); + .createTypeByFQClassName(JavaClassNames.JAVA_LANG_ENUM, statement.getResolveScope()); myResult.add(createInfoImpl(enumType, enumType)); } @@ -988,7 +988,7 @@ public void visitThrowStatement(@Nonnull PsiThrowStatement statement) { if (statement.getException() == myExpr) { PsiManager manager = statement.getManager(); PsiType throwableType = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory() - .createTypeByFQClassName("java.lang.Throwable", myExpr.getResolveScope()); + .createTypeByFQClassName(JavaClassNames.JAVA_LANG_THROWABLE, myExpr.getResolveScope()); PsiElement container = PsiTreeUtil.getParentOfType(statement, PsiMethod.class, PsiLambdaExpression.class, PsiClass.class); PsiType[] throwsTypes = PsiType.EMPTY_ARRAY; @@ -1004,7 +1004,7 @@ else if (container instanceof PsiLambdaExpression) { if (throwsTypes.length == 0) { final PsiClassType exceptionType = JavaPsiFacade.getInstance(manager.getProject()) - .getElementFactory().createTypeByFQClassName("java.lang.Exception", + .getElementFactory().createTypeByFQClassName(JavaClassNames.JAVA_LANG_EXCEPTION, myExpr.getResolveScope()); throwsTypes = new PsiClassType[]{exceptionType}; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java index 26e56721b1..e8ef4f2d54 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/CollectionsUtilityMethodsProvider.java @@ -73,8 +73,8 @@ public void addCompletions(boolean showAll) { addCollectionMethod(JAVA_UTIL_LIST, "unmodifiableList", collectionsClass); addCollectionMethod(JAVA_UTIL_SET, "unmodifiableSet", collectionsClass); addCollectionMethod(JAVA_UTIL_MAP, "unmodifiableMap", collectionsClass); - addCollectionMethod("java.util.SortedSet", "unmodifiableSortedSet", collectionsClass); - addCollectionMethod("java.util.SortedMap", "unmodifiableSortedMap", collectionsClass); + addCollectionMethod(JAVA_UTIL_SORTED_SET, "unmodifiableSortedSet", collectionsClass); + addCollectionMethod(JAVA_UTIL_SORTED_MAP, "unmodifiableSortedMap", collectionsClass); } } @@ -109,5 +109,4 @@ private static boolean isClassType(final PsiType type, final String className) { } return false; } - } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java index 2265a4a703..95d75f01b5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java @@ -149,7 +149,7 @@ public static PsiMethod setupSuperCall(PsiClass targetClass, PsiMethod construct PsiMethod supConstructor = null; PsiClass superClass = targetClass.getSuperClass(); if (superClass != null && !JavaClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName()) && - !"java.lang.Enum".equals(superClass.getQualifiedName())) { + !JavaClassNames.JAVA_LANG_ENUM.equals(superClass.getQualifiedName())) { PsiMethod[] constructors = superClass.getConstructors(); boolean hasDefaultConstructor = false; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java index 6122bd0756..3880f4fe7f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java @@ -145,7 +145,7 @@ protected String getSuperClassName(final PsiJavaCodeReferenceElement element) { if (ggParent instanceof PsiMethod) { PsiMethod method = (PsiMethod)ggParent; if (method.getThrowsList() == parent) { - superClassName = "java.lang.Exception"; + superClassName = JavaClassNames.JAVA_LANG_EXCEPTION; } } else if (ggParent instanceof PsiClassObjectAccessExpression) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java index 31ea6aea03..481939716a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java @@ -19,6 +19,7 @@ import com.intellij.java.language.psi.util.InheritanceUtil; import com.intellij.java.language.psi.util.PropertyUtil; import com.intellij.java.language.psi.util.PsiUtil; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiDirectory; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; @@ -75,7 +76,7 @@ static boolean isSideEffectFreeConstructor(PsiNewExpression newExpression) { // all Throwable descendants from java.lang are side effects free if ("java.lang".equals(packageName) || "java.io".equals(packageName)) { - PsiClass throwableClass = JavaPsiFacade.getInstance(aClass.getProject()).findClass("java.lang.Throwable", aClass.getResolveScope()); + PsiClass throwableClass = JavaPsiFacade.getInstance(aClass.getProject()).findClass(JavaClassNames.JAVA_LANG_THROWABLE, aClass.getResolveScope()); if (throwableClass != null && InheritanceUtil.isInheritorOrSelf(aClass, throwableClass, true)) { return true; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java index 6a93ff1962..e44d87ba86 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java @@ -28,6 +28,7 @@ import consulo.content.bundle.Sdk; import consulo.java.language.bundle.JavaSdkTypeUtil; import consulo.java.language.module.extension.JavaModuleExtension; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.FileModificationService; import consulo.language.editor.intention.SyntheticIntentionAction; import consulo.language.psi.PsiElement; @@ -68,7 +69,7 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor, if (element instanceof PsiMethod) { final PsiMethod method = (PsiMethod)element; final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); - final PsiClass collectionsClass = psiFacade.findClass("java.util.Collection", GlobalSearchScope.allScope(project)); + final PsiClass collectionsClass = psiFacade.findClass(JavaClassNames.JAVA_UTIL_COLLECTION, GlobalSearchScope.allScope(project)); if (collectionsClass != null && InheritanceUtil.isInheritorOrSelf(method.getContainingClass(), collectionsClass, true)) { if (Comparing.strEqual(method.getName(), "addAll") && PsiType.BOOLEAN.equals(method.getReturnType())) { final PsiParameter[] psiParameters = method.getParameterList().getParameters(); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java index 9a2a77e3f7..c617a4283d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/editorActions/wordSelection/LiteralSelectioner.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.codeInsight.editorActions.wordSelection; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.action.SelectWordUtil; import consulo.language.lexer.StringLiteralLexer; import consulo.codeEditor.Editor; @@ -37,7 +38,7 @@ public boolean canSelect(PsiElement e) { private static boolean isStringLiteral(PsiElement element) { return element instanceof PsiLiteralExpression && - ((PsiLiteralExpression)element).getType().equalsToText("java.lang.String") && element.getText().startsWith("\"") && element.getText().endsWith("\""); + ((PsiLiteralExpression)element).getType().equalsToText(JavaClassNames.JAVA_LANG_STRING) && element.getText().startsWith("\"") && element.getText().endsWith("\""); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java index ad14bdec38..60a35debaf 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java @@ -21,6 +21,7 @@ import com.intellij.java.language.psi.codeStyle.VariableKind; import consulo.codeEditor.Editor; import consulo.document.util.TextRange; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.localize.CodeInsightLocalize; import consulo.language.psi.PsiElement; @@ -57,7 +58,7 @@ public TextRange surroundStatements(Project project, Editor editor, PsiElement c if (exceptions.isEmpty()) { exceptions = ExceptionUtil.getThrownExceptions(statements); if (exceptions.isEmpty()) { - exceptions = Collections.singletonList(factory.createTypeByFQClassName("java.lang.Exception", container.getResolveScope())); + exceptions = Collections.singletonList(factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_EXCEPTION, container.getResolveScope())); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/AddOverrideAnnotationAction.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/AddOverrideAnnotationAction.java index 3d6f20659b..b88a33c2d5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/AddOverrideAnnotationAction.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/intention/impl/AddOverrideAnnotationAction.java @@ -24,6 +24,7 @@ import consulo.annotation.component.ExtensionImpl; import consulo.codeEditor.Editor; import consulo.document.util.TextRange; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.IntentionAction; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.editor.localize.CodeInsightLocalize; @@ -40,8 +41,6 @@ @ExtensionImpl @IntentionMetaData(ignoreId = "java.AddOverrideAnnotationAction", categories = {"Java", "Declaration"}, fileExtensions = "java") public class AddOverrideAnnotationAction implements IntentionAction { - private static final String JAVA_LANG_OVERRIDE = "java.lang.Override"; - @Override @Nonnull public String getText() { @@ -55,11 +54,11 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file if (!file.getManager().isInProject(file)) return false; PsiMethod method = findMethod(file, editor.getCaretModel().getOffset()); if (method == null) return false; - if (method.getModifierList().findAnnotation(JAVA_LANG_OVERRIDE) != null) return false; + if (method.getModifierList().findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE) != null) return false; PsiMethod[] superMethods = method.findSuperMethods(); for (PsiMethod superMethod : superMethods) { if (!superMethod.hasModifierProperty(PsiModifier.ABSTRACT) - && new AddAnnotationFix(JAVA_LANG_OVERRIDE, method).isAvailable(project, editor, file)) { + && new AddAnnotationFix(JavaClassNames.JAVA_LANG_OVERRIDE, method).isAvailable(project, editor, file)) { return true; } } @@ -72,7 +71,7 @@ && new AddAnnotationFix(JAVA_LANG_OVERRIDE, method).isAvailable(project, editor, public void invoke(@Nonnull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { PsiMethod method = findMethod(file, editor.getCaretModel().getOffset()); if (method != null) { - new AddAnnotationFix(JAVA_LANG_OVERRIDE, method).invoke(project, editor, file); + new AddAnnotationFix(JavaClassNames.JAVA_LANG_OVERRIDE, method).invoke(project, editor, file); } } 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 608936f3ae..700752eda3 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,6 +22,7 @@ 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; @@ -75,7 +76,7 @@ public Result calculateResult(@Nonnull Expression[] params, ExpressionContext co PsiClass aClass = resolveResult.getElement(); if (aClass != null) { - PsiClass iterableClass = JavaPsiFacade.getInstance(project).findClass("java.lang.Iterable", aClass.getResolveScope()); + PsiClass iterableClass = JavaPsiFacade.getInstance(project).findClass(JavaClassNames.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 07ff17ba87..1bfd782003 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 @@ -73,7 +73,7 @@ protected PsiElement[] getVariables(Expression[] params, final ExpressionContext final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory(); final GlobalSearchScope scope = file.getResolveScope(); - PsiType iterableType = elementFactory.createTypeByFQClassName("java.lang.Iterable", scope); + PsiType iterableType = elementFactory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_ITERABLE, scope); PsiType mapType = elementFactory.createTypeByFQClassName(JavaClassNames.JAVA_UTIL_MAP, scope); PsiVariable[] variables = MacroUtil.getVariablesVisibleAt(place, ""); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java index 9f678b073a..215de40bf0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/PossibleHeapPollutionVarargsInspection.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.codeInspection; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.LocalInspectionToolSession; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; @@ -124,7 +125,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri if (psiElement instanceof PsiIdentifier) { final PsiMethod psiMethod = (PsiMethod) psiElement.getParent(); if (psiMethod != null) { - new AddAnnotationPsiFix("java.lang.SafeVarargs", psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); + new AddAnnotationPsiFix(JavaClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); } } } @@ -149,7 +150,7 @@ public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descri if (psiElement instanceof PsiIdentifier) { final PsiMethod psiMethod = (PsiMethod) psiElement.getParent(); psiMethod.getModifierList().setModifierProperty(PsiModifier.FINAL, true); - new AddAnnotationPsiFix("java.lang.SafeVarargs", psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); + new AddAnnotationPsiFix(JavaClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); } } } @@ -159,7 +160,7 @@ public abstract static class HeapPollutionVisitor extends JavaElementVisitor { public void visitMethod(PsiMethod method) { super.visitMethod(method); if (!PsiUtil.getLanguageLevel(method).isAtLeast(LanguageLevel.JDK_1_7)) return; - if (AnnotationUtil.isAnnotated(method, "java.lang.SafeVarargs", false)) return; + if (AnnotationUtil.isAnnotated(method, JavaClassNames.JAVA_LANG_SAFE_VARARGS, false)) return; if (!method.isVarArgs()) return; final PsiParameter psiParameter = method.getParameterList().getParameters()[method.getParameterList().getParametersCount() - 1]; 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 bfd7eb5f8f..e6578dc3ed 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 @@ -28,6 +28,7 @@ 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; @@ -124,7 +125,7 @@ private PsiMethod createToStringMethod(Collection selectedMembers, if(hasOverrideAnnotation) { - toStringMethod.getModifierList().addAnnotation("java.lang.Override"); + toStringMethod.getModifierList().addAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); } // applyJavaDoc conflict resolution policy (add or keep existing) diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java b/plugin/src/main/java/com/intellij/java/impl/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java index 435c0c48c7..7c7de3f1ff 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java @@ -70,9 +70,8 @@ public PsiElement getTargetElement() { return null; } else { - return file.isDirectory() - ? PsiManager.getInstance(getProject()).findDirectory(file) - : PsiManager.getInstance(getProject()).findFile(file); + PsiManager psiManager = PsiManager.getInstance(getProject()); + return file.isDirectory() ? psiManager.findDirectory(file) : psiManager.findFile(file); } } @@ -93,6 +92,7 @@ public void update(PresentationData data) { PsiElement value = getPsiElement(); if (value == null || !value.isValid()) { setValue(null); + return; } if (getPsiElement() == null) { return; @@ -140,12 +140,12 @@ public void navigate(boolean requestFocus) { @Override public boolean canNavigate() { - return getPsiElement() instanceof NavigationItem && ((NavigationItem)getPsiElement()).canNavigate(); + return getPsiElement() instanceof NavigationItem navItem && navItem.canNavigate(); } @Override public boolean canNavigateToSource() { - return getPsiElement() instanceof NavigationItem && ((NavigationItem)getPsiElement()).canNavigateToSource(); + return getPsiElement() instanceof NavigationItem navItem && navItem.canNavigateToSource(); } protected PsiElement getPsiElement() { 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 98da60df9c..6ffef9ba0f 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 @@ -308,12 +308,10 @@ else if ("valueOf".equals(methodName)) { JavaClassNames.JAVA_LANG_STRING.equals(qualifiedName)) { return true; } - if (InheritanceUtil.isInheritor(containingClass, - "java.io.PrintStream")) { + if (InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_IO_PRINT_STREAM)) { return true; } - else if (InheritanceUtil.isInheritor(containingClass, - "java.io.PrintWriter")) { + else if (InheritanceUtil.isInheritor(containingClass, JavaClassNames.JAVA_IO_PRINT_WRITER)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java index 60aa7ace12..03eda18aa5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java @@ -22,6 +22,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -147,7 +148,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression expression) { return; } final String qualifiedName = containingClass.getQualifiedName(); - if (!"java.lang.Math".equals(qualifiedName) && !"java.lang.StrictMath".equals(qualifiedName)) { + if (!JavaClassNames.JAVA_LANG_MATH.equals(qualifiedName) && !JavaClassNames.JAVA_LANG_STRICT_MATH.equals(qualifiedName)) { return; } registerError(methodCallExpression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java index a425a0b272..e3343ca5f9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MismatchedCollectionQueryUpdateInspection.java @@ -33,6 +33,7 @@ import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -58,19 +59,19 @@ public class MismatchedCollectionQueryUpdateInspection extends BaseInspection { private static final CallMatcher TRANSFORMED = CallMatcher.staticCall( - CommonClassNames.JAVA_UTIL_COLLECTIONS, "asLifoQueue", "checkedCollection", "checkedList", "checkedMap", "checkedNavigableMap", + JavaClassNames.JAVA_UTIL_COLLECTIONS, "asLifoQueue", "checkedCollection", "checkedList", "checkedMap", "checkedNavigableMap", "checkedNavigableSet", "checkedQueue", "checkedSet", "checkedSortedMap", "checkedSortedSet", "newSetFromMap", "synchronizedCollection", "synchronizedList", "synchronizedMap", "synchronizedNavigableMap", "synchronizedNavigableSet", "synchronizedSet", "synchronizedSortedMap", "synchronizedSortedSet"); private static final CallMatcher DERIVED = CallMatcher.anyOf( CollectionUtils.DERIVED_COLLECTION, - CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_LIST, "subList"), - CallMatcher.instanceCall("java.util.SortedMap", "headMap", "tailMap", "subMap"), - CallMatcher.instanceCall("java.util.SortedSet", "headSet", "tailSet", "subSet")); + CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_LIST, "subList"), + CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_SORTED_MAP, "headMap", "tailMap", "subMap"), + CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_SORTED_SET, "headSet", "tailSet", "subSet")); private static final CallMatcher COLLECTION_SAFE_ARGUMENT_METHODS = CallMatcher.anyOf( - CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_COLLECTION, "addAll", "removeAll", "containsAll", "remove"), - CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_MAP, "putAll", "remove") + CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_COLLECTION, "addAll", "removeAll", "containsAll", "remove"), + CallMatcher.instanceCall(JavaClassNames.JAVA_UTIL_MAP, "putAll", "remove") ); private static final Set COLLECTIONS_QUERIES = Set.of("binarySearch", "disjoint", "indexOfSubList", "lastIndexOfSubList", "max", "min"); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java index 893a71a8b0..0a8e1965ba 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ParameterClassCheckVisitor.java @@ -195,7 +195,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression expression) for(PsiParameter parameter : parameters) { final PsiType type = parameter.getType(); - if(type.equalsToText("java.lang.NullPointerException")) + if(type.equalsToText(JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION)) { nullPointerExceptionFound = true; if(classCastExceptionFound) @@ -203,7 +203,7 @@ public void visitTypeCastExpression(PsiTypeCastExpression expression) break; } } - else if(type.equalsToText("java.lang.ClassCastException")) + else if(type.equalsToText(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION)) { classCastExceptionFound = true; if(nullPointerExceptionFound) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ReflectionForUnavailableAnnotationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ReflectionForUnavailableAnnotationInspection.java index 8102c8a0e3..0b81f4f824 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ReflectionForUnavailableAnnotationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/ReflectionForUnavailableAnnotationInspection.java @@ -21,6 +21,7 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -87,7 +88,7 @@ public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression expressio if (modifierList == null) { return; } - final PsiAnnotation retentionAnnotation = modifierList.findAnnotation("java.lang.annotation.Retention"); + final PsiAnnotation retentionAnnotation = modifierList.findAnnotation(JavaClassNames.JAVA_LANG_ANNOTATION_RETENTION); if (retentionAnnotation == null) { registerError(arg); return; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java index 2825f1cc5b..7ac164238c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/EmptyClassInspection.java @@ -27,6 +27,7 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.CheckBox; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiFile; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -162,7 +163,7 @@ public void visitClass(@Nonnull PsiClass aClass) { if (AnnotationUtil.isAnnotated(aClass, ignorableAnnotations)) { return; } - if (ignoreThrowables && InheritanceUtil.isInheritor(aClass, "java.lang.Throwable")) { + if (ignoreThrowables && InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_THROWABLE)) { return; } registerClassError(aClass, aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java index 6720f9e51c..412e719704 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FinalPrivateMethodInspection.java @@ -24,6 +24,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -66,7 +67,7 @@ public void visitMethod(@Nonnull PsiMethod method) { || !method.hasModifierProperty(PsiModifier.PRIVATE)) { return; } - if (AnnotationUtil.isAnnotated(method, "java.lang.SafeVarargs", false) && method.isVarArgs()) { + if (AnnotationUtil.isAnnotated(method, JavaClassNames.JAVA_LANG_SAFE_VARARGS, false) && method.isVarArgs()) { return; } registerModifierError(PsiModifier.FINAL, method, PsiModifier.FINAL); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java index a0e1c06910..2819ba5592 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MissingOverrideAnnotationInspection.java @@ -25,6 +25,7 @@ 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.editor.inspection.CleanupLocalInspectionTool; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -172,7 +173,7 @@ private boolean hasOverrideAnnotation( return false; } final PsiAnnotation annotation = - modifierList.findAnnotation("java.lang.Override"); + modifierList.findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); return annotation != null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/encapsulation/ReturnOfCollectionFieldInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/encapsulation/ReturnOfCollectionFieldInspection.java index 7fce84561b..785c93151e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/encapsulation/ReturnOfCollectionFieldInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/encapsulation/ReturnOfCollectionFieldInspection.java @@ -83,22 +83,22 @@ protected InspectionGadgetsFix buildFix(Object... infos) { final PsiReferenceExpression referenceExpression = (PsiReferenceExpression)infos[1]; final String text = referenceExpression.getText(); if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, JavaClassNames.JAVA_UTIL_MAP)) { - if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, "java.util.SortedMap")) { - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableSortedMap(" + text + ')', "java.util.SortedMap"); + if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, JavaClassNames.JAVA_UTIL_SORTED_MAP)) { + return new ReturnOfCollectionFieldFix(JavaClassNames.JAVA_UTIL_COLLECTIONS + ".unmodifiableSortedMap(" + text + ')', JavaClassNames.JAVA_UTIL_SORTED_MAP); } - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableMap(" + text + ')', JavaClassNames.JAVA_UTIL_MAP); + return new ReturnOfCollectionFieldFix(JavaClassNames.JAVA_UTIL_COLLECTIONS + ".unmodifiableMap(" + text + ')', JavaClassNames.JAVA_UTIL_MAP); } else if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, JavaClassNames.JAVA_UTIL_COLLECTION)) { if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, JavaClassNames.JAVA_UTIL_SET)) { - if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, "java.util.SortedSet")) { - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableSortedSet(" + text + ')', "java.util.SortedSet"); + if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, JavaClassNames.JAVA_UTIL_SORTED_SET)) { + return new ReturnOfCollectionFieldFix(JavaClassNames.JAVA_UTIL_COLLECTIONS + ".unmodifiableSortedSet(" + text + ')', JavaClassNames.JAVA_UTIL_SORTED_SET); } - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableSet(" + text + ')', JavaClassNames.JAVA_UTIL_SET); + return new ReturnOfCollectionFieldFix(JavaClassNames.JAVA_UTIL_COLLECTIONS + ".unmodifiableSet(" + text + ')', JavaClassNames.JAVA_UTIL_SET); } else if (TypeUtils.expressionHasTypeOrSubtype(referenceExpression, JavaClassNames.JAVA_UTIL_LIST)) { - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableList(" + text + ')', JavaClassNames.JAVA_UTIL_LIST); + return new ReturnOfCollectionFieldFix(JavaClassNames.JAVA_UTIL_COLLECTIONS + ".unmodifiableList(" + text + ')', JavaClassNames.JAVA_UTIL_LIST); } - return new ReturnOfCollectionFieldFix("java.util.Collections.unmodifiableCollection(" + text + ')', "java.util.Collection"); + return new ReturnOfCollectionFieldFix(JavaClassNames.JAVA_UTIL_COLLECTIONS + ".unmodifiableCollection(" + text + ')', JavaClassNames.JAVA_UTIL_COLLECTION); } return null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java index d76ed1e050..b0b576b01a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionCaughtInspection.java @@ -27,6 +27,7 @@ import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; @@ -47,9 +48,9 @@ public class BadExceptionCaughtInspection extends BaseInspection { */ public final ExternalizableStringSet exceptions = new ExternalizableStringSet( - "java.lang.NullPointerException", + JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, "java.lang.IllegalMonitorStateException", - "java.lang.ArrayIndexOutOfBoundsException" + JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION ); public BadExceptionCaughtInspection() { @@ -87,7 +88,7 @@ public JComponent createOptionsPanel() { return UiUtils.createAddRemoveTreeClassChooserPanel( table, InspectionGadgetsLocalize.chooseExceptionClass().get(), - "java.lang.Throwable" + JavaClassNames.JAVA_LANG_THROWABLE ); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java index 92dc4ba29b..956502f341 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -32,6 +32,7 @@ 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.util.lang.StringUtil; import jakarta.annotation.Nonnull; @@ -51,16 +52,15 @@ public class BadExceptionDeclaredInspection extends BaseInspection { /** * @noinspection PublicField */ - public final ExternalizableStringSet exceptions = - new ExternalizableStringSet( - "java.lang.Throwable", - "java.lang.Exception", - "java.lang.Error", - "java.lang.RuntimeException", - "java.lang.NullPointerException", - "java.lang.ClassCastException", - "java.lang.ArrayIndexOutOfBoundsException" - ); + public final ExternalizableStringSet exceptions = new ExternalizableStringSet( + JavaClassNames.JAVA_LANG_THROWABLE, + JavaClassNames.JAVA_LANG_EXCEPTION, + JavaClassNames.JAVA_LANG_ERROR, + JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, + JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION, + JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION + ); /** * @noinspection PublicField @@ -106,7 +106,7 @@ public JComponent createOptionsPanel() { JPanel tablePanel = UiUtils.createAddRemoveTreeClassChooserPanel( table, InspectionGadgetsLocalize.chooseExceptionClass().get(), - "java.lang.Throwable" + JavaClassNames.JAVA_LANG_THROWABLE ); final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java index b53b6d91fe..9bb6233b3e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/BadExceptionThrownInspection.java @@ -26,6 +26,7 @@ import consulo.annotation.component.ExtensionImpl; import consulo.ide.impl.idea.codeInspection.ui.ListTable; import consulo.ide.impl.idea.codeInspection.ui.ListWrappingTableModel; +import consulo.java.language.module.util.JavaClassNames; import consulo.util.lang.StringUtil; import jakarta.annotation.Nonnull; @@ -43,13 +44,13 @@ public class BadExceptionThrownInspection extends BaseInspection { @SuppressWarnings("PublicField") public final ExternalizableStringSet exceptions = new ExternalizableStringSet( - "java.lang.Throwable", - "java.lang.Exception", - "java.lang.Error", - "java.lang.RuntimeException", - "java.lang.NullPointerException", - "java.lang.ClassCastException", - "java.lang.ArrayIndexOutOfBoundsException" + JavaClassNames.JAVA_LANG_THROWABLE, + JavaClassNames.JAVA_LANG_EXCEPTION, + JavaClassNames.JAVA_LANG_ERROR, + JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, + JavaClassNames.JAVA_LANG_NULL_POINTER_EXCEPTION, + JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION, + JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION ); public BadExceptionThrownInspection() { @@ -82,7 +83,7 @@ public JComponent createOptionsPanel() { return UiUtils.createAddRemoveTreeClassChooserPanel( table, InspectionGadgetsLocalize.chooseExceptionClass().get(), - "java.lang.Throwable" + JavaClassNames.JAVA_LANG_THROWABLE ); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java index 7e7d7cab4d..d65092d7f6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/ThrowsRuntimeExceptionInspection.java @@ -25,6 +25,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.documentation.CodeDocumentationProvider; import consulo.language.editor.documentation.CompositeDocumentationProvider; import consulo.language.editor.documentation.DocumentationProvider; @@ -194,7 +195,7 @@ public void visitMethod(PsiMethod method) { continue; } final PsiClass aClass = (PsiClass)target; - if (!InheritanceUtil.isInheritor(aClass, "java.lang.RuntimeException")) { + if (!InheritanceUtil.isInheritor(aClass, JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION)) { continue; } final String className = aClass.getName(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java index 6dabaeffb0..c2deb2717e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/AbstractMethodOverridesAbstractMethodInspection.java @@ -23,6 +23,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -164,7 +165,7 @@ private boolean haveSameAnnotations(PsiModifierListOwner owner1, PsiModifierList final Set annotationsSet = new HashSet(Arrays.asList(superAnnotations)); for (PsiAnnotation annotation : annotations) { final String qualifiedName = annotation.getQualifiedName(); - if ("java.lang.Override".equals(qualifiedName)) { + if (JavaClassNames.JAVA_LANG_OVERRIDE.equals(qualifiedName)) { continue; } if (!annotationsSet.contains(annotation)) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java index 1d8fd3cf34..10bb31f49d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/StringConcatenationInspection.java @@ -32,6 +32,7 @@ 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.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; @@ -207,7 +208,7 @@ public void visitPolyadicExpression(@Nonnull PsiPolyadicExpression expression) { PsiTreeUtil.getParentOfType(expression, PsiNewExpression.class, true, PsiCodeBlock.class, PsiClass.class); if (newExpression != null) { final PsiType newExpressionType = newExpression.getType(); - if (InheritanceUtil.isInheritor(newExpressionType, "java.lang.Throwable")) { + if (InheritanceUtil.isInheritor(newExpressionType, JavaClassNames.JAVA_LANG_THROWABLE)) { return; } } else { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java index d05b4d7738..7e9e20d46b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/jdk/VarargParameterInspection.java @@ -24,6 +24,7 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.application.util.query.Query; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -103,7 +104,7 @@ protected void doFix(Project project, ProblemDescriptor descriptor) { if (typeElement == null) { return; } - final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, "java.lang.SafeVarargs"); + final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, JavaClassNames.JAVA_LANG_SAFE_VARARGS); if (annotation != null) { annotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java index 69ff07fadf..739c07f4d8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java @@ -25,6 +25,7 @@ import com.siyeh.ig.psiutils.TestUtils; 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.project.Project; @@ -193,7 +194,7 @@ private static void transformSetUpOrTearDownMethod(PsiMethod method) { if (!modifierList.hasModifierProperty(PsiModifier.PUBLIC)) { modifierList.setModifierProperty(PsiModifier.PUBLIC, true); } - final PsiAnnotation overrideAnnotation = modifierList.findAnnotation("java.lang.Override"); + final PsiAnnotation overrideAnnotation = modifierList.findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); if (overrideAnnotation != null) { overrideAnnotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java index 23b684d116..e646753745 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/logging/PlaceholderCountMatchesArgumentCountInspection.java @@ -27,6 +27,7 @@ import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpressionUtils; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -111,7 +112,7 @@ else if (ExpressionUtils.hasStringType(firstArgument)) { } private static boolean hasThrowableType(PsiExpression lastArgument) { - return InheritanceUtil.isInheritor(lastArgument.getType(), "java.lang.Throwable"); + return InheritanceUtil.isInheritor(lastArgument.getType(), JavaClassNames.JAVA_LANG_THROWABLE); } public static int countPlaceholders(String value) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java index bc307ae5f5..21f3cb8255 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConstantMathCallInspection.java @@ -22,6 +22,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; @@ -344,8 +345,8 @@ public void visitMethodCallExpression( return; } final String className = referencedClass.getQualifiedName(); - if (!"java.lang.Math".equals(className) - && !"java.lang.StrictMath".equals(className)) { + if (!JavaClassNames.JAVA_LANG_MATH.equals(className) + && !JavaClassNames.JAVA_LANG_STRICT_MATH.equals(className)) { return; } registerMethodCallError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java index 9a9bd8f399..2661a9419d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/NonReproducibleMathCallInspection.java @@ -21,6 +21,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; @@ -113,7 +114,7 @@ public void visitMethodCallExpression( return; } final String className = referencedClass.getQualifiedName(); - if (!"java.lang.Math".equals(className)) { + if (!JavaClassNames.JAVA_LANG_MATH.equals(className)) { return; } registerMethodCallError(expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java index c87f24500f..df0eef941e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ArraysAsListWithZeroOrOneArgumentInspection.java @@ -21,6 +21,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -127,7 +128,7 @@ else if (arguments.length != 0) { return; } final String className = containingClass.getQualifiedName(); - if (!"java.util.Arrays".equals(className)) { + if (!JavaClassNames.JAVA_UTIL_ARRAYS.equals(className)) { return; } registerMethodCallError(expression, Boolean.valueOf(arguments.length == 0)); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java index 5a51121dec..8b0f49de11 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/CollectionsListSettings.java @@ -48,13 +48,13 @@ public abstract class CollectionsListSettings static { final SortedSet set = new TreeSet<>(); - set.add("java.util.concurrent.ConcurrentHashMap"); + set.add(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP); set.add("java.util.concurrent.PriorityBlockingQueue"); set.add("java.util.ArrayDeque"); - set.add("java.util.ArrayList"); - set.add("java.util.HashMap"); + set.add(JavaClassNames.JAVA_UTIL_ARRAY_LIST); + set.add(JavaClassNames.JAVA_UTIL_HASH_MAP); set.add("java.util.Hashtable"); - set.add("java.util.HashSet"); + set.add(JavaClassNames.JAVA_UTIL_HASH_SET); set.add("java.util.IdentityHashMap"); set.add("java.util.LinkedHashMap"); set.add("java.util.LinkedHashSet"); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java index 7e8db16b48..165d56ca48 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java @@ -94,7 +94,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { final PsiExpressionList argumentList = expression.getArgumentList(); if (argumentList != null) { final PsiExpression[] arguments = argumentList.getExpressions(); - if (arguments.length > 0 && TypeUtils.expressionHasTypeOrSubtype(arguments[0], "java.util.Comparator")) { + if (arguments.length > 0 && TypeUtils.expressionHasTypeOrSubtype(arguments[0], JavaClassNames.JAVA_UTIL_COMPARATOR)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java index ac86346c13..880f053ca1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MethodMayBeStaticInspection.java @@ -32,6 +32,7 @@ import consulo.java.analysis.codeInspection.JavaExtensionPoints; import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; +import consulo.util.lang.ref.SimpleReference; import jakarta.annotation.Nonnull; import javax.swing.*; @@ -130,7 +131,7 @@ private boolean implementsSurprisingInterface(PsiMethod method) { return false; } Query search = ClassInheritorsSearch.search(containingClass, method.getUseScope(), true, true, false); - boolean[] result = new boolean[1]; + SimpleReference result = SimpleReference.create(false); search.forEach(new Predicate<>() { int count = 0; @@ -138,7 +139,7 @@ private boolean implementsSurprisingInterface(PsiMethod method) { @RequiredReadAction public boolean test(PsiClass subClass) { if (++count > 5) { - result[0] = true; + result.set(true); return false; } PsiReferenceList list = subClass.getImplementsList(); @@ -147,25 +148,17 @@ public boolean test(PsiClass subClass) { } PsiJavaCodeReferenceElement[] referenceElements = list.getReferenceElements(); for (PsiJavaCodeReferenceElement referenceElement : referenceElements) { - PsiElement target = referenceElement.resolve(); - if (!(target instanceof PsiClass)) { - result[0] = true; - return false; - } - PsiClass aClass = (PsiClass)target; - if (!aClass.isInterface()) { - result[0] = true; - return false; - } - if (aClass.findMethodBySignature(method, true) != null) { - result[0] = true; + if (!(referenceElement.resolve() instanceof PsiClass aClass) + || !aClass.isInterface() + || aClass.findMethodBySignature(method, true) != null) { + result.set(true); return false; } } return true; } }); - return result[0]; + return result.get(); } private boolean isExcluded(PsiMethod method) { @@ -174,7 +167,7 @@ private boolean isExcluded(PsiMethod method) { if (!method.isPrivate()) { return false; } - if (!MethodUtils.hasInThrows(method, "java.io.IOException")) { + if (!MethodUtils.hasInThrows(method, JavaClassNames.JAVA_IO_IO_EXCEPTION)) { return false; } PsiType returnType = method.getReturnType(); @@ -193,7 +186,7 @@ private boolean isExcluded(PsiMethod method) { if (!method.isPrivate()) { return false; } - if (!MethodUtils.hasInThrows(method, "java.io.IOException", "java.lang.ClassNotFoundException")) { + if (!MethodUtils.hasInThrows(method, JavaClassNames.JAVA_IO_IO_EXCEPTION, "java.lang.ClassNotFoundException")) { return false; } PsiType returnType = method.getReturnType(); 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 d8da6d6de4..d6a80769fd 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 @@ -41,8 +41,8 @@ public class FormatUtils { formatMethodNames.add("format"); formatMethodNames.add("printf"); - formatClassNames.add("java.io.PrintWriter"); - formatClassNames.add("java.io.PrintStream"); + formatClassNames.add(JavaClassNames.JAVA_IO_PRINT_WRITER); + formatClassNames.add(JavaClassNames.JAVA_IO_PRINT_STREAM); formatClassNames.add("java.util.Formatter"); formatClassNames.add(JavaClassNames.JAVA_LANG_STRING); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java index 0285ab38ee..011070b76e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java @@ -26,6 +26,7 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.java.language.module.util.JavaClassNames; import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -84,7 +85,7 @@ public void visitClass(@Nonnull PsiClass aClass) { break; } } - if (ignoreThrowable && InheritanceUtil.isInheritor(aClass, false, "java.lang.Throwable")) { + if (ignoreThrowable && InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_LANG_THROWABLE)) { return; } registerClassError(aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/SerializableClassInSecureContextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/SerializableClassInSecureContextInspection.java index e54b83a556..1bf7ae7f2c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/SerializableClassInSecureContextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/SerializableClassInSecureContextInspection.java @@ -26,6 +26,7 @@ import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.java.language.module.util.JavaClassNames; import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -84,7 +85,7 @@ public void visitClass(@Nonnull PsiClass aClass) { break; } } - if (ignoreThrowable && InheritanceUtil.isInheritor(aClass, false, "java.lang.Throwable")) { + if (ignoreThrowable && InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_LANG_THROWABLE)) { return; } registerClassError(aClass); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java index 10f44fca78..ffef8273f5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/UnsecureRandomNumberGenerationInspection.java @@ -21,6 +21,7 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -102,7 +103,7 @@ public void visitMethodCallExpression( return; } final String className = containingClass.getQualifiedName(); - if (!"java.lang.Math".equals(className)) { + if (!JavaClassNames.JAVA_LANG_MATH.equals(className)) { return; } registerMethodCallError(expression, expression); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java index 0c25bac5cb..da56905949 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspection.java @@ -24,6 +24,7 @@ import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -134,7 +135,7 @@ public void visitClass(@Nonnull PsiClass aClass) { } private static boolean isExternalizable(PsiClass aClass) { - final PsiClass externalizableClass = ClassUtils.findClass("java.io.Externalizable", aClass); + final PsiClass externalizableClass = ClassUtils.findClass(JavaClassNames.JAVA_IO_EXTERNALIZABLE, aClass); return externalizableClass != null && aClass.isInheritor(externalizableClass, true); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java index d9d981e6bf..5b40b3485e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java @@ -125,7 +125,7 @@ private static StringBuilder buildStringExpression(PsiExpression expression, @No final PsiType type = argument.getType(); if (!PsiType.INT.equals(type)) { result.append(argument.getText()); - if (type != null && type.equalsToText("java.lang.CharSequence")) { + if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_CHAR_SEQUENCE)) { result.append(".toString()"); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java index 8e724655b8..577043761c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryCallToStringValueOfInspection.java @@ -181,7 +181,7 @@ private boolean isCallToStringValueOfNecessary(PsiMethodCallExpression expressio if (expressions.length < 2 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[1]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, "java.lang.StringBuilder", "java.lang.StringBuffer")) { + if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } @@ -189,11 +189,11 @@ private boolean isCallToStringValueOfNecessary(PsiMethodCallExpression expressio if (expressions.length < 1 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[0]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, "java.lang.StringBuilder", "java.lang.StringBuffer")) { + if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } } else if ("print".equals(name) || "println".equals(name)) { - if (!isCallToMethodIn(methodCallExpression, "java.io.PrintStream", "java.io.PrintWriter")) { + if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_IO_PRINT_STREAM, JavaClassNames.JAVA_IO_PRINT_WRITER)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java index d4667103ef..485402a194 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/UnnecessaryToStringCallInspection.java @@ -162,7 +162,7 @@ private boolean isToStringCallNecessary(PsiMethodCallExpression expression) { if (expressions.length < 2 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[1]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, "java.lang.StringBuilder", "java.lang.StringBuffer")) { + if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } @@ -170,11 +170,11 @@ private boolean isToStringCallNecessary(PsiMethodCallExpression expression) { if (expressions.length < 1 || !expression.equals(ParenthesesUtils.stripParentheses(expressions[0]))) { return true; } - if (!isCallToMethodIn(methodCallExpression, "java.lang.StringBuilder", "java.lang.StringBuffer")) { + if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_LANG_STRING_BUILDER, JavaClassNames.JAVA_LANG_STRING_BUFFER)) { return true; } } else if ("print".equals(name) || "println".equals(name)) { - if (!isCallToMethodIn(methodCallExpression, "java.io.PrintStream", "java.io.PrintWriter")) { + if (!isCallToMethodIn(methodCallExpression, JavaClassNames.JAVA_IO_PRINT_STREAM, JavaClassNames.JAVA_IO_PRINT_WRITER)) { return true; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java index 6868184fa0..dd671662b5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java @@ -22,6 +22,7 @@ import com.siyeh.ig.ui.ExternalizableStringSet; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.lang.StringUtil; @@ -42,9 +43,7 @@ public class AccessToNonThreadSafeStaticFieldFromInstanceInspection public String nonThreadSafeTypes = ""; @SuppressWarnings("PublicField") public final ExternalizableStringSet nonThreadSafeClasses = - new ExternalizableStringSet( - "java.text.SimpleDateFormat", - "java.util.Calendar"); + new ExternalizableStringSet("java.text.SimpleDateFormat", JavaClassNames.JAVA_UTIL_CALENDAR); public AccessToNonThreadSafeStaticFieldFromInstanceInspection() { if (nonThreadSafeTypes.length() != 0) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java index 075dace5cc..c5bcd75dab 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/threading/ThreadWithDefaultRunMethodInspection.java @@ -22,6 +22,7 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import jakarta.annotation.Nonnull; @@ -79,8 +80,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { } final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { - if (TypeUtils.expressionHasTypeOrSubtype(argument, - "java.lang.Runnable")) { + if (TypeUtils.expressionHasTypeOrSubtype(argument, JavaClassNames.JAVA_LANG_RUNNABLE)) { return; } } @@ -109,8 +109,7 @@ public void visitNewExpression(@Nonnull PsiNewExpression expression) { } final PsiExpression[] arguments = argumentList.getExpressions(); for (PsiExpression argument : arguments) { - if (TypeUtils.expressionHasTypeOrSubtype(argument, - "java.lang.Runnable")) { + if (TypeUtils.expressionHasTypeOrSubtype(argument, JavaClassNames.JAVA_LANG_RUNNABLE)) { return; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java index 70b53edcdb..1b75622fff 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/adapter/AdapterToListenerIntention.java @@ -23,6 +23,7 @@ import com.intellij.java.language.psi.util.PsiUtil; import com.siyeh.IntentionPowerPackBundle; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.codeStyle.CodeStyleSettingsManager; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; @@ -184,7 +185,7 @@ private static void implementMethodInClass(@Nonnull PsiMethod method, CodeStyleSettingsManager.getSettings(project).getCustomSettings(JavaCodeStyleSettings.class); if (codeStyleSettings.INSERT_OVERRIDE_ANNOTATION && PsiUtil.isLanguageLevel6OrHigher(aClass)) { - modifierList.addAnnotation("java.lang.Override"); + modifierList.addAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); } final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java index 9214bfd199..c85d8e3ed9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/CharToStringPredicate.java @@ -57,7 +57,7 @@ private static boolean isInConcatenationContext(PsiElement element) { return false; } final String parentTypeText = parentType.getCanonicalText(); - return "java.lang.String".equals(parentTypeText); + return JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText); } else if (parent instanceof PsiAssignmentExpression) { final PsiAssignmentExpression parentExpression = @@ -71,7 +71,7 @@ else if (parent instanceof PsiAssignmentExpression) { return false; } final String parentTypeText = parentType.getCanonicalText(); - return "java.lang.String".equals(parentTypeText); + return JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText); } else if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); @@ -108,7 +108,7 @@ else if (parent instanceof PsiExpressionList) { final PsiElement method = methodExpression.resolve(); return method != null; } - else if ("java.lang.String".equals(className)) { + else if (JavaClassNames.JAVA_LANG_STRING.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"indexOf".equals(methodName) && diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java index 7baba018ef..43ba6e66ed 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/chartostring/StringToCharPredicate.java @@ -36,7 +36,7 @@ public boolean satisfiedBy(PsiElement element) { return false; } final String typeText = type.getCanonicalText(); - if (!"java.lang.String".equals(typeText)) { + if (!JavaClassNames.JAVA_LANG_STRING.equals(typeText)) { return false; } final String value = (String)expression.getValue(); @@ -56,7 +56,7 @@ private static boolean isInConcatenationContext(PsiElement element) { return false; } final String parentTypeText = parentType.getCanonicalText(); - if (!"java.lang.String".equals(parentTypeText)) { + if (!JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText)) { return false; } if (parentExpression.getOperationTokenType() != JavaTokenType.PLUS) { @@ -67,14 +67,14 @@ private static boolean isInConcatenationContext(PsiElement element) { if (index > 0) { for (int i = 0; i < index && i < operands.length; i++) { final PsiType type = operands[i].getType(); - if (type != null && type.equalsToText("java.lang.String")) { + if (type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { return true; } } } else if (index == 0) { final PsiType type = operands[index + 1].getType(); - return type != null && type.equalsToText("java.lang.String"); + return type != null && type.equalsToText(JavaClassNames.JAVA_LANG_STRING); } return false; } @@ -90,7 +90,7 @@ else if (parent instanceof PsiAssignmentExpression) { return false; } final String parentTypeText = parentType.getCanonicalText(); - return "java.lang.String".equals(parentTypeText); + return JavaClassNames.JAVA_LANG_STRING.equals(parentTypeText); } if (parent instanceof PsiExpressionList) { final PsiElement grandParent = parent.getParent(); @@ -127,7 +127,7 @@ else if (parent instanceof PsiAssignmentExpression) { final PsiElement method = methodExpression.resolve(); return method != null; } - else if ("java.lang.String".equals(className)) { + else if (JavaClassNames.JAVA_LANG_STRING.equals(className)) { @NonNls final String methodName = methodExpression.getReferenceName(); if (!"indexOf".equals(methodName) && diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java index b96ce39264..c0556c6872 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/CopyConcatenatedStringToClipboardIntention.java @@ -23,6 +23,7 @@ import com.intellij.java.language.psi.PsiType; import com.siyeh.ig.psiutils.ExpressionUtils; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; @@ -54,7 +55,7 @@ protected void processIntention(@Nonnull PsiElement element) throws IncorrectOpe return; } final PsiType type = concatenationExpression.getType(); - if (type == null || !type.equalsToText("java.lang.String")) { + if (type == null || !type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { return; } final StringBuilder text = buildConcatenationText(concatenationExpression, new StringBuilder()); diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java index 1ac9fdf75d..9d8565fd9a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/concatenation/ReplaceConcatenationWithFormatStringIntention.java @@ -21,6 +21,7 @@ import com.intellij.java.language.psi.util.PsiConcatenationUtil; import com.intellij.java.language.psi.*; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -97,8 +98,8 @@ else if ("print".equals(name)) { return false; } final String qualifiedName = containingClass.getQualifiedName(); - if (!"java.io.PrintStream".equals(qualifiedName) && - !"java.io.Printwriter".equals(qualifiedName)) { + if (!JavaClassNames.JAVA_IO_PRINT_STREAM.equals(qualifiedName) && + !JavaClassNames.JAVA_IO_PRINT_WRITER.equals(qualifiedName)) { return false; } final StringBuilder newExpression = new StringBuilder(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java index a1975bf0d2..472abaa251 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantExpressionPredicate.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.ipp.constant; import com.intellij.java.language.psi.PsiClassObjectAccessExpression; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiLiteralExpression; @@ -37,7 +38,7 @@ public boolean satisfiedBy(PsiElement element) { } final PsiPolyadicExpression expression = (PsiPolyadicExpression)element; final PsiType expressionType = expression.getType(); - if (expressionType == null || expressionType.equalsToText("java.lang.String")) { + if (expressionType == null || expressionType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { // intention disabled for string concatenations because of performance issues on // relatively common large string expressions. return false; @@ -48,7 +49,7 @@ public boolean satisfiedBy(PsiElement element) { return false; } final PsiType type = operand.getType(); - if (type == null || type.equalsToText("java.lang.String")) { + if (type == null || type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { return false; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java index 5fa2dd12b7..8a5a07d15e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/constant/ConstantSubexpressionPredicate.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ipp.constant; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nullable; import com.intellij.java.language.psi.JavaPsiFacade; import consulo.language.psi.PsiElement; @@ -51,7 +52,7 @@ public boolean satisfiedBy(PsiElement element) { } final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)parent; final PsiType type = polyadicExpression.getType(); - if (type == null || type.equalsToText("java.lang.String")) { + if (type == null || type.equalsToText(JavaClassNames.JAVA_LANG_STRING)) { // handled by JoinConcatenatedStringLiteralsIntention return false; } diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java index 4db8ca2ef9..ca1a0ff732 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/junit/ConvertJUnit3TestCaseToJUnit4Intention.java @@ -20,6 +20,7 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.intention.IntentionMetaData; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; @@ -97,7 +98,7 @@ private static void transformSetUpOrTearDownMethod(PsiMethod method) { if (!modifierList.hasModifierProperty(PsiModifier.PUBLIC)) { modifierList.setModifierProperty(PsiModifier.PUBLIC, true); } - final PsiAnnotation overrideAnnotation = modifierList.findAnnotation("java.lang.Override"); + final PsiAnnotation overrideAnnotation = modifierList.findAnnotation(JavaClassNames.JAVA_LANG_OVERRIDE); if (overrideAnnotation != null) { overrideAnnotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java index 2e80a0544d..1b5f01c195 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/beanProperties/CreateBeanPropertyFix.java @@ -22,6 +22,7 @@ import com.intellij.java.language.psi.util.PropertyUtil; import consulo.codeEditor.Editor; import consulo.java.analysis.impl.JavaQuickFixBundle; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.WriteCommandAction; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; @@ -67,7 +68,7 @@ private static Object[] create(final String propertyName, final PsiClass psiClas if (type == null) { final Project project = psiClass.getProject(); final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); - final PsiClass aClass = facade.findClass("java.lang.String", GlobalSearchScope.allScope(project)); + final PsiClass aClass = facade.findClass(JavaClassNames.JAVA_LANG_STRING, GlobalSearchScope.allScope(project)); if (aClass == null) { return NO_FIXES; } diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java index e2c68cd6e8..1fe50f632c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/impl/source/javadoc/ExceptionTagInfo.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.psi.impl.source.javadoc; +import consulo.java.language.module.util.JavaClassNames; import org.jetbrains.annotations.NonNls; import com.intellij.java.language.impl.codeInsight.daemon.JavaErrorBundle; import com.intellij.java.language.psi.JavaPsiFacade; @@ -56,7 +57,7 @@ public String checkTagValue(PsiDocTagValue value) { final PsiClass exceptionClass = (PsiClass)element; - final PsiClass throwable = JavaPsiFacade.getInstance(value.getProject()).findClass("java.lang.Throwable", value.getResolveScope()); + final PsiClass throwable = JavaPsiFacade.getInstance(value.getProject()).findClass(JavaClassNames.JAVA_LANG_THROWABLE, value.getResolveScope()); if (throwable != null) { if (!exceptionClass.equals(throwable) && !exceptionClass.isInheritor(throwable, true)) { @@ -65,14 +66,15 @@ public String checkTagValue(PsiDocTagValue value) { } final PsiClass runtimeException = - JavaPsiFacade.getInstance(value.getProject()).findClass("java.lang.RuntimeException", value.getResolveScope()); + JavaPsiFacade.getInstance(value.getProject()).findClass(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, value.getResolveScope()); if (runtimeException != null && (exceptionClass.isInheritor(runtimeException, true) || exceptionClass.equals(runtimeException))) { return null; } - final PsiClass errorException = JavaPsiFacade.getInstance(value.getProject()).findClass("java.lang.Error", value.getResolveScope()); + PsiClass errorException = JavaPsiFacade.getInstance(value.getProject()) + .findClass(JavaClassNames.JAVA_LANG_ERROR, value.getResolveScope()); if (errorException != null && (exceptionClass.isInheritor(errorException, true) || exceptionClass.equals(errorException))) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureDialog.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureDialog.java index 20b00c5193..6a04b0e259 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,6 +43,7 @@ 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; @@ -630,7 +631,7 @@ protected String validateAndCommitData() { } PsiClassType throwable = JavaPsiFacade.getInstance(myProject).getElementFactory() - .createTypeByFQClassName("java.lang.Throwable", type.getResolveScope()); + .createTypeByFQClassName(JavaClassNames.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/extractclass/ExtractClassProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java index 0edbd24d0c..9ac48c066e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractClassProcessor.java @@ -39,6 +39,7 @@ import consulo.application.Application; import consulo.application.Result; import consulo.ide.impl.idea.openapi.module.ModuleUtil; +import consulo.java.language.module.util.JavaClassNames; import consulo.java.localize.JavaRefactoringLocalize; import consulo.language.ast.IElementType; import consulo.language.codeStyle.CodeStyleManager; @@ -795,11 +796,11 @@ private List calculateInterfacesSupported() { PsiManager manager = sourceClass.getManager(); GlobalSearchScope scope = GlobalSearchScope.allScope(project); if (usesDefaultSerialization(sourceClass)) { - PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.io.Serializable", scope); + PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, scope); out.add(serializable); } if (usesDefaultClone(sourceClass)) { - PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Cloneable", scope); + PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_CLONEABLE, scope); out.add(cloneable); } return out; @@ -819,7 +820,7 @@ private static boolean usesDefaultClone(PsiClass aClass) { Project project = aClass.getProject(); PsiManager manager = aClass.getManager(); GlobalSearchScope scope = GlobalSearchScope.allScope(project); - PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Cloneable", scope); + PsiClass cloneable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_LANG_CLONEABLE, scope); if (!InheritanceUtil.isInheritorOrSelf(aClass, cloneable, true)) { return false; } @@ -838,7 +839,7 @@ private static boolean usesDefaultSerialization(PsiClass aClass) { Project project = aClass.getProject(); PsiManager manager = aClass.getManager(); GlobalSearchScope scope = GlobalSearchScope.allScope(project); - PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.io.Serializable", scope); + PsiClass serializable = JavaPsiFacade.getInstance(manager.getProject()).findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, scope); if (!InheritanceUtil.isInheritorOrSelf(aClass, serializable, true)) { return false; } 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 fa70e4ed19..18919295a5 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 @@ -231,7 +231,7 @@ private void analyzeConflicts(UsageInfo[] usage, MultiMap co HashMap> reportedUpcasts = new HashMap>(); // HashSet reportedObjectUpcasts = new HashSet(); - // final String nameJavaLangObject = ConflictsUtil.htmlEmphasize("java.lang.Object"); + // final String nameJavaLangObject = ConflictsUtil.htmlEmphasize(JavaClassNames.JAVA_LANG_OBJECT); final String classDescription = RefactoringUIUtil.getDescription(myClass, false); for (UsageInfo aUsage : usage) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/memberPushDown/PushDownProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/memberPushDown/PushDownProcessor.java index 0af5d7ee0e..a851cd8f4c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/memberPushDown/PushDownProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/memberPushDown/PushDownProcessor.java @@ -33,6 +33,7 @@ import consulo.annotation.access.RequiredReadAction; import consulo.application.progress.ProgressManager; import consulo.ide.impl.idea.refactoring.util.DocCommentPolicy; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.refactoring.BaseRefactoringProcessor; import consulo.language.editor.refactoring.localize.RefactoringLocalize; import consulo.language.psi.PsiElement; @@ -410,7 +411,7 @@ else if (memberInfo.isToAbstract()) { } } else { //abstract method: remove @Override - final PsiAnnotation annotation = AnnotationUtil.findAnnotation(methodBySignature, "java.lang.Override"); + final PsiAnnotation annotation = AnnotationUtil.findAnnotation(methodBySignature, JavaClassNames.JAVA_LANG_OVERRIDE); if (annotation != null && !leaveOverrideAnnotation(substitutor, method)) { annotation.delete(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java index 832733e42a..24adc8ef76 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/AutomaticVariableRenamer.java @@ -19,6 +19,7 @@ import com.intellij.java.language.impl.psi.impl.source.tree.JavaElementType; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.ASTNode; import consulo.language.editor.refactoring.localize.RefactoringLocalize; import consulo.util.lang.StringUtil; @@ -95,7 +96,7 @@ private void checkRenameVariable(final PsiElement element, final PsiVariable var } } else { PsiType collectionType = JavaPsiFacade.getInstance(variable.getProject()).getElementFactory() - .createTypeByFQClassName("java.util.Collection", variable.getResolveScope()); + .createTypeByFQClassName(JavaClassNames.JAVA_UTIL_COLLECTION, variable.getResolveScope()); if (!collectionType.isAssignableFrom(variable.getType())) return; final PsiTypeElement[] typeParameterElements = ref.getParameterList().getTypeParameterElements(); for (PsiTypeElement typeParameterElement : typeParameterElements) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java index 61cc59737d..2f550171f0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java @@ -404,7 +404,7 @@ private void checkToArray(PsiElement ref, PsiNewExpression newExpression) { PsiElement tmp; final PsiClass javaUtilCollectionClass = - JavaPsiFacade.getInstance(myManager.getProject()).findClass("java.util.Collection", ref.getResolveScope()); + JavaPsiFacade.getInstance(myManager.getProject()).findClass(JavaClassNames.JAVA_UTIL_COLLECTION, ref.getResolveScope()); if (javaUtilCollectionClass == null) return; tmp = newExpression.getParent(); if (!(tmp instanceof PsiExpressionList)) return; diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java index b6fa1ba9bb..ecf41b9c16 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/builder/SystemBuilder.java @@ -1014,7 +1014,7 @@ private void addForEachConstraint(final ReductionSystem system, final PsiForeach final PsiClass clazz = resolveResult.getElement(); if (clazz != null) { final PsiClass iterableClass = - JavaPsiFacade.getInstance(clazz.getProject()).findClass("java.lang.Iterable", clazz.getResolveScope()); + JavaPsiFacade.getInstance(clazz.getProject()).findClass(JavaClassNames.JAVA_LANG_ITERABLE, clazz.getResolveScope()); if (iterableClass != null) { final PsiTypeParameter[] typeParameters = iterableClass.getTypeParameters(); if (typeParameters.length == 1) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java index 73e012760c..9a010f77ff 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeCook/deductive/resolver/BindingFactory.java @@ -358,10 +358,10 @@ int[] classify2(final PsiType x, final PsiType y) { if (kindX + kindY == 5) { try { - final PsiElementFactory f = JavaPsiFacade.getInstance(myProject).getElementFactory(); - final PsiType cloneable = f.createTypeFromText("java.lang.Cloneable", null); - final PsiType object = f.createTypeFromText(JavaClassNames.JAVA_LANG_OBJECT, null); - final PsiType serializable = f.createTypeFromText("java.io.Serializable", null); + PsiElementFactory f = JavaPsiFacade.getInstance(myProject).getElementFactory(); + PsiType cloneable = f.createTypeFromText(JavaClassNames.JAVA_LANG_CLONEABLE, null); + PsiType object = f.createTypeFromText(JavaClassNames.JAVA_LANG_OBJECT, null); + PsiType serializable = f.createTypeFromText(JavaClassNames.JAVA_IO_SERIALIZABLE, null); PsiType type; int flag; @@ -1062,12 +1062,12 @@ void intersect(final PsiType x, final PsiType y, final LinkedList", superTypes[0].getCanonicalText()); final PsiClass[] supers = enumClass.getSupers(); assertEquals(1, supers.length); - assertEquals("java.lang.Enum", supers[0].getQualifiedName()); + assertEquals(JavaClassNames.JAVA_LANG_ENUM, supers[0].getQualifiedName()); final PsiClassType[] extendsListTypes = enumClass.getExtendsListTypes(); assertEquals(1, extendsListTypes.length); assertEquals("java.lang.Enum", extendsListTypes[0].getCanonicalText()); diff --git a/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java b/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java index 1962cca393..30d37dbc1f 100644 --- a/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java +++ b/plugin/src/test/java_/com/intellij/psi/SrcRepositoryUseTest.java @@ -114,7 +114,7 @@ public void testClassParameter() { assertEquals(params[0].getName(), "A"); assertEquals(params[1].getName(), "B"); - assertEquals("java.lang.String", params[0].getSupers()[0].getQualifiedName()); + assertEquals(JavaClassNames.JAVA_LANG_STRING, params[0].getSupers()[0].getQualifiedName()); assertEquals(JavaClassNames.JAVA_LANG_OBJECT, params[1].getSupers()[0].getQualifiedName()); teardownLoadingFilter(); @@ -519,7 +519,7 @@ public void testThrowsList() throws Exception { PsiClassType[] refs = list.getReferencedTypes(); assertEquals(2, refs.length); assertEquals("Exception", refs[0].getPresentableText()); - assertEquals("java.io.IOException", refs[1].getCanonicalText()); + assertEquals(JavaClassNames.JAVA_IO_IO_EXCEPTION, refs[1].getCanonicalText()); teardownLoadingFilter(); } @@ -577,7 +577,7 @@ private static void checkPackAAA(PsiType type) { public void testAnonymousClass() throws Exception { setupLoadingFilter(); - PsiClass cloneableClass = myJavaFacade.findClass("java.lang.Cloneable", GlobalSearchScope.allScope(myProject)); + PsiClass cloneableClass = myJavaFacade.findClass(JavaClassNames.JAVA_LANG_CLONEABLE, GlobalSearchScope.allScope(myProject)); PsiClass[] inheritors = ClassInheritorsSearch.search(cloneableClass, GlobalSearchScope.projectScope(myProject), true).toArray(PsiClass.EMPTY_ARRAY); assertEquals(2, inheritors.length); assertTrue(inheritors[0] instanceof PsiAnonymousClass || inheritors[1] instanceof PsiAnonymousClass); @@ -586,7 +586,7 @@ public void testAnonymousClass() throws Exception { PsiClassType baseClassRef = anonClass.getBaseClassType(); assertEquals("Cloneable", baseClassRef.getPresentableText()); assertEquals(cloneableClass, baseClassRef.resolve()); - assertEquals("java.lang.Cloneable", baseClassRef.getCanonicalText()); + assertEquals(JavaClassNames.JAVA_LANG_CLONEABLE, baseClassRef.getCanonicalText()); teardownLoadingFilter(); @@ -604,7 +604,7 @@ private void setupLoadingFilter() { public void testAnonymousClass2() throws Exception { setupLoadingFilter(); - PsiClass throwable = myJavaFacade.findClass("java.lang.Throwable", GlobalSearchScope.allScope(myProject)); + PsiClass throwable = myJavaFacade.findClass(JavaClassNames.JAVA_LANG_THROWABLE, GlobalSearchScope.allScope(myProject)); PsiClass[] inheritors = ClassInheritorsSearch.search(throwable, GlobalSearchScope.projectScope(myProject), true).toArray(PsiClass.EMPTY_ARRAY); assertEquals(1, inheritors.length); assertTrue(inheritors[0] instanceof PsiAnonymousClass); @@ -613,7 +613,7 @@ public void testAnonymousClass2() throws Exception { PsiClassType baseClassRef = anonClass.getBaseClassType(); assertEquals("Throwable", baseClassRef.getPresentableText()); assertEquals(throwable, baseClassRef.resolve()); - assertEquals("java.lang.Throwable", baseClassRef.getCanonicalText()); + assertEquals(JavaClassNames.JAVA_LANG_THROWABLE, baseClassRef.getCanonicalText()); teardownLoadingFilter(); @@ -623,7 +623,7 @@ public void testAnonymousClass2() throws Exception { public void testLocalClass() throws Exception { setupLoadingFilter(); - PsiClass cloneableClass = myJavaFacade.findClass("java.lang.Cloneable", GlobalSearchScope.allScope(myProject)); + PsiClass cloneableClass = myJavaFacade.findClass(JavaClassNames.JAVA_LANG_CLONEABLE, GlobalSearchScope.allScope(myProject)); PsiClass[] inheritors = ClassInheritorsSearch.search(cloneableClass, GlobalSearchScope.projectScope(myProject), true).toArray(PsiClass.EMPTY_ARRAY); assertEquals(2, inheritors.length); assertTrue(inheritors[0] instanceof PsiAnonymousClass || inheritors[1] instanceof PsiAnonymousClass); diff --git a/plugin/src/test/java_/com/intellij/psi/TypesTest.java b/plugin/src/test/java_/com/intellij/psi/TypesTest.java index d9281d3072..34f44b6e99 100644 --- a/plugin/src/test/java_/com/intellij/psi/TypesTest.java +++ b/plugin/src/test/java_/com/intellij/psi/TypesTest.java @@ -23,6 +23,7 @@ import com.intellij.java.language.psi.*; import consulo.application.ApplicationManager; +import consulo.java.language.module.util.JavaClassNames; import consulo.util.lang.Comparing; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; @@ -75,9 +76,9 @@ public void testSimpleStuff() throws Exception { final PsiMethod methodFromList = (PsiMethod) resolveResult.getElement(); final PsiType typeOfFirstParameterOfAdd = methodFromList.getParameterList().getParameters()[0].getType(); final PsiType substitutedType = resolveResult.getSubstitutor().substitute(typeOfFirstParameterOfAdd); - final PsiClassType typeA = factory.createTypeByFQClassName("java.lang.String"); + final PsiClassType typeA = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_STRING); assertEquals(typeA, substitutedType); - assertTrue(typeA.equalsToText("java.lang.String")); + assertTrue(typeA.equalsToText(JavaClassNames.JAVA_LANG_STRING)); final PsiType aListIteratorType = ((PsiExpressionStatement) methodStatements[2]).getExpression().getType(); final PsiType aIteratorType = factory.createTypeFromText("test.Iterator", null); @@ -132,7 +133,7 @@ public void testSubstWithInheritor() throws Exception { final PsiMethod methodFromList = (PsiMethod) resolveResult.getElement(); final PsiType typeOfFirstParameterOfAdd = methodFromList.getParameterList().getParameters()[0].getType(); final PsiType substitutedType = resolveResult.getSubstitutor().substitute(typeOfFirstParameterOfAdd); - final PsiType javaLangInteger = factory.createTypeFromText("java.lang.Integer", null); + final PsiType javaLangInteger = factory.createTypeFromText(JavaClassNames.JAVA_LANG_INTEGER, null); assertEquals(javaLangInteger, substitutedType); final PsiType intListIteratorReturnType = ((PsiExpressionStatement) methodStatements[2]).getExpression().getType(); @@ -322,7 +323,7 @@ public void testMethodTypeParameter() throws Exception { final PsiStatement[] statements = method.getBody().getStatements(); final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression) ((PsiExpressionStatement) statements[1]).getExpression(); - isCollectionUtilSort(methodCallExpression, factory.createTypeFromText("java.lang.Integer", null)); + isCollectionUtilSort(methodCallExpression, factory.createTypeFromText(JavaClassNames.JAVA_LANG_INTEGER, null)); final PsiMethodCallExpression methodCallExpression1 = (PsiMethodCallExpression) ((PsiExpressionStatement) statements[3]).getExpression(); isCollectionUtilSort(methodCallExpression1, null); diff --git a/plugin/src/test/java_/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java b/plugin/src/test/java_/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java index bee57a352d..8405f96ab5 100644 --- a/plugin/src/test/java_/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java +++ b/plugin/src/test/java_/com/intellij/psi/impl/source/tree/java/ExtendsBoundListTest.java @@ -63,7 +63,7 @@ public void run() { public void testAddBoundInTheMiddle() throws Exception { final PsiTypeParameter typeParameter = getTypeParameter(); final PsiReferenceList extendsList = typeParameter.getExtendsList(); - final PsiClass cloneableClass = getJavaFacade().findClass("java.lang.Cloneable"); + final PsiClass cloneableClass = getJavaFacade().findClass(JavaClassNames.JAVA_LANG_CLONEABLE); assertNotNull(cloneableClass); final PsiJavaCodeReferenceElement reference = getJavaFacade().getElementFactory().createClassReferenceElement(cloneableClass); extendsList.addAfter(reference, extendsList.getReferenceElements()[0]); @@ -73,7 +73,7 @@ public void testAddBoundInTheMiddle() throws Exception { public void testAddBoundInFront() throws Exception { final PsiTypeParameter typeParameter = getTypeParameter(); final PsiReferenceList extendsList = typeParameter.getExtendsList(); - final PsiClass cloneableClass = getJavaFacade().findClass("java.lang.Cloneable"); + final PsiClass cloneableClass = getJavaFacade().findClass(JavaClassNames.JAVA_LANG_CLONEABLE); assertNotNull(cloneableClass); final PsiJavaCodeReferenceElement reference = getJavaFacade().getElementFactory().createClassReferenceElement(cloneableClass); extendsList.addBefore(reference, extendsList.getReferenceElements()[0]); @@ -83,7 +83,7 @@ public void testAddBoundInFront() throws Exception { public void testAddBoundInEnd() throws Exception { final PsiTypeParameter typeParameter = getTypeParameter(); final PsiReferenceList extendsList = typeParameter.getExtendsList(); - final PsiClass cloneableClass = getJavaFacade().findClass("java.lang.Cloneable"); + final PsiClass cloneableClass = getJavaFacade().findClass(JavaClassNames.JAVA_LANG_CLONEABLE); assertNotNull(cloneableClass); final PsiJavaCodeReferenceElement reference = getJavaFacade().getElementFactory().createClassReferenceElement(cloneableClass); extendsList.addBefore(reference, null); diff --git a/plugin/src/test/java_/com/intellij/psi/resolve/ResolveClassTest.java b/plugin/src/test/java_/com/intellij/psi/resolve/ResolveClassTest.java index 4217a2f22b..c194adfe71 100644 --- a/plugin/src/test/java_/com/intellij/psi/resolve/ResolveClassTest.java +++ b/plugin/src/test/java_/com/intellij/psi/resolve/ResolveClassTest.java @@ -17,6 +17,7 @@ import com.intellij.java.language.psi.*; import consulo.application.ApplicationManager; +import consulo.java.language.module.util.JavaClassNames; import consulo.module.ModifiableModuleModel; import consulo.module.Module; import consulo.module.ModuleManager; @@ -122,7 +123,7 @@ public void testImportConflict2() throws Exception { PsiReference ref = configure(); PsiElement target = ((PsiJavaReference)ref).advancedResolve(true).getElement(); assertTrue(target instanceof PsiClass); - assertEquals("java.util.Date", ((PsiClass)target).getQualifiedName()); + assertEquals(JavaClassNames.JAVA_UTIL_DATE, ((PsiClass)target).getQualifiedName()); } public void testLocals1() throws Exception { diff --git a/plugin/src/test/java_/com/intellij/psi/resolve/ResolveMethod15Test.java b/plugin/src/test/java_/com/intellij/psi/resolve/ResolveMethod15Test.java index 9f19f98afe..d1cb2d0b31 100644 --- a/plugin/src/test/java_/com/intellij/psi/resolve/ResolveMethod15Test.java +++ b/plugin/src/test/java_/com/intellij/psi/resolve/ResolveMethod15Test.java @@ -20,7 +20,7 @@ public void testStaticImportOnDemand() throws Exception { assertThat(element, instanceOf(PsiMethod.class)); final PsiMethod method = (PsiMethod)element; assertEquals("asList", method.getName()); - assertEquals("java.util.Arrays", method.getContainingClass().getQualifiedName()); + assertEquals(JavaClassNames.JAVA_UTIL_ARRAYS, method.getContainingClass().getQualifiedName()); } public void testStaticImportHidden() throws Exception { @@ -41,7 +41,7 @@ public void testStaticImportDirect() throws Exception { assertThat(element, instanceOf(PsiMethod.class)); final PsiMethod method = (PsiMethod)element; assertEquals("asList", method.getName()); - assertEquals("java.util.Arrays", method.getContainingClass().getQualifiedName()); + assertEquals(JavaClassNames.JAVA_UTIL_ARRAYS, method.getContainingClass().getQualifiedName()); assertThat(ref, instanceOf(PsiReferenceExpression.class)); final PsiReferenceExpression refExpr = (PsiReferenceExpression)ref; final JavaResolveResult[] resolveResults = refExpr.multiResolve(false); @@ -62,7 +62,7 @@ public void testStaticImportConflict() throws Exception { assertThat(element, instanceOf(PsiMethod.class)); final PsiMethod method = (PsiMethod)element; assertEquals("sort", method.getName()); - assertEquals("java.util.Collections", method.getContainingClass().getQualifiedName()); + assertEquals(JavaClassNames.JAVA_UTIL_COLLECTIONS, method.getContainingClass().getQualifiedName()); assertThat(ref, instanceOf(PsiReferenceExpression.class)); final PsiReferenceExpression refExpr = (PsiReferenceExpression)ref; final JavaResolveResult[] resolveResults = refExpr.multiResolve(false); @@ -451,12 +451,12 @@ public void testInheritance4() throws Exception{ public void testExplicitParams1() throws Exception { PsiReference ref = configureByFile(); - assertGenericResolve(ref, "f", new String[] {"java.lang.String"}, "java.lang.String"); + assertGenericResolve(ref, "f", new String[] {JavaClassNames.JAVA_LANG_STRING}, JavaClassNames.JAVA_LANG_STRING); } public void testExplicitParams2() throws Exception { PsiReference ref = configureByFile(); - assertGenericResolve(ref, "f", new String[] {"java.lang.Integer"}, "Foo"); + assertGenericResolve(ref, "f", new String[] {JavaClassNames.JAVA_LANG_INTEGER}, "Foo"); } public void testConstructorExplicitParams() throws Exception { diff --git a/plugin/src/test/java_/com/intellij/psi/resolve/TypeInferenceTest.java b/plugin/src/test/java_/com/intellij/psi/resolve/TypeInferenceTest.java index 73abbc6dac..1f6b43ac22 100644 --- a/plugin/src/test/java_/com/intellij/psi/resolve/TypeInferenceTest.java +++ b/plugin/src/test/java_/com/intellij/psi/resolve/TypeInferenceTest.java @@ -23,7 +23,7 @@ public void testInferInAssign1 () throws Exception { assertTrue(type instanceof PsiClassType); PsiType[] paramTypes = ((PsiClassType)type).getParameters(); assertEquals(1, paramTypes.length); - assertEquals( "java.lang.String", paramTypes[0].getCanonicalText()); + assertEquals( JavaClassNames.JAVA_LANG_STRING, paramTypes[0].getCanonicalText()); } public void testInferInAssign2() throws Exception { @@ -54,7 +54,7 @@ public void testInferWithBounds1 () throws Exception { PsiSubstitutor substitutor = resolveResult.getSubstitutor(); PsiMethod method = (PsiMethod)resolveResult.getElement(); PsiType type = substitutor.substitute(method.getTypeParameters()[0]); - assertEquals("java.lang.String", type.getCanonicalText()); + assertEquals(JavaClassNames.JAVA_LANG_STRING, type.getCanonicalText()); } private PsiReferenceExpression configure() throws Exception { @@ -85,7 +85,7 @@ public void testInferWithWildcards () throws Exception { } public void testInferWithWildcards1 () throws Exception { - checkResolvesTo("java.lang.String"); + checkResolvesTo(JavaClassNames.JAVA_LANG_STRING); } public void testInferWithWildcards2 () throws Exception { @@ -109,7 +109,7 @@ public void testInferInReturn () throws Exception { } public void testInferAutoboxed () throws Exception { - checkResolvesTo("java.lang.Integer"); + checkResolvesTo(JavaClassNames.JAVA_LANG_INTEGER); } public void testInferWithVarargs1 () throws Exception { diff --git a/plugin/src/test/java_/com/intellij/psi/util/PropertyUtilTest.java b/plugin/src/test/java_/com/intellij/psi/util/PropertyUtilTest.java index d2e5efbe22..d5c3e1d505 100644 --- a/plugin/src/test/java_/com/intellij/psi/util/PropertyUtilTest.java +++ b/plugin/src/test/java_/com/intellij/psi/util/PropertyUtilTest.java @@ -30,7 +30,7 @@ public void testSuggestGetterName() throws Exception { assertEquals("isaURL", PropertyUtil.suggestGetterName(createField("aURL", "boolean"))); assertEquals("getaURL", PropertyUtil.suggestGetterName(createField("aURL", "Object"))); - assertEquals("getBool", PropertyUtil.suggestGetterName(createField("bool", "java.lang.Boolean"))); + assertEquals("getBool", PropertyUtil.suggestGetterName(createField("bool", JavaClassNames.JAVA_LANG_BOOLEAN))); } public void testSuggestSetterName() throws Exception { @@ -42,7 +42,7 @@ public void testSuggestSetterName() throws Exception { assertEquals("setaURL", PropertyUtil.suggestSetterName("aURL")); assertEquals("setaURL", PropertyUtil.suggestSetterName(createField("aURL", "Object"))); - assertEquals("setBool", PropertyUtil.suggestSetterName(createField("bool", "java.lang.Boolean"))); + assertEquals("setBool", PropertyUtil.suggestSetterName(createField("bool", JavaClassNames.JAVA_LANG_BOOLEAN))); } public void testSuggestPropertyName() throws Exception { diff --git a/plugin/src/test/java_/com/intellij/refactoring/ChangeSignaturePropagationTest.java b/plugin/src/test/java_/com/intellij/refactoring/ChangeSignaturePropagationTest.java index 61cf1dbc42..f1ccd23ab9 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/ChangeSignaturePropagationTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/ChangeSignaturePropagationTest.java @@ -9,6 +9,7 @@ import com.intellij.java.language.psi.JavaPsiFacade; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiClassType; +import consulo.java.language.module.util.JavaClassNames; import consulo.language.psi.PsiElement; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiParameter; @@ -131,7 +132,8 @@ private void exceptionPropagationTest() throws Exception { } private void exceptionPropagationTest(final PsiMethod method, final Set methodsToPropagateExceptions) throws Exception { - PsiClassType newExceptionType = JavaPsiFacade.getElementFactory(getProject()).createTypeByFQClassName("java.lang.Exception", GlobalSearchScope.allScope(getProject())); + PsiClassType newExceptionType = JavaPsiFacade.getElementFactory(getProject()) + .createTypeByFQClassName(JavaClassNames.JAVA_LANG_EXCEPTION, GlobalSearchScope.allScope(getProject())); final ThrownExceptionInfo[] newExceptions = new ThrownExceptionInfo[]{new JavaThrownExceptionInfo(-1, newExceptionType)}; doTest(new ParameterInfoImpl[0], newExceptions, null, methodsToPropagateExceptions, method); } diff --git a/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java b/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java index fde036515b..dfd2dea09b 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java @@ -298,7 +298,7 @@ public void testAlreadyHandled() throws Exception public ThrownExceptionInfo[] genExceptions(PsiMethod method) { return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName("java.lang.Exception", method.getResolveScope())) + new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName(JavaClassNames.JAVA_LANG_EXCEPTION, method.getResolveScope())) }; } }, false); @@ -312,7 +312,7 @@ public void testConstructorException() throws Exception public ThrownExceptionInfo[] genExceptions(PsiMethod method) { return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName("java.io.IOException", method.getResolveScope())) + new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName(JavaClassNames.JAVA_IO_IO_EXCEPTION, method.getResolveScope())) }; } }, false); @@ -326,8 +326,7 @@ public void testAddRuntimeException() throws Exception public ThrownExceptionInfo[] genExceptions(PsiMethod method) { return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName("java.lang.RuntimeException", method - .getResolveScope())) + new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION, method.getResolveScope())) }; } }, false); @@ -341,7 +340,7 @@ public void testAddException() throws Exception public ThrownExceptionInfo[] genExceptions(PsiMethod method) { return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName("java.lang.Exception", method.getResolveScope())) + new JavaThrownExceptionInfo(-1, JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createTypeByFQClassName(JavaClassNames.JAVA_LANG_EXCEPTION, method.getResolveScope())) }; } }, false); diff --git a/plugin/src/test/java_/com/intellij/refactoring/CopyClassTest.java b/plugin/src/test/java_/com/intellij/refactoring/CopyClassTest.java index 0cf8012c8c..d184a05e3b 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/CopyClassTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/CopyClassTest.java @@ -22,6 +22,7 @@ import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightTestCase; import consulo.document.FileDocumentManager; +import consulo.java.language.module.util.JavaClassNames; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; import com.intellij.java.language.psi.JavaPsiFacade; @@ -49,7 +50,7 @@ public void testReplaceAllOccurrences() throws Exception { } public void testLibraryClass() throws Exception { // IDEADEV-28791 - doTest("java.util.ArrayList", "Bar"); + doTest(JavaClassNames.JAVA_UTIL_ARRAY_LIST, "Bar"); } private void doTest(final String oldName, final String copyName) throws Exception { diff --git a/plugin/src/test/java_/com/intellij/refactoring/IntroduceVariableTest.java b/plugin/src/test/java_/com/intellij/refactoring/IntroduceVariableTest.java index ea34218d63..7c9a5b327e 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/IntroduceVariableTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/IntroduceVariableTest.java @@ -55,7 +55,7 @@ public void testInsideFor() throws Exception { } public void testReplaceAll() throws Exception { - doTest(new MockIntroduceVariableHandler("s", true, true, true, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("s", true, true, true, JavaClassNames.JAVA_LANG_STRING)); } public void testIDEADEV3678() throws Exception { @@ -95,11 +95,11 @@ public void testParenthizedOccurence() throws Exception { } public void testParenthizedOccurence1() throws Exception { - doTest(new MockIntroduceVariableHandler("s", true, true, true, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("s", true, true, true, JavaClassNames.JAVA_LANG_STRING)); } public void testConflictingField() throws Exception { - doTest(new MockIntroduceVariableHandler("name", true, false, true, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("name", true, false, true, JavaClassNames.JAVA_LANG_STRING)); } public void testConflictingFieldInExpression() throws Exception { @@ -119,15 +119,15 @@ public void testScr16910() throws Exception { } public void testSCR18295() throws Exception { - doTest(new MockIntroduceVariableHandler("it", true, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("it", true, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSCR18295a() throws Exception { - doTest(new MockIntroduceVariableHandler("it", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("it", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testFromInjected() throws Exception { - doTest(new MockIntroduceVariableHandler("regexp", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("regexp", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSCR10412() throws Exception { @@ -139,7 +139,7 @@ public void testSCR22718() throws Exception { } public void testSCR26075() throws Exception { - doTest(new MockIntroduceVariableHandler("wrong", false, false, false, "java.lang.String") { + doTest(new MockIntroduceVariableHandler("wrong", false, false, false, JavaClassNames.JAVA_LANG_STRING) { @Override protected void assertValidationResult(boolean validationResult) { assertFalse(validationResult); @@ -157,7 +157,7 @@ protected boolean reportConflicts(MultiMap conflicts, final P } public void testConflictingFieldInOuterClass() throws Exception { - doTest(new MockIntroduceVariableHandler("text", true, true, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("text", true, true, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSkipSemicolon() throws Exception { @@ -165,11 +165,11 @@ public void testSkipSemicolon() throws Exception { } public void testInsideIf() throws Exception { - doTest(new MockIntroduceVariableHandler("s1", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("s1", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testInsideElse() throws Exception { - doTest(new MockIntroduceVariableHandler("s1", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("s1", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testInsideWhile() throws Exception { @@ -201,19 +201,19 @@ public void testThisQualifier() throws Exception { } public void testSubLiteral() throws Exception { - doTest(new MockIntroduceVariableHandler("str", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("str", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSubLiteral1() throws Exception { - doTest(new MockIntroduceVariableHandler("str", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("str", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSubLiteralFromExpression() throws Exception { - doTest(new MockIntroduceVariableHandler("str", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("str", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSubExpressionFromIntellijidearulezzz() throws Exception { - doTest(new MockIntroduceVariableHandler("str", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("str", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testSubPrimitiveLiteral() throws Exception { @@ -233,7 +233,7 @@ public void testEnumArrayFromVarargs() throws Exception { } public void testFromFinalFieldOnAssignment() throws Exception { - doTest(new MockIntroduceVariableHandler("strs", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("strs", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testNoArrayFromVarargs() throws Exception { @@ -268,7 +268,7 @@ public void testTypeAnnotations() throws Exception { } public void testReturnStatementWithoutSemicolon() throws Exception { - doTest(new MockIntroduceVariableHandler("b", true, true, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("b", true, true, false, JavaClassNames.JAVA_LANG_STRING)); } public void testAndAndSubexpression() throws Exception { @@ -284,7 +284,7 @@ public void testDuplicatesAnonymousClassCreationWithSimilarParameters () throws } public void testDifferentForeachParameters () throws Exception { - doTest(new MockIntroduceVariableHandler("tostr", true, true, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("tostr", true, true, false, JavaClassNames.JAVA_LANG_STRING)); } public void testCollapsedToDiamond() throws Exception { @@ -296,7 +296,7 @@ public void testCantCollapsedToDiamond() throws Exception { } public void testFromForInitializer() throws Exception { - doTest(new MockIntroduceVariableHandler("list", true, true, true, "java.util.List")); + doTest(new MockIntroduceVariableHandler("list", true, true, true, JavaClassNames.JAVA_UTIL_LIST)); } public void testInvalidPostfixExpr() throws Exception { @@ -362,7 +362,7 @@ protected void showErrorMessage(Project project, Editor editor, String message) public void testIncorrectExpressionSelected() throws Exception { try { - doTest(new MockIntroduceVariableHandler("toString", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("toString", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } catch (Exception e) { assertEquals(e.getMessage(), "Error message:Cannot perform refactoring.\n" + @@ -373,11 +373,11 @@ public void testIncorrectExpressionSelected() throws Exception { } public void testMultiCatchSimple() throws Exception { - doTest(new MockIntroduceVariableHandler("e", true, true, false, "java.lang.Exception", true)); + doTest(new MockIntroduceVariableHandler("e", true, true, false, JavaClassNames.JAVA_LANG_EXCEPTION, true)); } public void testMultiCatchTyped() throws Exception { - doTest(new MockIntroduceVariableHandler("b", true, true, false, "java.lang.Exception", true)); + doTest(new MockIntroduceVariableHandler("b", true, true, false, JavaClassNames.JAVA_LANG_EXCEPTION, true)); } public void testBeforeVoidStatement() throws Exception { @@ -397,7 +397,7 @@ public void testLambdaExprNotAccepted() throws Exception { } public void testOneLineLambdaVoidCompatible() throws Exception { - doTest(new MockIntroduceVariableHandler("c", false, false, false, "java.lang.String")); + doTest(new MockIntroduceVariableHandler("c", false, false, false, JavaClassNames.JAVA_LANG_STRING)); } public void testOneLineLambdaValueCompatible() throws Exception { doTest(new MockIntroduceVariableHandler("c", false, false, false, "int")); diff --git a/plugin/src/test/java_/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java b/plugin/src/test/java_/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java index 6e841b09dd..37bc22c75e 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java @@ -2,6 +2,7 @@ import static org.junit.Assert.assertTrue; +import consulo.java.language.module.util.JavaClassNames; import jakarta.annotation.Nonnull; import com.intellij.java.impl.refactoring.changeClassSignature.ChangeClassSignatureProcessor; @@ -33,7 +34,7 @@ public void testNoParams() throws Exception { @Override public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "T", "java.lang.String") + new TypeParameterInfo(aClass, "T", JavaClassNames.JAVA_LANG_STRING) }; } }); @@ -44,7 +45,7 @@ public void testInstanceOf() throws Exception { @Override public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "T", "java.lang.String") + new TypeParameterInfo(aClass, "T", JavaClassNames.JAVA_LANG_STRING) }; } }); @@ -97,7 +98,7 @@ public void testAddOneFirst() throws Exception { @Override public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "T", "java.lang.String") + new TypeParameterInfo(aClass, "T", JavaClassNames.JAVA_LANG_STRING) }; } }, "Zero.java", "OneString.java"); diff --git a/plugin/src/test/java_/com/intellij/refactoring/migration/MigrationTest.java b/plugin/src/test/java_/com/intellij/refactoring/migration/MigrationTest.java index 5ebb551d2b..fa217884b5 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/migration/MigrationTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/migration/MigrationTest.java @@ -4,6 +4,7 @@ import com.intellij.java.impl.refactoring.migration.MigrationMapEntry; import com.intellij.java.impl.refactoring.migration.MigrationProcessor; import consulo.document.FileDocumentManager; +import consulo.java.language.module.util.JavaClassNames; import consulo.virtualFileSystem.VirtualFile; import com.intellij.refactoring.MultiFileTestCase; import com.intellij.JavaTestUtil; @@ -14,7 +15,7 @@ public abstract class MigrationTest extends MultiFileTestCase { public void testUnexistingClassInUnexistingPackage() throws Exception { doTest(createAction(new MigrationMap(new MigrationMapEntry[]{ - new MigrationMapEntry("qqq.aaa.Yahoo", "java.lang.String", MigrationMapEntry.CLASS, false) + new MigrationMapEntry("qqq.aaa.Yahoo", JavaClassNames.JAVA_LANG_STRING, MigrationMapEntry.CLASS, false) }))); }