From 7a5469faa4a512d92351800eb450a117f59552e1 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 6 Jun 2016 20:42:19 +0300 Subject: [PATCH] Minor. rename LazyJavaTypeResolver -> JavaTypeResolver. --- .../src/org/jetbrains/kotlin/load/java/lazy/context.kt | 4 ++-- .../types/{LazyJavaTypeResolver.kt => JavaTypeResolver.kt} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/{LazyJavaTypeResolver.kt => JavaTypeResolver.kt} (99%) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt index 0c64261b38c..4f683b8e589 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.components.* -import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver +import org.jetbrains.kotlin.load.java.lazy.types.JavaTypeResolver import org.jetbrains.kotlin.load.java.sources.JavaSourceElementFactory import org.jetbrains.kotlin.load.java.structure.JavaTypeParameterListOwner import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver @@ -64,7 +64,7 @@ class LazyJavaResolverContext( val components: JavaResolverComponents, val typeParameterResolver: TypeParameterResolver ) { - val typeResolver = LazyJavaTypeResolver(this, typeParameterResolver) + val typeResolver = JavaTypeResolver(this, typeParameterResolver) val storageManager: StorageManager get() = components.storageManager diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt similarity index 99% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt index ef4bb4c301e..79ff6dd81d7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.utils.toReadOnlyList private val JAVA_LANG_CLASS_FQ_NAME: FqName = FqName("java.lang.Class") -class LazyJavaTypeResolver( +class JavaTypeResolver( private val c: LazyJavaResolverContext, private val typeParameterResolver: TypeParameterResolver ) {