Skip to content

Commit 949f928

Browse files
unv-unvunv-unv
committed
Removing JavaClassNames. Only CommonClassNames remains.
1 parent a2ad6c7 commit 949f928

4 files changed

Lines changed: 97 additions & 124 deletions

File tree

‎java-language-api/src/main/java/com/intellij/java/language/psi/CommonClassNames.java‎

Lines changed: 97 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,104 @@
1515
*/
1616
package com.intellij.java.language.psi;
1717

18-
import consulo.java.language.module.util.JavaClassNames;
19-
2018
/**
2119
* @author peter
2220
*/
23-
public interface CommonClassNames extends JavaClassNames
24-
{
21+
public interface CommonClassNames {
22+
String DEFAULT_PACKAGE = "java.lang";
23+
24+
String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable";
25+
String JAVA_IO_FILE = "java.io.File";
26+
String JAVA_IO_IO_EXCEPTION = "java.io.IOException";
27+
String JAVA_IO_PRINT_STREAM = "java.io.PrintStream";
28+
String JAVA_IO_PRINT_WRITER = "java.io.PrintWriter";
29+
String JAVA_IO_SERIALIZABLE = "java.io.Serializable";
30+
31+
String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder";
32+
String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation";
33+
String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited";
34+
String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable";
35+
String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention";
36+
String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target";
37+
String JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION = "java.lang.ArrayIndexOutOfBoundsException";
38+
String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError";
39+
String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable";
40+
String JAVA_LANG_BOOLEAN = "java.lang.Boolean";
41+
String JAVA_LANG_BYTE = "java.lang.Byte";
42+
String JAVA_LANG_CHARACTER = "java.lang.Character";
43+
String JAVA_LANG_CHAR_SEQUENCE = "java.lang.CharSequence";
44+
String JAVA_LANG_CLASS = "java.lang.Class";
45+
String JAVA_LANG_CLASS_CAST_EXCEPTION = "java.lang.ClassCastException";
46+
String JAVA_LANG_CLONEABLE = "java.lang.Cloneable";
47+
String JAVA_LANG_COMPARABLE = "java.lang.Comparable";
48+
String JAVA_LANG_DEPRECATED = "java.lang.Deprecated";
49+
String JAVA_LANG_DOUBLE = "java.lang.Double";
50+
String JAVA_LANG_ENUM = "java.lang.Enum";
51+
String JAVA_LANG_ERROR = "java.lang.Error";
52+
String JAVA_LANG_EXCEPTION = "java.lang.Exception";
53+
String JAVA_LANG_FLOAT = "java.lang.Float";
54+
String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface";
55+
String JAVA_LANG_ILLEGAL_ARGUMENT_EXCEPTION = "java.lang.IllegalArgumentException";
56+
String JAVA_LANG_INTEGER = "java.lang.Integer";
57+
String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature";
58+
String JAVA_LANG_ITERABLE = "java.lang.Iterable";
59+
String JAVA_LANG_LONG = "java.lang.Long";
60+
String JAVA_LANG_MATH = "java.lang.Math";
61+
String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException";
62+
String JAVA_LANG_NUMBER = "java.lang.Number";
63+
String JAVA_LANG_OBJECT = "java.lang.Object";
64+
String JAVA_LANG_OBJECT_SHORT = "Object";
65+
String JAVA_LANG_OVERRIDE = "java.lang.Override";
66+
String JAVA_LANG_RECORD = "java.lang.Record";
67+
String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array";
68+
String JAVA_LANG_RUNNABLE = "java.lang.Runnable";
69+
String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException";
70+
String JAVA_LANG_SAFE_VARARGS = "java.lang.SafeVarargs";
71+
String JAVA_LANG_SHORT = "java.lang.Short";
72+
String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath";
73+
String JAVA_LANG_STRING = "java.lang.String";
74+
String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer";
75+
String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder";
76+
String JAVA_LANG_STRING_SHORT = "String";
77+
String JAVA_LANG_THROWABLE = "java.lang.Throwable";
78+
String JAVA_LANG_VOID = "java.lang.Void";
79+
80+
String JAVA_UTIL_CONCURRENT_HASH_MAP = "java.util.concurrent.ConcurrentHashMap";
81+
String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future";
82+
String JAVA_UTIL_CONCURRENT_CALLABLE = "java.util.concurrent.Callable";
83+
String JAVA_UTIL_ITERATOR = "java.util.Iterator";
84+
String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList";
85+
String JAVA_UTIL_ARRAYS = "java.util.Arrays";
86+
String JAVA_UTIL_CALENDAR = "java.util.Calendar";
87+
String JAVA_UTIL_COLLECTION = "java.util.Collection";
88+
String JAVA_UTIL_COLLECTIONS = "java.util.Collections";
89+
String JAVA_UTIL_COMPARATOR = "java.util.Comparator";
90+
String JAVA_UTIL_DATE = "java.util.Date";
91+
String JAVA_UTIL_DICTIONARY = "java.util.Dictionary";
92+
String JAVA_UTIL_ENUM_SET = "java.util.EnumSet";
93+
String JAVA_UTIL_FUNCTION_BI_FUNCTION = "java.util.function.BiFunction";
94+
String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate";
95+
String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer";
96+
String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function";
97+
String JAVA_UTIL_HASH_MAP = "java.util.HashMap";
98+
String JAVA_UTIL_HASH_SET = "java.util.HashSet";
99+
String JAVA_UTIL_LIST = "java.util.List";
100+
String JAVA_UTIL_MAP = "java.util.Map";
101+
String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry";
102+
String JAVA_UTIL_OBJECTS = "java.util.Objects";
103+
String JAVA_UTIL_OPTIONAL = "java.util.Optional";
104+
String JAVA_UTIL_PROPERTIES = "java.util.Properties";
105+
String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle";
106+
String JAVA_UTIL_QUEUE = "java.util.Queue";
107+
String JAVA_UTIL_SET = "java.util.Set";
108+
String JAVA_UTIL_SORTED_MAP = "java.util.SortedMap";
109+
String JAVA_UTIL_SORTED_SET = "java.util.SortedSet";
110+
String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream";
111+
String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream";
112+
String JAVA_UTIL_STREAM_INT_STREAM = "java.util.stream.IntStream";
113+
String JAVA_UTIL_STREAM_LONG_STREAM = "java.util.stream.LongStream";
114+
String JAVA_UTIL_STREAM_DOUBLE_STREAM = "java.util.stream.DoubleStream";
115+
String JAVA_UTIL_STREAM_COLLECTORS = "java.util.stream.Collectors";
116+
117+
String JAVAX_ANNOTATION_GENERATED = "javax.annotation.Generated";
25118
}

‎java-language-api/src/main/java/consulo/java/language/module/util/JavaClassNames.java‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎java-language-api/src/main/java/module-info.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
exports com.intellij.java.language.vfs.jrt;
4646
exports consulo.java.language.fileTypes;
4747
exports consulo.java.language.module.extension;
48-
exports consulo.java.language.module.util;
4948
exports consulo.java.language.bundle;
5049
exports consulo.java.language.psi;
5150
exports consulo.java.language.localize;

‎plugin/src/test/java_/com/intellij/refactoring/ChangeSignatureTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.intellij.java.impl.refactoring.util.CanonicalTypes;
2424
import com.intellij.java.language.psi.*;
2525
import consulo.codeInsight.TargetElementUtilEx;
26-
import consulo.java.language.module.util.CommonClassNames.*;
2726
import consulo.language.editor.TargetElementUtil;
2827
import consulo.language.util.IncorrectOperationException;
2928
import consulo.util.collection.ContainerUtil;

0 commit comments

Comments
 (0)