From 2e3005e43190558fc4b5f77d5b72310c060bff82 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 15 Jul 2013 23:00:29 +0400
Subject: [PATCH] Minor, deserialized package scope is now not abstract

---
 .../DeserializedPackageMemberScope.java         | 17 ++++++++---------
 .../lang/BuiltinsNamespaceDescriptorImpl.java   | 11 +----------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
index 1afbd333ce2..090ea0ac719 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
@@ -15,8 +15,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public abstract class DeserializedPackageMemberScope extends DeserializedMemberScope {
-
+public class DeserializedPackageMemberScope extends DeserializedMemberScope {
     @NotNull
     public static DeserializedPackageMemberScope createScopeFromPackageData(
             @NotNull NamespaceDescriptor packageDescriptor,
@@ -28,13 +27,7 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
         DescriptorDeserializer descriptorDeserializer = DescriptorDeserializer
                 .create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializer);
         List<ProtoBuf.Callable> memberList = packageData.getPackageProto().getMemberList();
-        return new DeserializedPackageMemberScope(storageManager, packageDescriptor, descriptorDeserializer, memberList, descriptorFinder) {
-            @Nullable
-            @Override
-            protected ReceiverParameterDescriptor getImplicitReceiver() {
-                return ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER;
-            }
-        };
+        return new DeserializedPackageMemberScope(storageManager, packageDescriptor, descriptorDeserializer, memberList, descriptorFinder);
     }
 
     private final DescriptorFinder descriptorFinder;
@@ -107,4 +100,10 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
     public NamespaceDescriptor getNamespace(@NotNull Name name) {
         return descriptorFinder.findPackage(packageFqName.child(name));
     }
+
+    @Nullable
+    @Override
+    protected ReceiverParameterDescriptor getImplicitReceiver() {
+        return null;
+    }
 }
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 d41992e8766..7ff2257d9b4 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
@@ -115,20 +115,11 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
                     this,
                     DescriptorDeserializer.create(storageManager, this, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED),
                     loadCallables(), descriptorFinder
-            ) {
-                @Nullable
-                @Override
-                protected ReceiverParameterDescriptor getImplicitReceiver() {
-                    return null;
-                }
-            };
-
+            );
         }
         catch (IOException e) {
             throw new IllegalStateException(e);
         }
-
-
     }
 
     private List<ProtoBuf.Callable> loadCallables() throws IOException {