(no message)

This commit is contained in:
Eugene Vigdorchik
2005-02-16 13:49:35 +03:00
parent 59723f408b
commit 14afdd8e52
6 changed files with 1 additions and 51 deletions
@@ -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) {
@@ -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();
}
@@ -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<PsiType> lst = new ArrayList<PsiType>();
final PsiTypeParameterList list = myClass.getTypeParameterList();
@@ -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() {
@@ -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();
@@ -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);
}