Drop LazyJavaDescriptor, JavaPackageFragmentDescriptor

compiler/backend/src/org/jetbrains/jet/codegen/JvmCodegenUtil.java

@@ -35,12 +35,10 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.codeFragmentUtil.CodeFragmentUtilPackage;
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
-import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor;
+import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaPackageFragment;
-import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyPackageFragmentScopeForJavaPackage;
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass;
 import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass;
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider;
-import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 
@@ -128,7 +126,8 @@ public class JvmCodegenUtil {
             @NotNull DeserializedCallableMemberDescriptor descriptor,
             @Nullable File outDirectory
     ) {
-        if (descriptor.getContainingDeclaration() instanceof IncrementalPackageFragmentProvider.IncrementalPackageFragment) {
+        DeclarationDescriptor packageFragment = descriptor.getContainingDeclaration();
+        if (packageFragment instanceof IncrementalPackageFragmentProvider.IncrementalPackageFragment) {
             return true;
         }
 
@@ -136,16 +135,11 @@ public class JvmCodegenUtil {
             return false;
         }
 
-        if (!(descriptor.getContainingDeclaration() instanceof JavaPackageFragmentDescriptor)) {
+        if (!(packageFragment instanceof LazyJavaPackageFragment)) {
             return false;
         }
-        JavaPackageFragmentDescriptor packageFragment = (JavaPackageFragmentDescriptor) descriptor.getContainingDeclaration();
-        JetScope packageScope = packageFragment.getMemberScope();
-        if (!(packageScope instanceof LazyPackageFragmentScopeForJavaPackage)) {
-            return false;
-        }
-        KotlinJvmBinaryClass binaryClass = ((LazyPackageFragmentScopeForJavaPackage) packageScope).getKotlinBinaryClass();
 
+        KotlinJvmBinaryClass binaryClass = ((LazyJavaPackageFragment) packageFragment).getMemberScope().getKotlinBinaryClass();
         if (binaryClass instanceof VirtualFileKotlinClass) {
             VirtualFile file = ((VirtualFileKotlinClass) binaryClass).getFile();
             if (file.getFileSystem().getProtocol() == StandardFileSystems.FILE_PROTOCOL) {
@@ -153,6 +147,7 @@ public class JvmCodegenUtil {
                 return ioFile.getAbsolutePath().startsWith(outDirectory.getAbsolutePath() + File.separator);
             }
         }
+
         return false;
     }
 

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

@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.resolve.java.descriptor
-
-import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
-
-public trait JavaPackageFragmentDescriptor : PackageFragmentDescriptor

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

@@ -52,7 +52,7 @@ public class LazyJavaPackageFragmentProvider(
                 fqName ->
                 val jPackage = c.finder.findPackage(fqName)
                 if (jPackage != null) {
-                    LazyJavaPackageFragment(c, module, jPackage)
+                    LazyJavaPackageFragment(c, jPackage)
                 }
                 else null
             }

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

@@ -46,7 +46,7 @@ class LazyJavaClassDescriptor(
         internal val fqName: FqName,
         private val jClass: JavaClass
 ) : ClassDescriptorBase(outerC.storageManager, containingDeclaration, fqName.shortName(),
-                        outerC.sourceElementFactory.source(jClass)), LazyJavaDescriptor, JavaClassDescriptor {
+                        outerC.sourceElementFactory.source(jClass)), JavaClassDescriptor {
 
     private val c: LazyJavaResolverContextWithTypes = outerC.child(this, jClass.getTypeParameters().toSet());
 

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

@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.resolve.java.lazy.descriptors
-
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
-
-public trait LazyJavaDescriptor : DeclarationDescriptor

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

@@ -18,18 +18,13 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors
 
 import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext
 import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage
-import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl
 import kotlin.properties.Delegates
 
 class LazyJavaPackageFragment(
         private val c: LazyJavaResolverContext,
-        module: ModuleDescriptor,
         private val jPackage: JavaPackage
-) : PackageFragmentDescriptorImpl(module, jPackage.getFqName()),
+) : PackageFragmentDescriptorImpl(c.packageFragmentProvider.module, jPackage.getFqName()) {
-    JavaPackageFragmentDescriptor, LazyJavaDescriptor
-{
     private val _memberScope by Delegates.lazy { LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) }
 
     override fun getMemberScope() = _memberScope