From 796386049b570b61f8d4d1fb4c31f10e869a3829 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 20 Feb 2014 17:50:29 +0400 Subject: [PATCH] Minor: remove explicit dependency on JavaDescriptorResolver from AnnotationDescriptorDeserializer --- .../jet/di/InjectorForJavaDescriptorResolver.java | 2 +- .../jet/di/InjectorForLazyResolveWithJava.java | 2 +- .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 2 +- .../kotlin/AnnotationDescriptorDeserializer.java | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index b79901b81f0..1861affcc4f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -98,8 +98,8 @@ public class InjectorForJavaDescriptorResolver { deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); deserializedDescriptorResolver.setStorageManager(lockBasedStorageManager); + annotationDescriptorDeserializer.setClassResolver(javaDescriptorResolver); annotationDescriptorDeserializer.setErrorReporter(traceBasedErrorReporter); - annotationDescriptorDeserializer.setJavaDescriptorResolver(javaDescriptorResolver); annotationDescriptorDeserializer.setKotlinClassFinder(virtualFileFinder); javaClassFinder.initialize(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java index 704d3db2263..987de5fb7f1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java @@ -217,8 +217,8 @@ public class InjectorForLazyResolveWithJava { deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); deserializedDescriptorResolver.setStorageManager(lockBasedStorageManager); + annotationDescriptorDeserializer.setClassResolver(javaDescriptorResolver); annotationDescriptorDeserializer.setErrorReporter(traceBasedErrorReporter); - annotationDescriptorDeserializer.setJavaDescriptorResolver(javaDescriptorResolver); annotationDescriptorDeserializer.setKotlinClassFinder(virtualFileFinder); javaClassFinder.initialize(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 735651e4bb8..8415b35e6c7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -292,8 +292,8 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); deserializedDescriptorResolver.setStorageManager(storageManager); + annotationDescriptorDeserializer.setClassResolver(javaDescriptorResolver); annotationDescriptorDeserializer.setErrorReporter(traceBasedErrorReporter); - annotationDescriptorDeserializer.setJavaDescriptorResolver(javaDescriptorResolver); annotationDescriptorDeserializer.setKotlinClassFinder(virtualFileFinder); javaClassFinder.initialize(); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java index 82e71ddd87e..6e9ee19d6bd 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java @@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.EnumValue; import org.jetbrains.jet.lang.resolve.constants.ErrorValue; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; @@ -40,6 +39,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter; import org.jetbrains.jet.lang.resolve.java.resolver.ResolverPackage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.types.DependencyClassByQualifiedNameResolver; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; import org.jetbrains.jet.storage.StorageManager; @@ -55,7 +55,7 @@ import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.ko import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName; public class AnnotationDescriptorDeserializer implements AnnotationDeserializer { - private JavaDescriptorResolver javaDescriptorResolver; + private DependencyClassByQualifiedNameResolver classResolver; private KotlinClassFinder kotlinClassFinder; private ErrorReporter errorReporter; @@ -80,8 +80,8 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer } @Inject - public void setJavaDescriptorResolver(JavaDescriptorResolver javaDescriptorResolver) { - this.javaDescriptorResolver = javaDescriptorResolver; + public void setClassResolver(DependencyClassByQualifiedNameResolver classResolver) { + this.classResolver = classResolver; } @Inject @@ -214,7 +214,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer @NotNull private ClassDescriptor resolveClass(@NotNull JvmClassName className) { - ClassDescriptor annotationClass = javaDescriptorResolver.resolveClass(className.getFqNameForClassNameWithoutDollars()); + ClassDescriptor annotationClass = classResolver.resolveClass(className.getFqNameForClassNameWithoutDollars()); return annotationClass != null ? annotationClass : ErrorUtils.getErrorClass(); }