diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java index 1e38e3d4f39..07c39fcd146 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; @@ -22,5 +23,5 @@ public interface TypeConstructor extends Annotated { boolean isSealed(); @Nullable - DeclarationDescriptor getDeclarationDescriptor(); + ClassifierDescriptor getDeclarationDescriptor(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java index ed11cc2e5d4..7d2d5c0f855 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java @@ -2,7 +2,7 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -22,17 +22,17 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo private final boolean sealed; @Nullable - private final DeclarationDescriptor declarationDescriptor; + private final ClassifierDescriptor classifierDescriptor; public TypeConstructorImpl( - @Nullable DeclarationDescriptor declarationDescriptor, + @Nullable ClassifierDescriptor classifierDescriptor, @NotNull List annotations, boolean sealed, @NotNull String debugName, @NotNull List parameters, @NotNull Collection supertypes) { super(annotations); - this.declarationDescriptor = declarationDescriptor; + this.classifierDescriptor = classifierDescriptor; this.sealed = sealed; this.debugName = debugName; this.parameters = Collections.unmodifiableList(new ArrayList(parameters)); @@ -63,7 +63,7 @@ public class TypeConstructorImpl extends AnnotatedImpl implements TypeConstructo @Override @Nullable - public DeclarationDescriptor getDeclarationDescriptor() { - return declarationDescriptor; + public ClassifierDescriptor getDeclarationDescriptor() { + return classifierDescriptor; } }