From d6d83e9bc2ae654c32b7d72d91541206782c75ab Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 1 Jul 2013 21:41:48 +0400 Subject: [PATCH] Change signature of AbstractDescriptorFinder#getPackage method --- .../descriptors/serialization/AbstractDescriptorFinder.java | 3 ++- .../jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java | 3 +-- .../serialization/BuiltinsDeserializationTest.java | 5 +++-- .../descriptors/serialization/WriteSerializedInfoTest.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java index be2cb6625fe..666692db77a 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java @@ -23,6 +23,7 @@ import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeseria import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.lazy.storage.MemoizedFunctionToNullable; import org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -74,7 +75,7 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder { protected abstract ClassData getClassData(@NotNull ClassId classId); @NotNull - protected abstract DeclarationDescriptor getPackage(@NotNull FqName fqName); + protected abstract NamespaceDescriptor getPackage(@NotNull FqName fqName); protected abstract void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java index 7ac7fb9d294..f8274b4846f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java @@ -7,7 +7,6 @@ import org.jetbrains.jet.descriptors.serialization.*; import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; @@ -69,7 +68,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { @NotNull @Override - protected DeclarationDescriptor getPackage(@NotNull FqName fqName) { + protected NamespaceDescriptor getPackage(@NotNull FqName fqName) { assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Wrong package: " + fqName; return BuiltinsNamespaceDescriptorImpl.this; } diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java index 326c95020ae..17c75755340 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java @@ -80,11 +80,12 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment { final NameResolver nameResolver = NameSerializationUtil.createNameResolver(serializer.getNameTable()); - DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED) { + DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(new LockBasedStorageManager(), + AnnotationDeserializer.UNSUPPORTED) { @NotNull @Override - protected DeclarationDescriptor getPackage(@NotNull FqName fqName) { + protected NamespaceDescriptor getPackage(@NotNull FqName fqName) { assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Unsupported package: " + fqName; return actualNamespace; } diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java index 7e2f4d622ef..619025c97c5 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.codegen.CodegenTestCase; import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -82,7 +82,7 @@ public class WriteSerializedInfoTest extends CodegenTestCase { @NotNull @Override - protected DeclarationDescriptor getPackage(@NotNull FqName fqName) { + protected NamespaceDescriptor getPackage(@NotNull FqName fqName) { assert fqName.equals(NAMESPACE_NAME) : "Unsupported namespace: " + fqName; return namespace; }