Remove PackageFragmentDescriptor#getProvider method

PackageFragmentProvider should be hidden from the client of PackageFramentDescriptor

compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.java

@@ -22,7 +22,7 @@ public class MutablePackageFragmentProvider implements PackageFragmentProvider {
 
     public MutablePackageFragmentProvider(@NotNull ModuleDescriptor module) {
         this.module = module;
-        fqNameToPackage.put(FqName.ROOT, new MutablePackageFragmentDescriptor(this, module, FqName.ROOT));
+        fqNameToPackage.put(FqName.ROOT, new MutablePackageFragmentDescriptor(module, FqName.ROOT));
     }
 
     @NotNull
@@ -43,7 +43,7 @@ public class MutablePackageFragmentProvider implements PackageFragmentProvider {
             FqName parent = fqName.parent();
             getOrCreateFragment(parent); // assure that parent exists
 
-            fqNameToPackage.put(fqName, new MutablePackageFragmentDescriptor(this, module, fqName));
+            fqNameToPackage.put(fqName, new MutablePackageFragmentDescriptor(module, fqName));
             subPackages.putValue(parent, fqName);
         }
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java

@@ -57,12 +57,6 @@ public class LazyPackageDescriptor extends DeclarationDescriptorImpl implements
         return memberScope;
     }
 
-    @NotNull
-    @Override
-    public PackageFragmentProvider getProvider() {
-        return resolveSession.getPackageFragmentProvider();
-    }
-
     @NotNull
     @Override
     public ModuleDescriptor getContainingDeclaration() {

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPackageFragmentDescriptor.kt

@@ -18,9 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.descriptor
 
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
 
-public trait JavaPackageFragmentDescriptor : PackageFragmentDescriptor {
-    override fun getProvider(): JavaPackageFragmentProvider
-}
+public trait JavaPackageFragmentDescriptor : PackageFragmentDescriptor
 
 public trait JavaClassStaticsPackageFragmentDescriptor : JavaPackageFragmentDescriptor {
     public fun getCorrespondingClass(): JavaClassDescriptor

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt

@@ -54,7 +54,6 @@ abstract class LazyJavaPackageFragment(
     override fun getMemberScope(): LazyJavaPackageFragmentScope = _memberScope
 
     override fun getFqName() = _fqName
-    override fun getProvider() = c.packageFragmentProvider
 
     override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D) = visitor.visitPackageFragmentDescriptor(this, data) as R
 

core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.java

@@ -21,8 +21,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 
 public interface PackageFragmentDescriptor extends ClassOrPackageFragmentDescriptor {
-    @NotNull
-    PackageFragmentProvider getProvider();
 
     @NotNull
     @Override

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutablePackageFragmentDescriptor.java

@@ -18,7 +18,10 @@ package org.jetbrains.jet.lang.descriptors.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
+import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -29,19 +32,13 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor;
 
 public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl implements PackageFragmentDescriptor {
 
-    private final PackageFragmentProvider provider;
     private final ModuleDescriptor module;
     private final FqName fqName;
     private final WritableScope scope;
     private final PackageLikeBuilder builder;
 
-    public MutablePackageFragmentDescriptor(
-            @NotNull PackageFragmentProvider provider,
-            @NotNull ModuleDescriptor module,
-            @NotNull FqName fqName
-    ) {
+    public MutablePackageFragmentDescriptor(@NotNull ModuleDescriptor module, @NotNull FqName fqName) {
         super(Annotations.EMPTY, fqName.shortNameOrSpecial());
-        this.provider = provider;
         this.module = module;
         this.fqName = fqName;
 
@@ -50,12 +47,6 @@ public class MutablePackageFragmentDescriptor extends DeclarationDescriptorImpl
         builder = new ScopeBasedPackageLikeBuilder(this, scope);
     }
 
-    @NotNull
-    @Override
-    public PackageFragmentProvider getProvider() {
-        return provider;
-    }
-
     @NotNull
     @Override
     public ModuleDescriptor getContainingDeclaration() {

core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java

@@ -62,7 +62,6 @@ class BuiltinsPackageFragment extends DeclarationDescriptorImpl implements Packa
     }
 
     @NotNull
-    @Override
     public PackageFragmentProvider getProvider() {
         return packageFragmentProvider;
     }
@@ -105,7 +104,7 @@ class BuiltinsPackageFragment extends DeclarationDescriptorImpl implements Packa
     }
 
     private class BuiltinsPackageFragmentProvider implements PackageFragmentProvider {
-        private final PackageFragmentDescriptor rootPackage = new MutablePackageFragmentDescriptor(this, module, FqName.ROOT);
+        private final PackageFragmentDescriptor rootPackage = new MutablePackageFragmentDescriptor(module, FqName.ROOT);
 
         @NotNull
         @Override