From 949f928bd52343d79f834c25e789e2da137f026c Mon Sep 17 00:00:00 2001 From: UNV Date: Sat, 10 May 2025 16:01:33 +0300 Subject: [PATCH] Removing JavaClassNames. Only CommonClassNames remains. --- .../java/language/psi/CommonClassNames.java | 101 ++++++++++++++- .../language/module/util/JavaClassNames.java | 118 ------------------ .../src/main/java/module-info.java | 1 - .../refactoring/ChangeSignatureTest.java | 1 - 4 files changed, 97 insertions(+), 124 deletions(-) delete mode 100644 java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/CommonClassNames.java b/java-language-api/src/main/java/com/intellij/java/language/psi/CommonClassNames.java index e8f74cefd9..449c38d711 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/CommonClassNames.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/CommonClassNames.java @@ -15,11 +15,104 @@ */ package com.intellij.java.language.psi; -import consulo.java.language.module.util.JavaClassNames; - /** * @author peter */ -public interface CommonClassNames extends JavaClassNames -{ +public interface CommonClassNames { + 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"; + 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_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"; + String JAVA_LANG_BYTE = "java.lang.Byte"; + 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"; + 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_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"; + 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_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_ENUM_SET = "java.util.EnumSet"; + 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_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_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"; + 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 JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated"; } 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 deleted file mode 100644 index bae4511d8d..0000000000 --- a/java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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; - -import consulo.annotation.DeprecationInfo; - -/** - * @author peter - */ -@Deprecated -@DeprecationInfo(value = "Use com.intellij.java.language.psi.CommonClassNames") -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"; - 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_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"; - String JAVA_LANG_BYTE = "java.lang.Byte"; - 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"; - 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_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"; - 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_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_ENUM_SET = "java.util.EnumSet"; - 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_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_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"; - 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 JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated"; -} \ No newline at end of file diff --git a/java-language-api/src/main/java/module-info.java b/java-language-api/src/main/java/module-info.java index 2e41924337..2fe9381504 100644 --- a/java-language-api/src/main/java/module-info.java +++ b/java-language-api/src/main/java/module-info.java @@ -45,7 +45,6 @@ exports com.intellij.java.language.vfs.jrt; exports consulo.java.language.fileTypes; exports consulo.java.language.module.extension; - exports consulo.java.language.module.util; exports consulo.java.language.bundle; exports consulo.java.language.psi; exports consulo.java.language.localize; diff --git a/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java b/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java index c1725a4461..da0d41809c 100644 --- a/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java +++ b/plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java @@ -23,7 +23,6 @@ import com.intellij.java.impl.refactoring.util.CanonicalTypes; import com.intellij.java.language.psi.*; import consulo.codeInsight.TargetElementUtilEx; -import consulo.java.language.module.util.CommonClassNames.*; import consulo.language.editor.TargetElementUtil; import consulo.language.util.IncorrectOperationException; import consulo.util.collection.ContainerUtil;