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 c7c1bc8842c..e06d9c5abbe 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 @@ -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