diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java index 452741f6f92..f0f55b92c9a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java @@ -29,7 +29,6 @@ import java.util.Map; */ public abstract class ClassDescriptorBase implements ClassDescriptor { - protected TypeConstructor typeConstructor; protected JetType defaultType; protected abstract JetScope getScopeForMemberLookup(); @@ -59,12 +58,6 @@ public abstract class ClassDescriptorBase implements ClassDescriptor { return new LazySubstitutingClassDescriptor(this, substitutor); } - @NotNull - @Override - public TypeConstructor getTypeConstructor() { - return typeConstructor; - } - @NotNull @Override public JetType getDefaultType() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java index 741f3826b78..9e9ab59d7ea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java @@ -46,6 +46,8 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase private List typeParameters; private Collection supertypes = Lists.newArrayList(); + private TypeConstructor typeConstructor; + private Modality modality; private Visibility visibility; @@ -113,6 +115,12 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase } } + @NotNull + @Override + public TypeConstructor getTypeConstructor() { + return typeConstructor; + } + public void setScopeForMemberLookup(JetScope scopeForMemberLookup) { this.scopeForMemberLookup = scopeForMemberLookup; this.innerClassesScope = new InnerClassesScopeWrapper(scopeForMemberLookup);