Converter:

Remove outdated compatibility import mode

j2k/src/org/jetbrains/jet/j2k/Converter.kt

@@ -87,14 +87,6 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
     }
 
     public fun fileToFile(javaFile: PsiJavaFile): File {
-        return fileToFile(javaFile, Collections.emptyList<String>())
-    }
-
-    public fun fileToFileWithCompatibilityImport(javaFile: PsiJavaFile): File {
-        return fileToFile(javaFile, Collections.singletonList("kotlin.compatibility.*"))
-    }
-
-    private fun fileToFile(javaFile: PsiJavaFile, additionalImports: List<String>): File {
         val importList: PsiImportList? = javaFile.getImportList()
         val imports: MutableList<Import> = (if (importList == null)
             arrayListOf()
@@ -109,8 +101,6 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
                     kotlinAnalogsForClass.isEmpty()
                 }
             }))
-        for (i : String in additionalImports)
-            imports.add(Import(i))
 
         val body: ArrayList<Node> = arrayListOf()
         for (element in javaFile.getChildren()) {

j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt

@@ -102,17 +102,6 @@ object JavaToKotlinTranslator {
         }
         return ""
     }
-
-    fun generateKotlinCodeWithCompatibilityImport(javaCode: String): String {
-        val file = createFile(javaCode)
-        if (file is PsiJavaFile) {
-            val converter = Converter(file.getProject(), TestSettings)
-            setClassIdentifiers(converter, file)
-            return prettify(converter.fileToFileWithCompatibilityImport(file).toKotlin())
-        }
-
-        return ""
-    }
 }
 
 public fun main(args: Array<String>) {

j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt

@@ -61,7 +61,6 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
             "method" -> methodToKotlin(converter, javaCode)
             "class" -> fileToKotlin(converter, javaCode)
             "file" -> fileToKotlin(converter, javaCode)
-            "comp" -> fileToFileWithCompatibilityImport(javaCode)
             else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression "+
                                                 "using the first line of test data file")
         }
@@ -101,10 +100,6 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
         return prettify(result)
     }
 
-    private fun fileToFileWithCompatibilityImport(text: String): String {
-        return JavaToKotlinTranslator.generateKotlinCodeWithCompatibilityImport(text)
-    }
-
     private fun generateKotlinCode(converter: Converter, file: PsiFile?): String {
         if (file is PsiJavaFile) {
             JavaToKotlinTranslator.setClassIdentifiers(converter, file)

j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java

@@ -1587,11 +1587,6 @@ public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotli
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.jav$"), true);
         }
         
-        @TestMetadata("intNullability.jav")
-        public void testIntNullability() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/intNullability.jav");
-        }
-        
         @TestMetadata("packageWithClass.jav")
         public void testPackageWithClass() throws Exception {
             doTest("j2k/tests/testData/ast/misc/packageWithClass.jav");

j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java

@@ -1587,11 +1587,6 @@ public class JavaToKotlinConverterPluginTestGenerated extends AbstractJavaToKotl
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.jav$"), true);
         }
         
-        @TestMetadata("intNullability.jav")
-        public void testIntNullability() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/intNullability.jav");
-        }
-        
         @TestMetadata("packageWithClass.jav")
         public void testPackageWithClass() throws Exception {
             doTest("j2k/tests/testData/ast/misc/packageWithClass.jav");

j2k/tests/testData/ast/misc/intNullability.ide.kt

@@ -1,9 +0,0 @@
-package demo
-import kotlin.compatibility.*
-open class Test() {
-open fun test() {
-var i : Int? = 10
-var j : Int? = 10
-System.out?.println(i!! + j!!)
-}
-}

j2k/tests/testData/ast/misc/intNullability.jav

@@ -1,10 +0,0 @@
-//comp
-package demo;
-
-class Test {
-  void test() {
-    Integer i = 10;
-    Integer j = 10;
-    System.out.println(i + j);
-  }
-}

j2k/tests/testData/ast/misc/intNullability.kt

@@ -1,9 +0,0 @@
-package demo
-import kotlin.compatibility.*
-open class Test() {
-open fun test() {
-var i : Int? = 10
-var j : Int? = 10
-System.out?.println(i!! + j!!)
-}
-}