Rename namespace class to {package.name}Package

Conflicts:

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

compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java

@@ -33,29 +33,29 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/checkLocalVariablesTable"), "kt", true);
     }
     
-    @TestMetadata("namespace$foo$1.kt")
-    public void testNamespace$foo$1() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/namespace$foo$1.kt");
-    }
-    
-    @TestMetadata("namespace$foo$1$1.kt")
-    public void testNamespace$foo$1$1() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/namespace$foo$1$1.kt");
-    }
-    
-    @TestMetadata("namespace$foo$a$1.kt")
-    public void testNamespace$foo$a$1() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/namespace$foo$a$1.kt");
-    }
-    
-    @TestMetadata("namespace$foo1$1.kt")
-    public void testNamespace$foo1$1() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/namespace$foo1$1.kt");
-    }
-    
     @TestMetadata("someClass.kt")
     public void testSomeClass() throws Exception {
         doTest("compiler/testData/checkLocalVariablesTable/someClass.kt");
     }
     
+    @TestMetadata("_DefaultPackage$foo$1.kt")
+    public void test_DefaultPackage$foo$1() throws Exception {
+        doTest("compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo$1.kt");
+    }
+    
+    @TestMetadata("_DefaultPackage$foo$1$1.kt")
+    public void test_DefaultPackage$foo$1$1() throws Exception {
+        doTest("compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo$1$1.kt");
+    }
+    
+    @TestMetadata("_DefaultPackage$foo$a$1.kt")
+    public void test_DefaultPackage$foo$a$1() throws Exception {
+        doTest("compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo$a$1.kt");
+    }
+    
+    @TestMetadata("_DefaultPackage$foo1$1.kt")
+    public void test_DefaultPackage$foo1$1() throws Exception {
+        doTest("compiler/testData/checkLocalVariablesTable/_DefaultPackage$foo1$1.kt");
+    }
+    
 }

compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java

@@ -17,6 +17,8 @@
 package org.jetbrains.jet.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -60,7 +62,7 @@ public class ClassGenTest extends CodegenTestCase {
         //        System.out.println(generateToText());
         final ClassFileFactory state = generateClassesInFile();
         final GeneratedClassLoader loader = createClassLoader(state);
-        final Class aClass = loader.loadClass("namespace");
+        final Class aClass = loader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT));
         assertEquals("OK", aClass.getMethod("box").invoke(null));
 
         final Class test = loader.loadClass("Test");

compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java

@@ -29,6 +29,8 @@ import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.config.CompilerConfiguration;
+import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 
 import java.io.File;
 
@@ -69,7 +71,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
 
         loadFiles("notNullAssertions/noAssertionsForKotlin.kt", "notNullAssertions/noAssertionsForKotlinMain.kt");
 
-        assertNoIntrinsicsMethodIsCalled("namespace");
+        assertNoIntrinsicsMethodIsCalled(PackageClassUtils.getPackageClassName(FqName.ROOT));
     }
 
     public void testNoAssertionsForKotlinFromBinary() throws Exception {
@@ -85,7 +87,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase {
 
         loadFile("notNullAssertions/noAssertionsForKotlinMain.kt");
 
-        assertNoIntrinsicsMethodIsCalled("namespace");
+        assertNoIntrinsicsMethodIsCalled(PackageClassUtils.getPackageClassName(FqName.ROOT));
     }
 
     public void testGenerateParamAssertions() throws Exception {

compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java

@@ -30,7 +30,8 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
-import org.jetbrains.jet.lang.resolve.java.JvmAbi;
+import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.parsing.JetParsingTest;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.utils.ExceptionUtils;
@@ -326,7 +327,7 @@ public class LineNumberTest extends TestCaseWithTmpdir {
         JetFile foo = createPsiFile("staticDelegate/foo.kt");
         JetFile bar = createPsiFile("staticDelegate/bar.kt");
         GenerationState state = GenerationUtils.compileManyFilesGetGenerationStateForTest(foo.getProject(), Arrays.asList(foo, bar));
-        ClassReader reader = new ClassReader(state.getFactory().asBytes(JvmAbi.PACKAGE_CLASS + ".class"));
+        ClassReader reader = new ClassReader(state.getFactory().asBytes(PackageClassUtils.getPackageClassName(FqName.ROOT) + ".class"));
 
         // There must be exactly one line number attribute for each static delegate in namespace.class, and it should point to the first
         // line. There are two static delegates in this test, hence the [1, 1]