MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upsource-master

Browse Source
This commit is contained in:
Evgeny Pasynkov
2012-05-30 14:47:07 +02:00
parent 3bdac9684c 3fd1d42284
commit 9576260c42
208 changed files with 2873 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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;
}