From 70dd79d7e44d770ed1ea95f276908c179c7f62a9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 18 Mar 2016 14:03:46 +0300 Subject: [PATCH] Minor, rename TypeConstructorImpl -> ClassTypeConstructorImpl --- .../org/jetbrains/kotlin/codegen/MutableClassDescriptor.java | 4 ++-- .../kotlin/descriptors/impl/ClassDescriptorImpl.java | 4 ++-- .../descriptors/impl/EnumEntrySyntheticClassDescriptor.java | 4 ++-- .../descriptors/impl/LazySubstitutingClassDescriptor.java | 2 +- ...TypeConstructorImpl.java => ClassTypeConstructorImpl.java} | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) rename core/descriptors/src/org/jetbrains/kotlin/types/{TypeConstructorImpl.java => ClassTypeConstructorImpl.java} (95%) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java index 71380808717..4b9dc0c524f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java @@ -26,9 +26,9 @@ import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorImpl; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.types.ClassTypeConstructorImpl; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.TypeConstructor; -import org.jetbrains.kotlin.types.TypeConstructorImpl; import org.jetbrains.kotlin.types.TypeUtils; import java.util.*; @@ -151,7 +151,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class public void createTypeConstructor() { assert typeConstructor == null : typeConstructor; - this.typeConstructor = new TypeConstructorImpl( + this.typeConstructor = new ClassTypeConstructorImpl( this, Annotations.Companion.getEMPTY(), ModalityKt.isFinalClass(this), typeParameters, supertypes ); for (FunctionDescriptor functionDescriptor : getConstructors()) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java index 007bb9bc71f..b412eb479e8 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java @@ -23,9 +23,9 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.types.ClassTypeConstructorImpl; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.TypeConstructor; -import org.jetbrains.kotlin.types.TypeConstructorImpl; import java.util.Collection; import java.util.Collections; @@ -53,7 +53,7 @@ public class ClassDescriptorImpl extends ClassDescriptorBase { this.modality = modality; this.kind = kind; - this.typeConstructor = new TypeConstructorImpl( + this.typeConstructor = new ClassTypeConstructorImpl( this, Annotations.Companion.getEMPTY(), false, Collections.emptyList(), supertypes ); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index 177fddd7ffa..b0fc8599266 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -34,9 +34,9 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.types.ClassTypeConstructorImpl; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.TypeConstructor; -import org.jetbrains.kotlin.types.TypeConstructorImpl; import org.jetbrains.kotlin.utils.Printer; import java.util.*; @@ -79,7 +79,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { assert containingClass.getKind() == ClassKind.ENUM_CLASS; this.annotations = annotations; - this.typeConstructor = new TypeConstructorImpl( + this.typeConstructor = new ClassTypeConstructorImpl( this, getAnnotations(), true, Collections.emptyList(), Collections.singleton(supertype) ); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java index 25470de4c9b..c580f56912b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -84,7 +84,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { supertypes.add(substitutor.substitute(supertype, Variance.INVARIANT)); } - typeConstructor = new TypeConstructorImpl( + typeConstructor = new ClassTypeConstructorImpl( this, originalTypeConstructor.getAnnotations(), originalTypeConstructor.isFinal(), typeConstructorParameters, supertypes ); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/ClassTypeConstructorImpl.java similarity index 95% rename from core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/types/ClassTypeConstructorImpl.java index 46515cd01d3..117d1af88ad 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ClassTypeConstructorImpl.java @@ -29,14 +29,14 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -public class TypeConstructorImpl extends AbstractClassTypeConstructor implements TypeConstructor { +public class ClassTypeConstructorImpl extends AbstractClassTypeConstructor implements TypeConstructor { private final ClassDescriptor classDescriptor; private final Annotations annotations; private final List parameters; private final Collection supertypes; private final boolean isFinal; - public TypeConstructorImpl( + public ClassTypeConstructorImpl( @NotNull ClassDescriptor classDescriptor, @NotNull Annotations annotations, boolean isFinal,