From 4cf2dc665e52d816d235f35bd00806f4bf7326f0 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 14 May 2014 21:19:57 +0400
Subject: [PATCH] Got rid of redundant constructor.

---
 .../types/lang/BuiltinsPackageFragment.java   |  2 +-
 .../DeserializedPackageMemberScope.java       | 23 ++++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
index 99851bd0752..f5f9d3c824f 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
@@ -54,7 +54,7 @@ class BuiltinsPackageFragment extends PackageFragmentDescriptorImpl {
 
         // TODO: support annotations
         members = new DeserializedPackageMemberScope(storageManager, this, Deserializers.UNSUPPORTED, MemberFilter.ALWAYS_TRUE,
-                                                     new BuiltInsDescriptorFinder(storageManager), loadPackage(), nameResolver);
+                                                     new BuiltInsDescriptorFinder(storageManager), new PackageData(nameResolver, loadPackage()));
     }
 
     @NotNull
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
index c6644f16294..a5f4afb9c4a 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
@@ -37,22 +37,6 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
 
     private final FqName packageFqName;
 
-    public DeserializedPackageMemberScope(
-            @NotNull StorageManager storageManager,
-            @NotNull PackageFragmentDescriptor packageDescriptor,
-            @NotNull Deserializers deserializers,
-            @NotNull MemberFilter memberFilter,
-            @NotNull DescriptorFinder descriptorFinder,
-            @NotNull ProtoBuf.Package proto,
-            @NotNull NameResolver nameResolver
-    ) {
-        super(storageManager, packageDescriptor,
-              DescriptorDeserializer.create(storageManager, packageDescriptor, nameResolver, descriptorFinder, deserializers),
-              getFilteredMembers(packageDescriptor, proto, memberFilter, nameResolver));
-        this.descriptorFinder = descriptorFinder;
-        this.packageFqName = packageDescriptor.getFqName();
-    }
-
     public DeserializedPackageMemberScope(
             @NotNull StorageManager storageManager,
             @NotNull PackageFragmentDescriptor packageDescriptor,
@@ -61,8 +45,11 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
             @NotNull DescriptorFinder descriptorFinder,
             @NotNull PackageData packageData
     ) {
-        this(storageManager, packageDescriptor, deserializers, memberFilter, descriptorFinder, packageData.getPackageProto(),
-             packageData.getNameResolver());
+        super(storageManager, packageDescriptor,
+              DescriptorDeserializer.create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializers),
+              getFilteredMembers(packageDescriptor, packageData.getPackageProto(), memberFilter, packageData.getNameResolver()));
+        this.descriptorFinder = descriptorFinder;
+        this.packageFqName = packageDescriptor.getFqName();
     }
 
     @Nullable