From 6508f885529ed83bd4ba7f09af229a86dd334fc6 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 6 Mar 2013 17:48:36 +0400
Subject: [PATCH] Removed redundant code.

---
 .../jet/lang/resolve/java/scope/JavaPackageScope.java |  5 +----
 .../jet/lang/resolve/java/scope/ScopeUtils.java       | 11 ++---------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
index e8c94d11e24..675a0cc1486 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
@@ -21,7 +21,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
 import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
 import org.jetbrains.jet.lang.resolve.java.provider.PackagePsiDeclarationProvider;
@@ -79,9 +78,7 @@ public abstract class JavaPackageScope extends JavaBaseScope {
     @Override
     protected Collection<DeclarationDescriptor> computeAllDescriptors() {
         Collection<DeclarationDescriptor> result = super.computeAllDescriptors();
-        result.addAll(computeAllPackageDeclarations(declarationProvider.getPsiPackage(),
-                                                    semanticServices,
-                                                    DescriptorUtils.getFQName(descriptor).toSafe()));
+        result.addAll(computeAllPackageDeclarations(declarationProvider.getPsiPackage(), semanticServices));
         return result;
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java
index 66b6a6f1b12..31f0fed2e48 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java
@@ -37,11 +37,9 @@ public final class ScopeUtils {
     @NotNull
     public static Collection<DeclarationDescriptor> computeAllPackageDeclarations(
             PsiPackage psiPackage,
-            JavaSemanticServices javaSemanticServices,
-            FqName packageFqName
+            JavaSemanticServices javaSemanticServices
     ) {
         Collection<DeclarationDescriptor> result = Sets.newHashSet();
-        boolean isKotlinNamespace = packageFqName != null && javaSemanticServices.getKotlinNamespaceDescriptor(packageFqName) != null;
         final JavaDescriptorResolver descriptorResolver = javaSemanticServices.getDescriptorResolver();
 
         for (PsiPackage psiSubPackage : psiPackage.getSubPackages()) {
@@ -53,7 +51,7 @@ public final class ScopeUtils {
         }
 
         for (PsiClass psiClass : javaSemanticServices.getPsiClassFinder().findPsiClasses(psiPackage)) {
-            if (isKotlinNamespace && PackageClassUtils.isPackageClass(psiClass)) {
+            if (PackageClassUtils.isPackageClass(psiClass)) {
                 continue;
             }
 
@@ -61,11 +59,6 @@ public final class ScopeUtils {
                 continue;
             }
 
-            // TODO: Temp hack for collection function descriptors from java
-            if (PackageClassUtils.isPackageClass(psiClass)) {
-                continue;
-            }
-
             if (psiClass.hasModifierProperty(PsiModifier.PUBLIC)) {
                 ProgressIndicatorProvider.checkCanceled();
                 ClassDescriptor classDescriptor = descriptorResolver