JavaDescriptorResolver refactoring

* kill JavaDescriptorResolver.typeParameterDescriptorCache
* use ClassOrNamespaceDescriptor instead of DeclarationDescriptor

Code is a bit ugly now, but simpler than before.
This commit is contained in:
Stepan Koltsov
2012-01-31 22:48:55 +04:00
parent c88940c07c
commit e075bec4c0
30 changed files with 485 additions and 217 deletions
@@ -15,7 +15,7 @@ import java.util.Set;
/**
* @author abreslav
*/
public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor {
public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor, ClassOrNamespaceDescriptor {
@NotNull
JetScope getMemberScope(List<TypeProjection> typeArguments);
@@ -0,0 +1,7 @@
package org.jetbrains.jet.lang.descriptors;
/**
* @author Stepan Koltsov
*/
public interface ClassOrNamespaceDescriptor extends DeclarationDescriptor {
}
@@ -8,7 +8,7 @@ import org.jetbrains.jet.lang.types.NamespaceType;
/**
* @author abreslav
*/
public interface NamespaceDescriptor extends Annotated, Named, DeclarationDescriptor {
public interface NamespaceDescriptor extends Annotated, Named, ClassOrNamespaceDescriptor {
@NotNull
JetScope getMemberScope();