MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

"java.lang.Object" ->CommonClassNames.JAVA_LANG_OBJECT

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-30 13:29:24 +04:00
parent b2db98d0a2
commit 0c79564b45
76 changed files with 1190 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/classParsing/ClassFileReader.java
+3 -2
View File
@@ -24,6 +24,7 @@ import com.intellij.compiler.SymbolTable;
import com.intellij.compiler.make.CacheCorruptedException;
import com.intellij.openapi.compiler.CompilerBundle;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.CommonClassNames;
import com.intellij.util.ArrayUtil;
import com.intellij.util.cls.BytePointer;
import com.intellij.util.cls.ClsFormatException;
@@ -210,7 +211,7 @@ public class ClassFileReader {
BytePointer ptr = new BytePointer(getData(), getConstantPoolEnd() + 4);
int index = ClsUtil.readU2(ptr);
if (index == 0) {
if ("java.lang.Object".equals(getQualifiedName())) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(getQualifiedName())) {
mySuperClassName = "";
}
else {
@@ -221,7 +222,7 @@ public class ClassFileReader {
ptr.offset = getOffsetInConstantPool(index);
mySuperClassName = readClassInfo(ptr); // keep '$' in the name for anonymous classes
if (isInterface()) {
if (!"java.lang.Object".equals(mySuperClassName)) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(mySuperClassName)) {
throw new ClsFormatException();
}
}
java/compiler/impl/src/com/intellij/compiler/make/JavaDependencyProcessor.java
+2 -2
View File
@@ -105,7 +105,7 @@ class JavaDependencyProcessor {
mySuperlistGenericSignatureChanged = isSuperlistGenericSignatureChanged(cache.getGenericSignature(qName), newClassesCache.getGenericSignature(qName));
boolean superclassesDiffer = cache.getSuperQualifiedName(qName) != newClassesCache.getSuperQualifiedName(qName);
boolean wasDerivedFromObject = "java.lang.Object".equals(dependencyCache.resolve(cache.getSuperQualifiedName(qName)));
boolean wasDerivedFromObject = CommonClassNames.JAVA_LANG_OBJECT.equals(dependencyCache.resolve(cache.getSuperQualifiedName(qName)));
mySuperClassChanged = !wasDerivedFromObject && superclassesDiffer;
mySuperClassAdded = wasDerivedFromObject && superclassesDiffer;
}
@@ -961,7 +961,7 @@ class JavaDependencyProcessor {
}
else {
final String qName = myDependencyCache.resolve(superQName);
if (!"java.lang.Object".equals(qName)) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) {
if (hasBaseAbstractMethods2(qName, methodsToCheck)) {
return true;
}
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+1 -1
View File
@@ -93,7 +93,7 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils {
public static boolean isAssignableFrom(final String baseQualifiedName, ReferenceType checkedType) {
if ("java.lang.Object".equals(baseQualifiedName)) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(baseQualifiedName)) {
return true;
}
return getSuperClass(baseQualifiedName, checkedType) != null;
java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+2 -1
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.components.*;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
import com.intellij.psi.CommonClassNames;
import com.intellij.util.EventDispatcher;
import com.intellij.util.containers.InternalIterator;
import com.intellij.util.ui.ColorIcon;
@@ -331,7 +332,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
return myToStringRenderer;
}
else if(rendererId.equals(CompoundNodeRenderer.UNIQUE_ID) || rendererId.equals(REFERENCE_RENDERER)) {
return createCompoundReferenceRenderer("unnamed", "java.lang.Object", null, null);
return createCompoundReferenceRenderer("unnamed", CommonClassNames.JAVA_LANG_OBJECT, null, null);
}
return null;
}
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundReferenceRenderer.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.debugger.ui.tree.render;
import com.intellij.debugger.engine.DebuggerUtils;
import com.intellij.debugger.settings.NodeRendererSettings;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.CommonClassNames;
import com.sun.jdi.ReferenceType;
import com.sun.jdi.Type;
import org.jetbrains.annotations.NotNull;
@@ -27,7 +28,7 @@ public class CompoundReferenceRenderer extends CompoundNodeRenderer{
public CompoundReferenceRenderer(final NodeRendererSettings rendererSettings, String name, ValueLabelRenderer labelRenderer, ChildrenRenderer childrenRenderer) {
super(rendererSettings, name, labelRenderer, childrenRenderer);
myProperties.setClassName("java.lang.Object");
myProperties.setClassName(CommonClassNames.JAVA_LANG_OBJECT);
LOG.assertTrue(labelRenderer == null || labelRenderer instanceof ReferenceRenderer);
LOG.assertTrue(childrenRenderer == null || childrenRenderer instanceof ReferenceRenderer);
}
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ReferenceRenderer.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.debugger.engine.DebuggerUtils;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.CommonClassNames;
import com.sun.jdi.ReferenceType;
import com.sun.jdi.Type;
import org.jdom.Element;
@@ -29,7 +30,7 @@ public abstract class ReferenceRenderer implements Renderer {
protected BasicRendererProperties myProperties = new BasicRendererProperties();
protected ReferenceRenderer() {
this("java.lang.Object");
this(CommonClassNames.JAVA_LANG_OBJECT);
}
protected ReferenceRenderer(@NotNull String className) {
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java
+2 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.debugger.ui.tree.ValueDescriptor;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMExternalizerUtil;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiExpression;
import com.intellij.ui.classFilter.ClassFilter;
import com.intellij.xdebugger.impl.ui.XDebuggerUIConstants;
@@ -127,7 +128,7 @@ public class ToStringRenderer extends NodeRendererImpl {
if (methods.size() > 0) {
for (Iterator iterator = methods.iterator(); iterator.hasNext();) {
final Method method = (Method)iterator.next();
if(!(method.declaringType().name()).equals("java.lang.Object")){
if(!(method.declaringType().name()).equals(CommonClassNames.JAVA_LANG_OBJECT)){
return true;
}
}
java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
+7 -7
View File
@@ -99,7 +99,7 @@ public abstract class DebuggerUtils {
Method toStringMethod = debugProcess.getUserData(TO_STRING_METHOD_KEY);
if (toStringMethod == null) {
try {
ReferenceType refType = objRef.virtualMachine().classesByName("java.lang.Object").get(0);
ReferenceType refType = objRef.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT).get(0);
toStringMethod = findMethod(refType, "toString", "()Ljava/lang/String;");
debugProcess.putUserData(TO_STRING_METHOD_KEY, toStringMethod);
}
@@ -140,7 +140,7 @@ public abstract class DebuggerUtils {
public static Method findMethod(ReferenceType refType, @NonNls String methodName, @NonNls String methodSignature) {
if (refType instanceof ArrayType) {
// for array types methodByName() in JDI always returns empty list
final Method method = findMethod(refType.virtualMachine().classesByName("java.lang.Object").get(0), methodName, methodSignature);
final Method method = findMethod(refType.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT).get(0), methodName, methodSignature);
if (method != null) {
return method;
}
@@ -248,14 +248,14 @@ public abstract class DebuggerUtils {
return InheritanceUtil.isInheritorOrSelf(psiNodeClass, psiRendererClass, true);
}
else if (nodeClass.dims > rendererClass.dims) {
return rendererClass.className.equals("java.lang.Object");
return rendererClass.className.equals(CommonClassNames.JAVA_LANG_OBJECT);
}
return false;
}
public static Type getSuperType(Type subType, String superType) {
if("java.lang.Object".equals(superType)) {
List list = subType.virtualMachine().classesByName("java.lang.Object");
if(CommonClassNames.JAVA_LANG_OBJECT.equals(superType)) {
List list = subType.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT);
if(list.size() > 0) {
return (ReferenceType)list.get(0);
}
@@ -321,8 +321,8 @@ public abstract class DebuggerUtils {
}
//only for interfaces and arrays
if("java.lang.Object".equals(superType)) {
List list = subType.virtualMachine().classesByName("java.lang.Object");
if(CommonClassNames.JAVA_LANG_OBJECT.equals(superType)) {
List list = subType.virtualMachine().classesByName(CommonClassNames.JAVA_LANG_OBJECT);
if(list.size() > 0) {
return (ReferenceType)list.get(0);
}
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+1 -1
View File
@@ -446,7 +446,7 @@ public class ExpectedTypesProvider {
@Override public void visitSynchronizedStatement(@NotNull PsiSynchronizedStatement statement) {
PsiElementFactory factory = JavaPsiFacade.getInstance(statement.getProject()).getElementFactory();
PsiType objectType = factory.createTypeByFQClassName("java.lang.Object", myExpr.getResolveScope());
PsiType objectType = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, myExpr.getResolveScope());
myResult = new ExpectedTypeInfo[]{createInfoImpl(objectType, ExpectedTypeInfo.TYPE_OR_SUBTYPE, objectType, TailType.NONE)};
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
+2 -2
View File
@@ -175,7 +175,7 @@ public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
if (aClass.hasModifierProperty(PsiModifier.FINAL)) {
return;
}
if ("java.lang.Object".equals(aClass.getQualifiedName())) return; // It's useless to have overridden markers for object.
if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return; // It's useless to have overridden markers for object.
PsiClass inheritor = ClassInheritorsSearch.search(aClass, false).findFirst();
if (inheritor != null) {
@@ -197,7 +197,7 @@ public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
for (PsiMethod method : methods) {
ProgressManager.checkCanceled();
final PsiClass parentClass = method.getContainingClass();
if (!"java.lang.Object".equals(parentClass.getQualifiedName())) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(parentClass.getQualifiedName())) {
classes.add(parentClass);
}
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
+1 -1
View File
@@ -549,7 +549,7 @@ public class HighlightClassUtil {
PsiClass[] superTypes = aClass.getSupers();
for (PsiElement superType : superTypes) {
while (superType instanceof PsiClass) {
if (!"java.lang.Object".equals(((PsiClass)superType).getQualifiedName())) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)superType).getQualifiedName())) {
PsiClass circularClass = getCircularClass((PsiClass)superType, usedClasses);
if (circularClass != null) return circularClass;
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+2 -2
View File
@@ -1349,13 +1349,13 @@ public class HighlightMethodUtil {
if ("readResolve".equals(name)) {
return parameters.length == 0
&& returnType != null
&& returnType.equalsToText("java.lang.Object")
&& returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
&& (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || HighlightUtil.isSerializable(containingClass));
}
if ("writeReplace".equals(name)) {
return parameters.length == 0
&& returnType != null
&& returnType.equalsToText("java.lang.Object")
&& returnType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
&& (containingClass.hasModifierProperty(PsiModifier.ABSTRACT) || HighlightUtil.isSerializable(containingClass));
}
if ("writeObject".equals(name)) {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
+2 -2
View File
@@ -136,7 +136,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(targetClass.getProject()).getElementFactory();
PsiMethod supConstructor = null;
PsiClass superClass = targetClass.getSuperClass();
if (superClass != null && !"java.lang.Object".equals(superClass.getQualifiedName()) &&
if (superClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName()) &&
!"java.lang.Enum".equals(superClass.getQualifiedName())) {
PsiMethod[] constructors = superClass.getConstructors();
boolean hasDefaultConstructor = false;
@@ -188,7 +188,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
}
else {
PsiReferenceList extendsList = targetClass.getExtendsList();
if (extendsList.getReferencedTypes().length == 0 && !"java.lang.Object".equals(classType.getCanonicalText())) {
if (extendsList.getReferencedTypes().length == 0 && !CommonClassNames.JAVA_LANG_OBJECT.equals(classType.getCanonicalText())) {
extendsList.add(factory.createReferenceElementByType(classType));
}
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class GuessTypeParameters {
if (!types.isEmpty()) {
Project project = typeElement.getProject();
PsiType substituted = rawingSubstitutor.substitute(type);
if (!"java.lang.Object".equals(substituted.getCanonicalText()) && (toplevel || substituted.equals(type))) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(substituted.getCanonicalText()) && (toplevel || substituted.equals(type))) {
types.add(substituted);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
@@ -57,7 +58,7 @@ public class SetupJDKFix implements IntentionAction, HighPriorityAction {
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
return JavaPsiFacade.getInstance(project).findClass("java.lang.Object", file.getResolveScope()) == null;
return JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_OBJECT, file.getResolveScope()) == null;
}
@Override
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+2 -2
View File
@@ -287,10 +287,10 @@ public class JavaDocInfoGenerator {
String qName = aClass.getQualifiedName();
if (refs.length > 0 || !aClass.isInterface() && (qName == null || !qName.equals("java.lang.Object"))) {
if (refs.length > 0 || !aClass.isInterface() && (qName == null || !qName.equals(CommonClassNames.JAVA_LANG_OBJECT))) {
buffer.append("extends ");
if (refs.length == 0) {
generateLink(buffer, "java.lang.Object", null, aClass, false);
generateLink(buffer, CommonClassNames.JAVA_LANG_OBJECT, null, aClass, false);
}
else {
for (int i = 0; i < refs.length; i++) {
java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoSuperHandler.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class JavaGotoSuperHandler implements CodeInsightActionHandler {
List<PsiClass> allSupers = new ArrayList<PsiClass>(Arrays.asList(aClass.getSupers()));
for (Iterator<PsiClass> iterator = allSupers.iterator(); iterator.hasNext();) {
PsiClass superClass = iterator.next();
if ("java.lang.Object".equals(superClass.getQualifiedName())) iterator.remove();
if (CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) iterator.remove();
}
return allSupers.toArray(new PsiClass[allSupers.size()]);
} else if (e instanceof PsiMethod) {
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
+2 -2
View File
@@ -300,7 +300,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool {
if (!"writeReplace".equals(name)) return false;
PsiParameter[] parameters = method.getParameterList().getParameters();
if (parameters.length != 0) return false;
if (!method.getReturnType().equalsToText("java.lang.Object")) return false;
if (!method.getReturnType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return false;
if (method.hasModifierProperty(PsiModifier.STATIC)) return false;
PsiClass aClass = method.getContainingClass();
return !(aClass != null && !isSerializable(aClass, refClass));
@@ -311,7 +311,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool {
if (!"readResolve".equals(name)) return false;
PsiParameter[] parameters = method.getParameterList().getParameters();
if (parameters.length != 0) return false;
if (!method.getReturnType().equalsToText("java.lang.Object")) return false;
if (!method.getReturnType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return false;
if (method.hasModifierProperty(PsiModifier.STATIC)) return false;
final PsiClass aClass = method.getContainingClass();
return !(aClass != null && !isSerializable(aClass, refClass));
java/java-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcode.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class EqualsAndHashcode extends BaseJavaLocalInspectionTool {
new Computable<PsiClass>() {
@Nullable
public PsiClass compute() {
return psiFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(project));
return psiFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(project));
}
}
);
java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyTreeStructure.java
+1 -1
View File
@@ -114,7 +114,7 @@ public final class MethodHierarchyTreeStructure extends HierarchyTreeStructure {
}
private static boolean isJavaLangObject(final PsiClass aClass) {
return "java.lang.Object".equals(aClass.getQualifiedName());
return CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName());
}
private static PsiClass findSuitableBaseClass(final PsiMethod method) {
java/java-impl/src/com/intellij/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.ide.IdeBundle;
import com.intellij.ide.hierarchy.HierarchyNodeDescriptor;
import com.intellij.ide.hierarchy.HierarchyTreeStructure;
import com.intellij.openapi.project.Project;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiModifier;
@@ -43,7 +44,7 @@ public class SubtypesHierarchyTreeStructure extends HierarchyTreeStructure {
protected final Object[] buildChildren(final HierarchyNodeDescriptor descriptor) {
final PsiClass psiClass = ((TypeHierarchyNodeDescriptor)descriptor).getPsiClass();
if ("java.lang.Object".equals(psiClass.getQualifiedName())) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) {
return new Object[]{IdeBundle.message("node.hierarchy.java.lang.object")};
}
if (psiClass instanceof PsiAnonymousClass) return ArrayUtil.EMPTY_OBJECT_ARRAY;
java/java-impl/src/com/intellij/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.ide.hierarchy.type;
import com.intellij.ide.hierarchy.HierarchyNodeDescriptor;
import com.intellij.ide.hierarchy.HierarchyTreeStructure;
import com.intellij.openapi.project.Project;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
@@ -34,7 +35,7 @@ public final class SupertypesHierarchyTreeStructure extends HierarchyTreeStructu
final PsiClass psiClass = ((TypeHierarchyNodeDescriptor)descriptor).getPsiClass();
final PsiClass[] supers = psiClass.getSupers();
final List<HierarchyNodeDescriptor> descriptors = new ArrayList<HierarchyNodeDescriptor>();
PsiClass objectClass = JavaPsiFacade.getInstance(myProject).findClass("java.lang.Object", psiClass.getResolveScope());
PsiClass objectClass = JavaPsiFacade.getInstance(myProject).findClass(CommonClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope());
for (PsiClass aSuper : supers) {
if (!psiClass.isInterface() || !aSuper.equals(objectClass)) {
descriptors.add(new TypeHierarchyNodeDescriptor(myProject, descriptor, aSuper, false));
java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyBrowser.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
@@ -129,7 +130,7 @@ public final class TypeHierarchyBrowser extends TypeHierarchyBrowserBase {
public static class BaseOnThisTypeAction extends TypeHierarchyBrowserBase.BaseOnThisTypeAction {
protected boolean isEnabled(final HierarchyBrowserBaseEx browser, final PsiElement psiElement) {
return super.isEnabled(browser, psiElement) && !"java.lang.Object".equals(((PsiClass)psiElement).getQualifiedName());
return super.isEnabled(browser, psiElement) && !CommonClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)psiElement).getQualifiedName());
}
}
}
java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyTreeStructure.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.ide.hierarchy.type;
import com.intellij.ide.hierarchy.HierarchyNodeDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass;
import java.util.ArrayList;
@@ -51,7 +52,7 @@ public final class TypeHierarchyTreeStructure extends SubtypesHierarchyTreeStruc
if (aClass.isInterface()) return PsiClass.EMPTY_ARRAY;
final ArrayList<PsiClass> superClasses = new ArrayList<PsiClass>();
while (!"java.lang.Object".equals(aClass.getQualifiedName())) {
while (!CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) {
final PsiClass aClass1 = aClass;
final PsiClass[] superTypes = aClass1.getSupers();
PsiClass superType = null;
java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
+1 -1
View File
@@ -224,7 +224,7 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider, Ext
if (!aClass.isEnum() && !aClass.isAnnotationType()) {
PsiReferenceList extendsList = aClass.getExtendsList();
refs = extendsList == null ? PsiClassType.EMPTY_ARRAY : extendsList.getReferencedTypes();
if (refs.length > 0 || !aClass.isInterface() && !"java.lang.Object".equals(aClass.getQualifiedName())) {
if (refs.length > 0 || !aClass.isInterface() && !CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) {
buffer.append(" extends ");
if (refs.length == 0) {
buffer.append("Object");
java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable {
}
LOG.assertTrue(!myDisposed);
if ("java.lang.Object".equals(qName)) { // optimization
if (CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) { // optimization
PsiClass cached = myCachedObjectClassMap.get(scope);
if (cached == null) {
cached = findClassInIndex(qName, scope);
java/java-impl/src/com/intellij/psi/impl/migration/MigrationClassImpl.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class MigrationClassImpl extends LightElement implements PsiClass{
@Override
public PsiClass getSuperClass() {
return JavaPsiFacade.getInstance(myManager.getProject())
.findClass("java.lang.Object", GlobalSearchScope.allScope(myManager.getProject()));
.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myManager.getProject()));
}
@Override
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+1039 -1039
View File
File diff suppressed because it is too large Load Diff
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class InheritanceToDelegationHandler implements RefactoringActionHandler
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, aClass)) return;
final PsiClass[] bases = aClass.getSupers();
@NonNls final String javaLangObject = "java.lang.Object";
@NonNls final String javaLangObject = CommonClassNames.JAVA_LANG_OBJECT;
if (bases.length == 0 || bases.length == 1 && javaLangObject.equals(bases[0].getQualifiedName())) {
String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("class.does.not.have.base.classes.or.interfaces", aClass.getQualifiedName()));
CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.INHERITANCE_TO_DELEGATION);
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
+6 -5
View File
@@ -107,7 +107,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
myBaseClass = targetBaseClass;
LOG.assertTrue(
myBaseClass != null // && !myBaseClass.isInterface()
&& (myBaseClass.getQualifiedName() == null || !myBaseClass.getQualifiedName().equals("java.lang.Object"))
&& (myBaseClass.getQualifiedName() == null || !myBaseClass.getQualifiedName().equals(CommonClassNames.JAVA_LANG_OBJECT))
);
myBaseClassMembers = getAllBaseClassMembers();
myBaseClassBases = getAllBases();
@@ -195,7 +195,8 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
if (objectUpcastedUsageInfos.length > 0) {
final String message = RefactoringBundle.message("instances.of.0.upcasted.to.1.were.found",
RefactoringUIUtil.getDescription(myClass, true), CommonRefactoringUtil.htmlEmphasize("java.lang.Object"));
RefactoringUIUtil.getDescription(myClass, true), CommonRefactoringUtil.htmlEmphasize(
CommonClassNames.JAVA_LANG_OBJECT));
conflicts.putValue(myClass, message);
}
@@ -894,7 +895,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
PsiClass containingClass = superMethod.getContainingClass();
if (InheritanceUtil.isInheritorOrSelf(myBaseClass, containingClass, true)) {
String qName = containingClass.getQualifiedName();
if (qName == null || !"java.lang.Object".equals(qName)) {
if (qName == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) {
return superMethod;
}
}
@@ -916,7 +917,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
//remove java.lang.Object members
for (Iterator<PsiMember> iterator = result.iterator(); iterator.hasNext();) {
PsiMember member = iterator.next();
if ("java.lang.Object".equals(member.getContainingClass().getQualifiedName())) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(member.getContainingClass().getQualifiedName())) {
iterator.remove();
}
}
@@ -1207,7 +1208,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
final PsiClass aClass = PsiUtil.resolveClassInType(type);
if (aClass == null) return;
String qName = aClass.getQualifiedName();
if (qName != null && "java.lang.Object".equals(qName)) {
if (qName != null && CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) {
myUsageInfoStorage.add(new ObjectUpcastedUsageInfo(instanceRef, aClass, getFieldAccessibility(instanceRef)));
} else {
if (myBaseClassBases.contains(aClass)
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class InheritanceToDelegationUtil {
if (baseMethod != null) {
PsiClass containingClass = baseMethod.getContainingClass();
String qName = containingClass.getQualifiedName();
if (qName == null || !"java.lang.Object".equals(qName)) return true;
if (qName == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(qName)) return true;
}
}
return false;
java/java-impl/src/com/intellij/refactoring/typeCook/Util.java
+2 -2
View File
@@ -82,7 +82,7 @@ public class Util {
return null;
}
if (pp == Bottom.BOTTOM || (objectBottom && pp.getCanonicalText().equals("java.lang.Object"))) {
if (pp == Bottom.BOTTOM || (objectBottom && pp.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT))) {
anyBottom = true;
}
@@ -275,7 +275,7 @@ public class Util {
final PsiTypeVariableFactory factory,
final boolean upper,
final PsiElement context) {
if (t == null || (upper && t.getCanonicalText().equals("java.lang.Object"))) {
if (t == null || (upper && t.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT))) {
return factory.create(context);
}
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Result.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class Result {
if (myBinding != null) {
final PsiType type = myBinding.substitute(myTypes.get(element));
@NonNls final String objectFQName = "java.lang.Object";
@NonNls final String objectFQName = CommonClassNames.JAVA_LANG_OBJECT;
if (originalType.getCanonicalText().equals(objectFQName)) {
if (type == null) {
return originalType;
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java
+1 -1
View File
@@ -903,7 +903,7 @@ public class SystemBuilder {
if (elemenType != null) {
addBoundConstraintsImpl(definedType, elemenType, system);
if (mySettings.cookObjects() && elemenType.getCanonicalText().equals("java.lang.Object")) {
if (mySettings.cookObjects() && elemenType.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT)) {
system.addSubtypeConstraint(definedType, elemenType);
}
}
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java
+4 -4
View File
@@ -355,7 +355,7 @@ public class BindingFactory {
try {
final PsiElementFactory f = JavaPsiFacade.getInstance(myProject).getElementFactory();
final PsiType cloneable = f.createTypeFromText("java.lang.Cloneable", null);
final PsiType object = f.createTypeFromText("java.lang.Object", null);
final PsiType object = f.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null);
final PsiType serializable = f.createTypeFromText("java.io.Serializable", null);
PsiType type;
@@ -680,7 +680,7 @@ public class BindingFactory {
}
else {
/* ? super T1, T2 */
if (xType != null && !"java.lang.Object".equals(xType.getCanonicalText())) {
if (xType != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(xType.getCanonicalText())) {
return null;
}
return create();
@@ -1061,7 +1061,7 @@ public class BindingFactory {
final PsiElementFactory f = JavaPsiFacade.getInstance(myProject).getElementFactory();
final PsiType keyType = x instanceof PsiClassType ? x : y;
final PsiType object = f.createTypeFromText("java.lang.Object", null);
final PsiType object = f.createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null);
final PsiType cloneable = f.createTypeFromText("java.lang.Cloneable", null);
final PsiType serializable = f.createTypeFromText("java.io.Serializable", null);
@@ -1108,7 +1108,7 @@ public class BindingFactory {
final PsiClass[] ancestors = GenericsUtil.getLeastUpperClasses(xClass, yClass);
for (final PsiClass ancestor : ancestors) {
if ("java.lang.Object".equals(ancestor.getQualifiedName()) && ancestors.length > 1) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(ancestor.getQualifiedName()) && ancestors.length > 1) {
continue;
}
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/VictimCollector.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class VictimCollector extends Visitor {
private void testNAdd(final PsiElement element, final PsiType t) {
if (Util.isRaw(t, mySettings)) {
if (element instanceof PsiNewExpression && t.getCanonicalText().equals("java.lang.Object")){
if (element instanceof PsiNewExpression && t.getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT)){
return;
}
java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class RefactoringHierarchyUtil {
if (!subClass.isInterface()) {
final PsiManager manager = subClass.getManager();
PsiClass javaLangObject = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Object", subClass.getResolveScope());
PsiClass javaLangObject = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, subClass.getResolveScope());
if (includeNonProject && javaLangObject != null && !manager.areElementsEquivalent(javaLangObject, subClass)) {
bases.add(javaLangObject);
}
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+2 -2
View File
@@ -478,7 +478,7 @@ public class RefactoringUtil {
ExpectedTypeInfo[] expectedTypes = ExpectedTypesProvider.getInstance(expr.getProject()).getExpectedTypes(expr, false);
if (expectedTypes.length == 1) {
type = expectedTypes[0].getType();
if (!type.equalsToText("java.lang.Object")) return type;
if (!type.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return type;
}
return null;
}
@@ -515,7 +515,7 @@ public class RefactoringUtil {
type = infos[0].getType();
}
else {
type = factory.createTypeByFQClassName("java.lang.Object", expr.getResolveScope());
type = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, expr.getResolveScope());
}
}
java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java
+2 -2
View File
@@ -149,10 +149,10 @@ public class PsiWildcardType extends PsiType {
PsiWildcardType that = (PsiWildcardType)o;
if (myBound == null && that.myBound != null) {
return that.isExtends() && that.myBound.equalsToText("java.lang.Object");
return that.isExtends() && that.myBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
}
else if (myBound != null && that.myBound == null) {
return isExtends() && myBound.equalsToText("java.lang.Object");
return isExtends() && myBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
}
return myIsExtending == that.myIsExtending && Comparing.equal(myBound, that.myBound);
}
java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+5 -5
View File
@@ -511,7 +511,7 @@ public class TypeConversionUtil {
}
if (isApplicable && strict) {
if (resultTypeRank > MAX_NUMERIC_RANK) {
isApplicable = ltypeRank == resultTypeRank || ltype.equalsToText("java.lang.Object");
isApplicable = ltypeRank == resultTypeRank || ltype.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
}
else {
isApplicable = ltypeRank <= MAX_NUMERIC_RANK;
@@ -678,7 +678,7 @@ public class TypeConversionUtil {
return "java.io.Serializable".equals(qualifiedName) || "java.lang.Cloneable".equals(qualifiedName);
}
else {
return left.equalsToText("java.lang.Object");
return left.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
}
}
PsiType lCompType = ((PsiArrayType)left).getComponentType();
@@ -873,9 +873,9 @@ public class TypeConversionUtil {
final PsiWildcardType leftWildcard = (PsiWildcardType)typeLeft;
final PsiType leftBound = leftWildcard.getBound();
if (leftBound == null) return true;
if (leftBound.equalsToText("java.lang.Object")) {
if (leftBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {
if (!leftWildcard.isSuper()) return true;
if (typeRight.equalsToText("java.lang.Object")) return true;
if (typeRight.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return true;
}
if (typeRight instanceof PsiWildcardType) {
@@ -956,7 +956,7 @@ public class TypeConversionUtil {
return JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createRawSubstitutor(superClass);
}
final PsiClass objectClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Object", superClass.getResolveScope());
final PsiClass objectClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, superClass.getResolveScope());
if (manager.areElementsEquivalent(superClass, objectClass)) {
return PsiSubstitutor.EMPTY;
}
java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java
+1 -1
View File
@@ -459,7 +459,7 @@ public class ExceptionUtil {
if (!(element instanceof PsiMethodCallExpression)) return false;
if (!method.getName().equals(CLONE_METHOD_NAME)) return false;
PsiClass containingClass = method.getContainingClass();
if (containingClass == null || !"java.lang.Object".equals(containingClass.getQualifiedName())) {
if (containingClass == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) {
return false;
}
java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class InheritanceImplUtil {
@NonNls final String baseName = baseClass.getName();
if ("Object".equals(baseName)) {
PsiClass objectClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Object", candidateClass.getResolveScope());
PsiClass objectClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, candidateClass.getResolveScope());
if (manager.areElementsEquivalent(baseClass, objectClass)) {
if (manager.areElementsEquivalent(candidateClass, objectClass)) return false;
if (checkDeep || candidateClass.isInterface()) return true;
java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+4 -4
View File
@@ -695,19 +695,19 @@ public class PsiClassImplUtil {
PsiClass baseClass = baseClassReference.resolve();
if (baseClass != null) {
if (baseClass.isInterface()) {
PsiClass objectClass = JavaPsiFacade.getInstance(psiClass.getProject()).findClass("java.lang.Object", psiClass.getResolveScope());
PsiClass objectClass = JavaPsiFacade.getInstance(psiClass.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope());
return objectClass != null ? new PsiClass[]{objectClass, baseClass} : new PsiClass[]{baseClass};
}
return new PsiClass[]{baseClass};
}
PsiClass objectClass = JavaPsiFacade.getInstance(psiClass.getProject()).findClass("java.lang.Object", psiClass.getResolveScope());
PsiClass objectClass = JavaPsiFacade.getInstance(psiClass.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope());
return objectClass != null ? new PsiClass[]{objectClass} : PsiClass.EMPTY_ARRAY;
}
else if (psiClass instanceof PsiTypeParameter) {
if (extendsListTypes.length == 0) {
final PsiClass objectClass =
JavaPsiFacade.getInstance(psiClass.getProject()).findClass("java.lang.Object", psiClass.getResolveScope());
JavaPsiFacade.getInstance(psiClass.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope());
return objectClass != null ? new PsiClass[]{objectClass} : PsiClass.EMPTY_ARRAY;
}
return resolveClassReferenceList(extendsListTypes, psiClass.getManager(),
@@ -820,7 +820,7 @@ public class PsiClassImplUtil {
final PsiManager manager,
final GlobalSearchScope resolveScope,
boolean includeObject) {
PsiClass objectClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Object", resolveScope);
PsiClass objectClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, resolveScope);
if (objectClass == null) includeObject = false;
if (listOfTypes == null || listOfTypes.length == 0) {
if (includeObject) return new PsiClass[]{objectClass};
java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
+2 -1
View File
@@ -319,7 +319,8 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
for (PsiType boundType : boundTypes) {
PsiType substitutedBoundType = boundType.accept(mySimpleSubstitutionVisitor);
PsiWildcardType wildcardType = (PsiWildcardType)substituted;
if (substitutedBoundType != null && !(substitutedBoundType instanceof PsiWildcardType) && !substitutedBoundType.equalsToText("java.lang.Object")) {
if (substitutedBoundType != null && !(substitutedBoundType instanceof PsiWildcardType) && !substitutedBoundType.equalsToText(
CommonClassNames.JAVA_LANG_OBJECT)) {
if (originalBound == null ||
(!TypeConversionUtil.erasure(substitutedBoundType).isAssignableFrom(TypeConversionUtil.erasure(originalBound)) &&
!TypeConversionUtil.erasure(substitutedBoundType).isAssignableFrom(originalBound))) { //erasure is essential to avoid infinite recursion
java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
+2 -2
View File
@@ -92,7 +92,7 @@ public class PsiSuperMethodImplUtil {
if (!allowStaticMethod && method.hasModifierProperty(PsiModifier.STATIC)) return false;
if (checkAccess && method.hasModifierProperty(PsiModifier.PRIVATE)) return false;
PsiClass parentClass = method.getContainingClass();
return parentClass != null && !"java.lang.Object".equals(parentClass.getQualifiedName());
return parentClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(parentClass.getQualifiedName());
}
@Nullable
@@ -270,7 +270,7 @@ public class PsiSuperMethodImplUtil {
if (MethodSignatureUtil.isSubsignature(superSignatureHierarchical, hierarchicalMethodSignature)) {
if (superClass != null) {
if (superClass.isInterface() ||
"java.lang.Object".equals(superClass.getQualifiedName())) {
CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) {
return true;
}
java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeInfo.java
Vendored
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.psi.impl.cache;
import com.intellij.lang.LighterAST;
import com.intellij.lang.LighterASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
import com.intellij.psi.impl.java.stubs.PsiAnnotationStub;
@@ -73,7 +74,7 @@ public class TypeInfo {
registerFrequentType("short");
registerFrequentType("void");
registerFrequentType("Object");
registerFrequentType("java.lang.Object");
registerFrequentType(CommonClassNames.JAVA_LANG_OBJECT);
registerFrequentType("String");
registerFrequentType("java.lang.String");
}
java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java
+2 -1
View File
@@ -19,6 +19,7 @@
*/
package com.intellij.psi.impl.compiled;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiReferenceList;
import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
import com.intellij.psi.impl.java.stubs.PsiTypeParameterListStub;
@@ -74,7 +75,7 @@ public class SignatureParsing {
while (singatureIterator.current() == ':') {
singatureIterator.next();
String bound = parseToplevelClassRefSignature(singatureIterator);
if (bound != null && !bound.equals("java.lang.Object")) {
if (bound != null && !bound.equals(CommonClassNames.JAVA_LANG_OBJECT)) {
if (bounds == null) bounds = new ArrayList<String>();
bounds.add(bound);
}
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class PsiMethodCallExpressionImpl extends ExpressionPsiElement implements
//JLS3 15.8.2
if (is15OrHigher &&
GET_CLASS_METHOD.equals(method.getName()) &&
"java.lang.Object".equals(method.getContainingClass().getQualifiedName())) {
CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) {
PsiExpression qualifier = methodExpression.getQualifierExpression();
PsiType qualifierType = null;
if (qualifier != null) {
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+1 -1
View File
@@ -172,7 +172,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
PsiMethod existingMethod = (PsiMethod)existing.getElement();
assert existingMethod != null;
PsiClass existingClass = existingMethod.getContainingClass();
if (class1.isInterface() && "java.lang.Object".equals(existingClass.getQualifiedName())) { //prefer interface methods to methods from Object
if (class1.isInterface() && CommonClassNames.JAVA_LANG_OBJECT.equals(existingClass.getQualifiedName())) { //prefer interface methods to methods from Object
signatures.put(signature, info);
continue;
}
java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
+5 -5
View File
@@ -405,7 +405,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
LOG.assertTrue(type instanceof PsiArrayType);
PsiType componentType = ((PsiArrayType) type).getComponentType();
assertTrue(componentType.equalsToText("java.lang.Object"));
assertTrue(componentType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
assertEquals("Object", componentType.getPresentableText());
assertFalse(componentType instanceof PsiPrimitiveType);
assertFalse(componentType instanceof PsiArrayType);
@@ -424,7 +424,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
PsiType type2 = ((PsiArrayType) field2.getType()).getComponentType();
assertTrue(type2 instanceof PsiClassType);
assertTrue(type2.equalsToText("java.lang.Object"));
assertTrue(type2.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
assertEquals("Object", type2.getPresentableText());
}
@@ -436,7 +436,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
PsiType type1 = aClass.getFields()[1].getType();
PsiElement target1 = PsiUtil.resolveClassInType(type1);
assertNotNull(target1);
PsiClass objectClass = myJavaFacade.findClasses("java.lang.Object", RESOLVE_SCOPE)[1];
PsiClass objectClass = myJavaFacade.findClasses(CommonClassNames.JAVA_LANG_OBJECT, RESOLVE_SCOPE)[1];
assertEquals(objectClass, target1);
}
@@ -518,12 +518,12 @@ public class ClsRepositoryUseTest extends PsiTestCase{
PsiType type2 = parameters[1].getType();
assertEquals("Object", type2.getPresentableText());
assertTrue(type2.equalsToText("java.lang.Object"));
assertTrue(type2.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
assertFalse(type2 instanceof PsiArrayType);
assertFalse(type2 instanceof PsiPrimitiveType);
PsiClass target2 = PsiUtil.resolveClassInType(type2);
assertNotNull(target2);
PsiClass objectClass = myJavaFacade.findClasses("java.lang.Object", RESOLVE_SCOPE)[1];
PsiClass objectClass = myJavaFacade.findClasses(CommonClassNames.JAVA_LANG_OBJECT, RESOLVE_SCOPE)[1];
assertEquals(objectClass, target2);
parameters[0].getModifierList();
java/java-tests/testSrc/com/intellij/psi/SrcRepositoryUseTest.java
+5 -5
View File
@@ -88,7 +88,7 @@ public class SrcRepositoryUseTest extends PsiTestCase{
assertEquals(params[1].getName(), "B");
assertEquals("java.lang.String", params[0].getSupers()[0].getQualifiedName());
assertEquals("java.lang.Object", params[1].getSupers()[0].getQualifiedName());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, params[1].getSupers()[0].getQualifiedName());
teardownLoadingFilter();
}
@@ -381,7 +381,7 @@ public class SrcRepositoryUseTest extends PsiTestCase{
LOG.assertTrue(type instanceof PsiArrayType);
PsiType componentType = ((PsiArrayType) type).getComponentType();
assertTrue(componentType.equalsToText("java.lang.Object"));
assertTrue(componentType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
assertFalse(componentType instanceof PsiPrimitiveType);
assertFalse(componentType instanceof PsiArrayType);
@@ -403,7 +403,7 @@ public class SrcRepositoryUseTest extends PsiTestCase{
PsiField field3 = aClass.getFields()[2];
PsiType type3 = ((PsiArrayType) field3.getType()).getComponentType();
assertTrue(type3.equalsToText("java.lang.Object"));
assertTrue(type3.equalsToText(CommonClassNames.JAVA_LANG_OBJECT));
teardownLoadingFilter();
}
@@ -443,7 +443,7 @@ public class SrcRepositoryUseTest extends PsiTestCase{
PsiType type1 = aClass.getFields()[1].getType();
PsiElement target1 = PsiUtil.resolveClassInType(type1);
assertNotNull(target1);
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(myProject));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myProject));
assertEquals(objectClass, target1);
PsiType type2 = aClass.getFields()[1].getType();
@@ -525,7 +525,7 @@ public class SrcRepositoryUseTest extends PsiTestCase{
assertFalse(type2 instanceof PsiPrimitiveType);
PsiClass target2 = PsiUtil.resolveClassInType(type2);
assertNotNull(target2);
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(myProject));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myProject));
assertEquals(objectClass, target2);
checkPackAAA(parms[2].getType());
java/java-tests/testSrc/com/intellij/psi/resolve/ResolveMethod15Test.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class ResolveMethod15Test extends Resolve15TestCase {
assertNotNull(element);
assertThat(element, instanceOf(PsiMethod.class));
final PsiMethod method = (PsiMethod)element;
assertEquals("java.lang.Object", method.getContainingClass().getQualifiedName());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, method.getContainingClass().getQualifiedName());
}
public void testStaticImportDirect() throws Exception {
java/java-tests/testSrc/com/intellij/psi/resolve/ResolveMethodTest.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class ResolveMethodTest extends ResolveTestCase {
assertTrue(target instanceof PsiMethod);
final PsiMethod method = (PsiMethod)target;
assertEquals("clone", method.getName());
assertEquals("java.lang.Object", method.getContainingClass().getQualifiedName());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, method.getContainingClass().getQualifiedName());
}
java/java-tests/testSrc/com/intellij/psi/resolve/TypeInferenceTest.java
+5 -5
View File
@@ -13,7 +13,7 @@ public class TypeInferenceTest extends Resolve15TestCase {
assertTrue(type instanceof PsiClassType);
PsiType[] paramTypes = ((PsiClassType)type).getParameters();
assertEquals(1, paramTypes.length);
assertEquals( "java.lang.Object", paramTypes[0].getCanonicalText());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, paramTypes[0].getCanonicalText());
}
public void testInferInAssign1 () throws Exception {
@@ -31,7 +31,7 @@ public class TypeInferenceTest extends Resolve15TestCase {
assertTrue(type instanceof PsiClassType);
PsiType[] paramTypes = ((PsiClassType)type).getParameters();
assertEquals(1, paramTypes.length);
assertEquals( "java.lang.Object", paramTypes[0].getCanonicalText());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, paramTypes[0].getCanonicalText());
}
public void testInferInCast () throws Exception {
@@ -40,7 +40,7 @@ public class TypeInferenceTest extends Resolve15TestCase {
assertTrue(type instanceof PsiClassType);
PsiType[] paramTypes = ((PsiClassType)type).getParameters();
assertEquals(1, paramTypes.length);
assertEquals( "java.lang.Object", paramTypes[0].getCanonicalText());
assertEquals(CommonClassNames.JAVA_LANG_OBJECT, paramTypes[0].getCanonicalText());
}
public void testInferWithBounds () throws Exception {
@@ -65,7 +65,7 @@ public class TypeInferenceTest extends Resolve15TestCase {
}
public void testInferRawType () throws Exception {
checkResolvesTo("java.lang.Object");
checkResolvesTo(CommonClassNames.JAVA_LANG_OBJECT);
}
private void checkResolvesTo(@NonNls String typeName) throws Exception {
@@ -144,7 +144,7 @@ public class TypeInferenceTest extends Resolve15TestCase {
}
public void testInferUnchecked () throws Exception {
checkResolvesTo("java.lang.Object");
checkResolvesTo(CommonClassNames.JAVA_LANG_OBJECT);
}
public void testInferNotNull () throws Exception {
java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java
+6 -6
View File
@@ -97,7 +97,7 @@ public class UpdateCacheTest extends PsiTestCase{
file = (PsiFile)root.add(file);
assertNotNull(file);
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(getProject()));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(getProject()));
assertNotNull(objectClass);
checkUsages(objectClass, new String[]{"New.java"});
}
@@ -111,7 +111,7 @@ public class UpdateCacheTest extends PsiTestCase{
assertNotNull(file);
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(getProject()));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(getProject()));
assertNotNull(objectClass);
checkUsages(objectClass, new String[]{"New.java"});
}
@@ -136,7 +136,7 @@ public class UpdateCacheTest extends PsiTestCase{
VfsUtil.saveText(file, "class A{ Object o;}");
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(getProject()));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(getProject()));
assertNotNull(objectClass);
checkUsages(objectClass, new String[]{"1.java"});
}
@@ -149,7 +149,7 @@ public class UpdateCacheTest extends PsiTestCase{
public void testExternalFileModificationWhileProjectClosed() throws Exception {
VirtualFile root = ProjectRootManager.getInstance(myProject).getContentRoots()[0];
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(getProject()));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(getProject()));
assertNotNull(objectClass);
checkUsages(objectClass, new String[]{});
FileBasedIndex.getInstance().getContainingFiles(TodoIndex.NAME, new TodoIndexEntry("todo", true), GlobalSearchScope.allScope(getProject()));
@@ -183,7 +183,7 @@ public class UpdateCacheTest extends PsiTestCase{
myPsiManager = (PsiManagerImpl) PsiManager.getInstance(myProject);
myJavaFacade = (JavaPsiFacadeImpl) JavaPsiFacade.getInstance(myProject);
objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(getProject()));
objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(getProject()));
assertNotNull(objectClass);
checkUsages(objectClass, new String[]{"1.java"});
}
@@ -198,7 +198,7 @@ public class UpdateCacheTest extends PsiTestCase{
assertNotNull(file);
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
PsiClass objectClass = myJavaFacade.findClass("java.lang.Object", GlobalSearchScope.allScope(getProject()));
PsiClass objectClass = myJavaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(getProject()));
assertNotNull(objectClass);
checkUsages(objectClass, new String[]{"New.java"});
}
java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class IntroduceConstantTest extends LightCodeInsightTestCase {
}
public void testResultedType() throws Exception {
checkDefaultType("java.lang.Object");
checkDefaultType(CommonClassNames.JAVA_LANG_OBJECT);
}
public void testResultedTypeWhenNonLocal() throws Exception {
java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
+4 -4
View File
@@ -42,7 +42,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
}
public void testIDEADEV3678() throws Exception {
doTest(new MockIntroduceVariableHandler("component", true, true, true, "java.lang.Object"));
doTest(new MockIntroduceVariableHandler("component", true, true, true, CommonClassNames.JAVA_LANG_OBJECT));
}
public void testIDEADEV13369() throws Exception {
@@ -66,7 +66,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
}
public void testMethodCall() throws Exception {
doTest(new MockIntroduceVariableHandler("temp", true, true, true, "java.lang.Object"));
doTest(new MockIntroduceVariableHandler("temp", true, true, true, CommonClassNames.JAVA_LANG_OBJECT));
}
public void testMethodCallInSwitch() throws Exception {
@@ -114,7 +114,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
}
public void testSCR22718() throws Exception {
doTest(new MockIntroduceVariableHandler("object", true, true, false, "java.lang.Object"));
doTest(new MockIntroduceVariableHandler("object", true, true, false, CommonClassNames.JAVA_LANG_OBJECT));
}
public void testSCR26075() throws Exception {
@@ -315,7 +315,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
}
public void testBeforeVoidStatement() throws Exception {
doTest(new MockIntroduceVariableHandler("c", false, false, false, "java.lang.Object"));
doTest(new MockIntroduceVariableHandler("c", false, false, false, CommonClassNames.JAVA_LANG_OBJECT));
}
private void doTest(IntroduceVariableBase testMe) throws Exception {
java/openapi/src/com/intellij/codeInsight/ClassUtil.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class ClassUtil {
// super class can have package local abstract methods not accessible for overriding
PsiClass superClass = aClass.getSuperClass();
if (superClass == null) return null;
if ("java.lang.Object".equals(aClass.getQualifiedName())) return null;
if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;
if (JavaPsiFacade.getInstance(aClass.getProject()).arePackagesTheSame(aClass, superClass)) return null;
for (HierarchicalMethodSignature methodSignature : superClass.getVisibleSignatures()) {
java/openapi/src/com/intellij/psi/util/PropertyUtil.java
+2 -2
View File
@@ -355,7 +355,7 @@ public class PropertyUtil {
}
for (PsiMethod method : methods) {
if ("java.lang.Object".equals(method.getContainingClass().getQualifiedName())) continue;
if (CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) continue;
if (isSimplePropertyGetter(method)) {
result.add(getPropertyName(method));
@@ -378,7 +378,7 @@ public class PropertyUtil {
}
for (PsiMethod method : methods) {
if ("java.lang.Object".equals(method.getContainingClass().getQualifiedName())) continue;
if (CommonClassNames.JAVA_LANG_OBJECT.equals(method.getContainingClass().getQualifiedName())) continue;
if (isSimplePropertySetter(method)) {
result.add(getPropertyName(method));
java/openapi/src/com/intellij/util/xml/actions/CreateClassMappingAction.java
+2 -5
View File
@@ -23,10 +23,7 @@ import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiModifier;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.containers.HashMap;
import com.intellij.util.xml.DomElement;
@@ -66,7 +63,7 @@ public abstract class CreateClassMappingAction<T extends DomElement> extends Cre
selectedClass = chooser.getSelected();
}
else {
selectedClass = getBaseClass(context, project, myBaseClass == null ? "java.lang.Object" : myBaseClass);
selectedClass = getBaseClass(context, project, myBaseClass == null ? CommonClassNames.JAVA_LANG_OBJECT : myBaseClass);
}
if (selectedClass == null) return null;
plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Pair;
import com.intellij.pom.PomTarget;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiFileSystemItem;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlElement;
@@ -194,7 +195,7 @@ public class AntDomExtender extends DomExtender<AntDomElement>{
final DomExtension extension = registerChild(registrar, genericInfo, nestedElementName);
if (extension != null) {
Class type = parentIntrospector.getNestedElementType(nestedElementName);
if (type != null && "java.lang.Object".equals(type.getName())) {
if (type != null && CommonClassNames.JAVA_LANG_OBJECT.equals(type.getName())) {
type = null; // hack to support badly written tasks
}
if (type == null) {
plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java
+2 -2
View File
@@ -442,10 +442,10 @@ public class AntTypeDefImpl extends AntTaskImpl implements AntTypeDef {
for (AntTypeId nestedTypeId : def.getNestedElements()) {
final String className = def.getNestedClassName(nestedTypeId);
if ("java.lang.Object".equals(className)) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(className)) {
// check if such typeId is already mapped correct the definition's nested element
for (AntTypeDefinition typeDefinition : getAntFile().getBaseTypeDefinitions()) {
if (nestedTypeId.equals(typeDefinition.getTypeId()) && !"java.lang.Object".equals(typeDefinition.getClassName())) {
if (nestedTypeId.equals(typeDefinition.getTypeId()) && !CommonClassNames.JAVA_LANG_OBJECT.equals(typeDefinition.getClassName())) {
def.registerNestedType(nestedTypeId, typeDefinition.getClassName());
break;
}
plugins/ant/src/com/intellij/lang/ant/psi/introspection/impl/AntTypeDefinitionImpl.java
+3 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.lang.ant.psi.impl.AntFileImpl;
import com.intellij.lang.ant.psi.introspection.AntAttributeType;
import com.intellij.lang.ant.psi.introspection.AntTypeDefinition;
import com.intellij.lang.ant.psi.introspection.AntTypeId;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiLock;
import org.jetbrains.annotations.NonNls;
@@ -163,7 +164,7 @@ public class AntTypeDefinitionImpl implements AntTypeDefinition {
}
public boolean isExtensionPointType(final ClassLoader loader, final String className) {
if ("java.lang.Object".equals(className)) {
if (CommonClassNames.JAVA_LANG_OBJECT.equals(className)) {
return false;
}
if (myExtensionPoints.contains(className)) {
@@ -178,7 +179,7 @@ public class AntTypeDefinitionImpl implements AntTypeDefinition {
}
private boolean isExtensionPointType(final Class<?> aClass) {
if (aClass == null || "java.lang.Object".equals(aClass.getName())) {
if (aClass == null || CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getName())) {
return false;
}
if (myExtensionPoints.contains(aClass.getName())) {
plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java
+2 -2
View File
@@ -181,7 +181,7 @@ public class PsiAdapter {
* @return true if it's an Object type.
*/
public boolean isObjectType(PsiElementFactory factory, PsiType type) {
return isTypeOf(factory, type, "java.lang.Object");
return isTypeOf(factory, type, CommonClassNames.JAVA_LANG_OBJECT);
}
/**
@@ -588,7 +588,7 @@ public class PsiAdapter {
}
// parameter must be Object
if (!(parameters[0].getType().getCanonicalText().equals("java.lang.Object"))) {
if (!(parameters[0].getType().getCanonicalText().equals(CommonClassNames.JAVA_LANG_OBJECT))) {
continue;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
+1 -1
View File
@@ -1684,7 +1684,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
PsiClass[] superTypes = aClass.getSupers();
for (PsiElement superType : superTypes) {
while (superType instanceof PsiClass) {
if (!"java.lang.Object".equals(((PsiClass)superType).getQualifiedName())) {
if (!CommonClassNames.JAVA_LANG_OBJECT.equals(((PsiClass)superType).getQualifiedName())) {
PsiClass circularClass = getCircularClass((PsiClass)superType, usedClasses);
if (circularClass != null) return circularClass;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/ui/DynamicDialog.java
+1 -1
View File
@@ -192,7 +192,7 @@ public abstract class DynamicDialog extends DialogWrapper {
GrTypeElement typeElement = getEnteredTypeName();
if (typeElement == null) {
mySettings.setType("java.lang.Object");
mySettings.setType(CommonClassNames.JAVA_LANG_OBJECT);
}
else {
PsiType type = typeElement.getType();
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class GroovyLineMarkerProvider extends JavaLineMarkerProvider {
for (PsiMethod method : methods) {
ProgressManager.checkCanceled();
final PsiClass parentClass = method.getContainingClass();
if (parentClass != null && !"java.lang.Object".equals(parentClass.getQualifiedName())) {
if (parentClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(parentClass.getQualifiedName())) {
classes.add(parentClass);
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyNotifyWhileNotSynchronizedInspection.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.groovy.codeInspection.threading;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
@@ -72,7 +73,7 @@ public class GroovyNotifyWhileNotSynchronizedInspection extends BaseInspection {
return;
}
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null || !"java.lang.Object".equals(containingClass.getQualifiedName())) {
if (containingClass == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) {
return;
}
final GrMethod containingMethod = PsiTreeUtil.getParentOfType(grMethodCallExpression, GrMethod.class);
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyUnconditionalWaitInspection.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.groovy.codeInspection.threading;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
@@ -105,7 +106,7 @@ public class GroovyUnconditionalWaitInspection extends BaseInspection {
return;
}
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null || !"java.lang.Object".equals(containingClass.getQualifiedName())) {
if (containingClass == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) {
return;
}
registerMethodCallError(methodCallExpression);
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitCallNotInLoopInspection.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.groovy.codeInspection.threading;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import org.jetbrains.annotations.Nls;
@@ -68,7 +69,7 @@ public class GroovyWaitCallNotInLoopInspection extends BaseInspection {
return;
}
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null || !"java.lang.Object".equals(containingClass.getQualifiedName())) {
if (containingClass == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) {
return;
}
if (ControlFlowUtils.isInLoop(grMethodCallExpression)) {
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/threading/GroovyWaitWhileNotSynchronizedInspection.java
+2 -1
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.groovy.codeInspection.threading;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiModifier;
@@ -73,7 +74,7 @@ public class GroovyWaitWhileNotSynchronizedInspection extends BaseInspection {
return;
}
final PsiClass containingClass = method.getContainingClass();
if (containingClass == null || !"java.lang.Object".equals(containingClass.getQualifiedName())) {
if (containingClass == null || !CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) {
return;
}
final GrMethod containingMethod = PsiTreeUtil.getParentOfType(grMethodCallExpression, GrMethod.class);
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/template/expressions/ChooseTypeExpression.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class ChooseTypeExpression extends Expression {
private PsiType chooseType(TypeConstraint[] constraints) {
if (constraints.length > 0) return constraints[0].getDefaultType();
return JavaPsiFacade.getInstance(myManager.getProject()).getElementFactory().createTypeByFQClassName("java.lang.Object", GlobalSearchScope.allScope(myManager.getProject()));
return JavaPsiFacade.getInstance(myManager.getProject()).getElementFactory().createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myManager.getProject()));
}
public Result calculateResult(ExpressionContext context) {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrSuperReferenceExpressionImpl.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class GrSuperReferenceExpressionImpl extends GrThisSuperReferenceExpressi
return PsiType.getJavaLangObject(getManager(), getResolveScope());
}
if ("java.lang.Object".equals(aClass.getQualifiedName())) return null;
if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;
PsiClassType[] superTypes = aClass.getExtendsListTypes();
if (superTypes.length == 0) {
return PsiType.getJavaLangObject(getManager(), getResolveScope());
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
+1 -1
View File
@@ -240,7 +240,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
// Process method return statements
if (returnCount > 1 && PsiType.VOID != methodType && !isTailMethodCall) {
PsiType type = methodType != null && methodType.equalsToText("java.lang.Object") ? null : methodType;
PsiType type = methodType != null && methodType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) ? null : methodType;
GrVariableDeclaration resultDecl = factory.createVariableDeclaration(ArrayUtil.EMPTY_STRING_ARRAY, null, type, resultName);
GrStatement statement = ((GrStatementOwner) owner).addStatementBefore(resultDecl, anchor);
GrReferenceAdjuster.shortenReferences(statement);
xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class ModelGen {
final String replacement = e.getAttributeValue("replace-with");
model.name2replaceMap.put(name, replacement);
}
NamespaceDesc def = new NamespaceDesc("", "generated", "java.lang.Object", "", null, null, null, null);
NamespaceDesc def = new NamespaceDesc("", "generated", com.intellij.psi.CommonClassNames.JAVA_LANG_OBJECT, "", null, null, null, null);
for (Element nsElement : (List<Element>) namespaceEl.getChildren("namespace")) {
final String name = nsElement.getAttributeValue("name");
final NamespaceDesc nsDesc = new NamespaceDesc(name, def);
xml/dom-impl/src/com/intellij/util/dom/generator/NamespaceDesc.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class NamespaceDesc {
}
public NamespaceDesc(String name) {
this(name, "generated", "java.lang.Object", "", null, null, null, null);
this(name, "generated", com.intellij.psi.CommonClassNames.JAVA_LANG_OBJECT, "", null, null, null, null);
skip = true;
}