From 04a6b10f7a7fcb6daee5963ff4cdec3010b20f8c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 31 Mar 2014 22:38:09 +0400 Subject: [PATCH] =?UTF-8?q?Minor.=20Renamed=20annotationDeserializer=20?= =?UTF-8?q?=E2=86=92=20deserializers.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jet/di/InjectorForJavaDescriptorResolver.java | 2 +- .../jet/di/InjectorForLazyResolveWithJava.java | 2 +- .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 2 +- .../serialization/DescriptorDeserializer.java | 8 ++++---- .../resolve/kotlin/DeserializedDescriptorResolver.java | 10 +++++----- 5 files changed, 12 insertions(+), 12 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 18c2259a602..a0a2a0e6ec3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -104,7 +104,7 @@ public class InjectorForJavaDescriptorResolver { psiBasedMethodSignatureChecker.setExternalAnnotationResolver(psiBasedExternalAnnotationResolver); psiBasedMethodSignatureChecker.setExternalSignatureResolver(traceBasedExternalSignatureResolver); - deserializedDescriptorResolver.setAnnotationDeserializer(descriptorDeserializers); + deserializedDescriptorResolver.setDeserializers(descriptorDeserializers); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); 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 38e1cd006ef..91071988025 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java @@ -224,7 +224,7 @@ public class InjectorForLazyResolveWithJava { jetImportsFactory.setProject(project); - deserializedDescriptorResolver.setAnnotationDeserializer(descriptorDeserializers); + deserializedDescriptorResolver.setDeserializers(descriptorDeserializers); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); 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 fdb9cd76176..87c081809e7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -304,7 +304,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly typeHierarchyResolver.setScriptHeaderResolver(scriptHeaderResolver); typeHierarchyResolver.setTrace(bindingTrace); - deserializedDescriptorResolver.setAnnotationDeserializer(descriptorDeserializers); + deserializedDescriptorResolver.setDeserializers(descriptorDeserializers); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java index 708b718d48a..c31892c63c9 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java @@ -46,12 +46,12 @@ public class DescriptorDeserializer { @NotNull DeclarationDescriptor containingDeclaration, @NotNull NameResolver nameResolver, @NotNull DescriptorFinder descriptorFinder, - @NotNull Deserializers annotationDeserializer + @NotNull Deserializers deserializers ) { return new DescriptorDeserializer(storageManager, new TypeDeserializer(storageManager, null, nameResolver, descriptorFinder, "Deserializer for " + containingDeclaration.getName(), NONE), - containingDeclaration, nameResolver, annotationDeserializer); + containingDeclaration, nameResolver, deserializers); } @NotNull @@ -60,9 +60,9 @@ public class DescriptorDeserializer { @NotNull TypeDeserializer typeDeserializer, @NotNull DeclarationDescriptor containingDeclaration, @NotNull NameResolver nameResolver, - @NotNull Deserializers annotationDeserializer + @NotNull Deserializers deserializers ) { - return new DescriptorDeserializer(storageManager, typeDeserializer, containingDeclaration, nameResolver, annotationDeserializer); + return new DescriptorDeserializer(storageManager, typeDeserializer, containingDeclaration, nameResolver, deserializers); } private final DeclarationDescriptor containingDeclaration; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java index 51c1b05e3b9..22a47b0f70b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java @@ -44,7 +44,7 @@ import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kin import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kind.PACKAGE_FACADE; public final class DeserializedDescriptorResolver { - private DescriptorDeserializers annotationDeserializer; + private DescriptorDeserializers deserializers; private MemberFilter memberFilter; @@ -72,8 +72,8 @@ public final class DeserializedDescriptorResolver { }; @Inject - public void setAnnotationDeserializer(DescriptorDeserializers annotationDeserializer) { - this.annotationDeserializer = annotationDeserializer; + public void setDeserializers(DescriptorDeserializers deserializers) { + this.deserializers = deserializers; } @Inject @@ -106,7 +106,7 @@ public final class DeserializedDescriptorResolver { String[] data = readData(kotlinClass, CLASS); if (data != null) { ClassData classData = JavaProtoBufUtil.readClassDataFrom(data); - return new DeserializedClassDescriptor(storageManager, annotationDeserializer, javaDescriptorFinder, + return new DeserializedClassDescriptor(storageManager, deserializers, javaDescriptorFinder, javaPackageFragmentProvider, classData.getNameResolver(), classData.getClassProto()); } return null; @@ -116,7 +116,7 @@ public final class DeserializedDescriptorResolver { public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) { String[] data = readData(kotlinClass, PACKAGE_FACADE); if (data != null) { - return new DeserializedPackageMemberScope(storageManager, descriptor, annotationDeserializer, + return new DeserializedPackageMemberScope(storageManager, descriptor, deserializers, memberFilter, javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data)); } return null;