azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Renamed annotationDeserializer → deserializers.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-03-31 22:38:09 +04:00
parent dadc8351b6
commit 04a6b10f7a
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+5 -5
View File
@@ -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;