From eb155bb20434cad1bb5e88207a4e5b80bd609b33 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Thu, 8 Nov 2012 19:16:38 +0400
Subject: [PATCH] Refactor: remove useless check in
 PsiDeclarationProviderFactory

---
 .../provider/PsiDeclarationProviderFactory.java     | 13 ++-----------
 .../java/resolver/JavaNamespaceResolver.java        |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
index 9418f78f100..08a1170c026 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java
@@ -19,10 +19,6 @@ package org.jetbrains.jet.lang.resolve.java.provider;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.resolve.java.JvmAbi;
-import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.Name;
 
 public final class PsiDeclarationProviderFactory {
     private PsiDeclarationProviderFactory() {
@@ -41,14 +37,9 @@ public final class PsiDeclarationProviderFactory {
     @NotNull
     public static KotlinNamespacePsiDeclarationProvider createDeclarationForKotlinNamespace(
             @NotNull PsiPackage psiPackage,
-            @NotNull PsiClass psiClass,
-            @Nullable FqName fqName
+            @NotNull PsiClass psiClass
     ) {
-        KotlinNamespacePsiDeclarationProvider result = new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass);
-        if (fqName != null && fqName.lastSegmentIs(Name.identifier(JvmAbi.PACKAGE_CLASS))) {
-            throw new IllegalStateException("Kotlin namespace cannot have last segment " + JvmAbi.PACKAGE_CLASS + ": " + fqName);
-        }
-        return result;
+        return new KotlinNamespacePsiDeclarationProvider(psiPackage, psiClass);
     }
 
     @NotNull
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
index 66f14cd1050..184190a9644 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
@@ -155,7 +155,7 @@ public final class JavaNamespaceResolver {
                                                           fqName, javaSemanticServices);
             }
             return new JavaScopeForKotlinNamespace(namespaceDescriptor,
-                                                   createDeclarationForKotlinNamespace(psiPackage, psiClass, fqName),
+                                                   createDeclarationForKotlinNamespace(psiPackage, psiClass),
                                                    fqName, javaSemanticServices);
         }