From 14afdd8e522f04a39bc5f4dcc43af74df4a96c1b Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Wed, 16 Feb 2005 13:49:35 +0300 Subject: [PATCH] (no message) --- .../src/com/intellij/psi/PsiClassType.java | 1 - .../impl/source/PsiClassReferenceType.java | 20 ------------------- .../impl/source/PsiImmediateClassType.java | 17 ---------------- .../PsiJavaCodeReferenceElementImpl.java | 6 +----- .../impl/source/SourceJavaCodeReference.java | 4 ---- .../tree/java/PsiReferenceExpressionImpl.java | 4 ---- 6 files changed, 1 insertion(+), 51 deletions(-) diff --git a/openapi/src/com/intellij/psi/PsiClassType.java b/openapi/src/com/intellij/psi/PsiClassType.java index f55583d67063..d3cd274871b9 100644 --- a/openapi/src/com/intellij/psi/PsiClassType.java +++ b/openapi/src/com/intellij/psi/PsiClassType.java @@ -19,7 +19,6 @@ public abstract class PsiClassType extends PsiType { public abstract String getClassName(); - public abstract PsiClassType getQualiferType(); public abstract PsiType[] getParameters(); public boolean equals(Object obj) { diff --git a/source/com/intellij/psi/impl/source/PsiClassReferenceType.java b/source/com/intellij/psi/impl/source/PsiClassReferenceType.java index 80645cc39c64..cef08bd3980f 100644 --- a/source/com/intellij/psi/impl/source/PsiClassReferenceType.java +++ b/source/com/intellij/psi/impl/source/PsiClassReferenceType.java @@ -114,26 +114,6 @@ public class PsiClassReferenceType extends PsiClassType { return myReference.getReferenceName(); } - public PsiClassType getQualiferType() { - if (!(myReference instanceof SourceJavaCodeReference)) { - // todo[dsl] fix this for compiled code - return null; - } - final PsiElement psiElement = SourceTreeToPsiMap.treeElementToPsi(((SourceJavaCodeReference) myReference).getTreeQualifier()); - if (psiElement instanceof PsiJavaCodeReferenceElement) { - final PsiJavaCodeReferenceElement qualifierReference = ((PsiJavaCodeReferenceElement)psiElement); - if (qualifierReference.getTypeParameters().length > 0) { - return new PsiClassReferenceType(qualifierReference); - } - else { - return null; - } - } - else { - return null; - } - } - public PsiType[] getParameters() { return myReference.getTypeParameters(); } diff --git a/source/com/intellij/psi/impl/source/PsiImmediateClassType.java b/source/com/intellij/psi/impl/source/PsiImmediateClassType.java index 5b67898097be..74cd29ba7e6c 100644 --- a/source/com/intellij/psi/impl/source/PsiImmediateClassType.java +++ b/source/com/intellij/psi/impl/source/PsiImmediateClassType.java @@ -3,7 +3,6 @@ package com.intellij.psi.impl.source; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.impl.EmptySubstitutorImpl; -import com.intellij.psi.impl.PsiSubstitutorImpl; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.IncorrectOperationException; @@ -70,22 +69,6 @@ public class PsiImmediateClassType extends PsiClassType { public String getClassName() { return myClass.getName(); } - - private PsiClassType myCachedQualiferType; - private boolean isQualifierTypeCalculated = false; - public PsiClassType getQualiferType() { - if (isQualifierTypeCalculated) { - if (!(myClass.getParent() instanceof PsiClass)) { - myCachedQualiferType = null; - } else { - final PsiClass parentClass = ((PsiClass)myClass.getParent()); - myCachedQualiferType = new PsiImmediateClassType(parentClass, mySubstitutor); - } - isQualifierTypeCalculated = true; - } - return myCachedQualiferType; - } - public PsiType[] getParameters() { List lst = new ArrayList(); final PsiTypeParameterList list = myClass.getTypeParameterList(); diff --git a/source/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java b/source/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java index 9e6cf457df45..2427ef8da9b1 100644 --- a/source/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java +++ b/source/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java @@ -676,12 +676,8 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme return getChildRole(getFirstChildNode()) != ChildRole.REFERENCE_NAME; } - public ASTNode getTreeQualifier() { - return findChildByRole(ChildRole.QUALIFIER); - } - public PsiElement getQualifier() { - return SourceTreeToPsiMap.treeElementToPsi(getTreeQualifier()); + return SourceTreeToPsiMap.treeElementToPsi(findChildByRole(ChildRole.QUALIFIER)); } public void dequalify() { diff --git a/source/com/intellij/psi/impl/source/SourceJavaCodeReference.java b/source/com/intellij/psi/impl/source/SourceJavaCodeReference.java index 1986b1f59a90..03e1cdd23760 100644 --- a/source/com/intellij/psi/impl/source/SourceJavaCodeReference.java +++ b/source/com/intellij/psi/impl/source/SourceJavaCodeReference.java @@ -2,9 +2,6 @@ package com.intellij.psi.impl.source; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; -import com.intellij.psi.impl.source.tree.TreeElement; -import com.intellij.psi.impl.source.tree.TreeElement; -import com.intellij.lang.ASTNode; /** * This interface should be implemented by all PsiJavaCodeReference implementations @@ -29,7 +26,6 @@ public interface SourceJavaCodeReference { boolean isQualified(); - ASTNode getTreeQualifier(); PsiElement getQualifier(); void dequalify(); diff --git a/source/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/source/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java index d0767aa68452..37a651d89eae 100644 --- a/source/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java +++ b/source/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java @@ -554,10 +554,6 @@ public class PsiReferenceExpressionImpl extends CompositePsiElement implements P return getChildRole(getFirstChildNode()) == ChildRole.QUALIFIER; } - public ASTNode getTreeQualifier() { - return findChildByRole(ChildRole.QUALIFIER); - } - public void dequalify() { SourceUtil.dequalifyImpl(this); }