Refactor JDR: remove some of the usages of JavaDescriptorResolver class

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

@@ -35,8 +35,6 @@ public class LazyJavaPackageFragmentProvider(
 
     override fun getModule() = _module
 
-    override fun getJavaDescriptorResolver() = c.javaDescriptorResolver
-
     private val _packageFragments: MemoizedFunctionToNullable<FqName, LazyJavaPackageFragment> = c.storageManager.createMemoizedFunctionWithNullableValues {
         fqName ->
         val jPackage = c.finder.findPackage(fqName)

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

@@ -75,7 +75,7 @@ public abstract class LazyJavaMemberScope(
                       }.toList())
 
         if (_containingDeclaration is JavaPackageFragmentDescriptor) {
-            val klass = c.javaDescriptorResolver.resolveClass(_containingDeclaration.getFqName().child(name))
+            val klass = c.javaClassResolver.resolveClassByFqName(_containingDeclaration.getFqName().child(name))
             if (klass is LazyJavaClassDescriptor && klass.getFunctionTypeForSamInterface() != null) {
                 functions.add(SingleAbstractMethodUtils.createSamConstructorFunction(_containingDeclaration, klass))
             }

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProvider.java

@@ -29,9 +29,6 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 import java.util.Collection;
 
 public interface JavaPackageFragmentProvider extends PackageFragmentProvider {
-    @NotNull
-    JavaDescriptorResolver getJavaDescriptorResolver();
-
     @Nullable
     JavaPackageFragmentDescriptor getPackageFragment(@NotNull FqName fqName);