Rename namespace class to {package.name}Package

Conflicts:

	compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java

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

@@ -46,7 +46,7 @@ public final class DescriptorResolverUtils {
     }
 
     public static boolean isKotlinClass(@NotNull PsiClass psiClass) {
-        return new PsiClassWrapper(psiClass).getJetClass().isDefined() || psiClass.getName().equals(JvmAbi.PACKAGE_CLASS);
+        return new PsiClassWrapper(psiClass).getJetClass().isDefined() || PackageClassUtils.isPackageClass(psiClass);
     }
 
     public static boolean isInnerEnum(@NotNull PsiClass innerClass, @Nullable DeclarationDescriptor owner) {

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

@@ -23,7 +23,6 @@ public class JvmAbi {
     public static final String DEFAULT_PARAMS_IMPL_SUFFIX = "$default";
     public static final String GETTER_PREFIX = "get";
     public static final String SETTER_PREFIX = "set";
-    public static final String PACKAGE_CLASS = "namespace";
 
     public static final String CLASS_OBJECT_CLASS_NAME = "object";
     public static final String CLASS_OBJECT_SUFFIX = "$" + CLASS_OBJECT_CLASS_NAME;

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2013 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;
+
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.PsiClass;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.jet.lang.resolve.name.Name;
+
+public class PackageClassUtils {
+
+    private static final String DEFAULT_PACKAGE = "_DefaultPackage";
+
+    // ex. <root> -> _DefaultPackage, a -> APackage, a.b -> BPackage
+    public static String getPackageClassName(@NotNull FqName packageFQN) {
+        if (packageFQN.isRoot()) {
+            return DEFAULT_PACKAGE;
+        }
+        return StringUtil.capitalize(packageFQN.shortName().getName()) + "Package";
+    }
+
+    public static FqName getPackageClassFqName(@NotNull FqName packageFQN) {
+        return packageFQN.child(Name.identifier(getPackageClassName(packageFQN)));
+    }
+
+    public static boolean isPackageClass(@NotNull FqName fqName) {
+        if (fqName.isRoot()) {
+            return true;
+        }
+        return getPackageClassName(fqName.parent()).equals(fqName.shortName().getName());
+    }
+
+    public static boolean isPackageClass(@NotNull PsiClass psiClass) {
+        String qualifiedName = psiClass.getQualifiedName();
+        if (qualifiedName == null) {
+            return false;
+        }
+        if (DEFAULT_PACKAGE.equals(qualifiedName)) {
+            return true;
+        }
+        return getPackageClassName(new FqName(qualifiedName).parent()).equals(psiClass.getName());
+    }
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java

@@ -203,7 +203,6 @@ public final class JavaNamespaceResolver {
 
     @Nullable
     private PsiClass getPsiClassForJavaPackageScope(@NotNull FqName packageFQN) {
-        return psiClassFinder.findPsiClass(packageFQN.child(Name.identifier(JvmAbi.PACKAGE_CLASS)),
-                                           PsiClassFinder.RuntimeClassesHandleMode.IGNORE);
+        return psiClassFinder.findPsiClass(PackageClassUtils.getPackageClassFqName(packageFQN), PsiClassFinder.RuntimeClassesHandleMode.IGNORE);
     }
 }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java

@@ -53,7 +53,7 @@ public final class ScopeUtils {
         }
 
         for (PsiClass psiClass : javaSemanticServices.getPsiClassFinder().findPsiClasses(psiPackage)) {
-            if (isKotlinNamespace && JvmAbi.PACKAGE_CLASS.equals(psiClass.getName())) {
+            if (isKotlinNamespace && PackageClassUtils.isPackageClass(psiClass)) {
                 continue;
             }
 
@@ -62,7 +62,7 @@ public final class ScopeUtils {
             }
 
             // TODO: Temp hack for collection function descriptors from java
-            if (JvmAbi.PACKAGE_CLASS.equals(psiClass.getName())) {
+            if (PackageClassUtils.isPackageClass(psiClass)) {
                 continue;
             }