Dependency on ClassResolver moved to TypeDeserializer

This commit is contained in:
Andrey Breslav
2013-05-31 15:31:14 +04:00
committed by Alexander Udalov
parent 0c49940356
commit 7fb5316a3a
@@ -50,15 +50,6 @@ public class DescriptorDeserializer {
return new DescriptorDeserializer(typeDeserializer, containingDeclaration, nameResolver);
}
@NotNull
public static DescriptorDeserializer createChild(
@NotNull DescriptorDeserializer parent,
@NotNull DeclarationDescriptor containingDeclaration,
@NotNull NameResolver nameResolver
) {
return create(parent.typeDeserializer, containingDeclaration, nameResolver);
}
private final DeclarationDescriptor containingDeclaration;
private final NameResolver nameResolver;
private final TypeDeserializer typeDeserializer;
@@ -73,24 +64,14 @@ public class DescriptorDeserializer {
this.nameResolver = nameResolver;
}
@NotNull
public DeclarationDescriptor getContainingDeclaration() {
return containingDeclaration;
}
@NotNull
public NameResolver getNameResolver() {
return nameResolver;
}
@NotNull
public TypeDeserializer getTypeDeserializer() {
return typeDeserializer;
}
@NotNull
private DescriptorDeserializer createChildDeserializer(@NotNull DeclarationDescriptor descriptor) {
return createChild(this, descriptor, nameResolver);
return create(new TypeDeserializer(typeDeserializer), descriptor, nameResolver);
}
@NotNull