Moved import conversion out of "ast" package

j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt

@@ -16,16 +16,8 @@
 
 package org.jetbrains.kotlin.j2k.ast
 
-import com.intellij.psi.PsiImportList
+import org.jetbrains.kotlin.j2k.CodeBuilder
-import com.intellij.psi.PsiImportStatementBase
+import org.jetbrains.kotlin.j2k.append
-import com.intellij.psi.PsiJavaCodeReferenceElement
-import org.jetbrains.kotlin.asJava.KtLightClass
-import org.jetbrains.kotlin.asJava.KtLightClassForFacade
-import org.jetbrains.kotlin.builtins.DefaultBuiltIns
-import org.jetbrains.kotlin.j2k.*
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
 class Import(val name: String) : Element() {
     override fun generateCode(builder: CodeBuilder) {
@@ -41,53 +33,3 @@ class ImportList(var imports: List<Import>) : Element() {
         builder.append(imports, "\n")
     }
 }
-
-fun Converter.convertImportList(importList: PsiImportList): ImportList =
-        ImportList(importList.allImportStatements.mapNotNull { convertImport(it, true) }).assignPrototype(importList)
-
-fun Converter.convertImport(anImport: PsiImportStatementBase, filter: Boolean): Import? {
-    fun doConvert(): Import? {
-        val reference = anImport.importReference ?: return null
-        val qualifiedName = quoteKeywords(reference.qualifiedName!!)
-        if (anImport.isOnDemand) {
-            return Import(qualifiedName + ".*")
-        }
-        else {
-            return if (filter) {
-                val filteredName = filterImport(qualifiedName, reference)
-                if (filteredName != null) Import(filteredName) else null
-            }
-            else {
-                Import(qualifiedName)
-            }
-        }
-    }
-
-    return doConvert()?.assignPrototype(anImport)
-}
-
-private fun Converter.filterImport(name: String, ref: PsiJavaCodeReferenceElement): String? {
-    if (annotationConverter.isImportNotRequired(name)) return null
-
-    // If imported class has a kotlin analog, drop the import
-    if (!JavaToKotlinClassMap.INSTANCE.mapPlatformClass(FqName(name), DefaultBuiltIns.Instance).isEmpty()) return null
-
-    val target = ref.resolve()
-    if (target is KtLightClassForFacade) {
-        return quoteKeywords(target.getFqName().parent().toString()) + ".*"
-    }
-    else if (target is KtLightClass) {
-        if (isFacadeClassFromLibrary(target)) return null
-
-        if (isImportedByDefault(target)) return null
-    }
-
-    return name
-}
-
-private val DEFAULT_IMPORTS_SET: Set<FqName> = JvmPlatform.defaultModuleParameters.defaultImports
-        .filter { it.isAllUnder }
-        .map { it.fqnPart() }
-        .toSet()
-
-private fun isImportedByDefault(c: KtLightClass) = c.getFqName().parent() in DEFAULT_IMPORTS_SET

j2k/src/org/jetbrains/kotlin/j2k/importConversion.kt

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2010-2016 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.kotlin.j2k
+
+import com.intellij.psi.PsiImportList
+import com.intellij.psi.PsiImportStatementBase
+import com.intellij.psi.PsiJavaCodeReferenceElement
+import org.jetbrains.kotlin.asJava.KtLightClass
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
+import org.jetbrains.kotlin.builtins.DefaultBuiltIns
+import org.jetbrains.kotlin.j2k.ast.Import
+import org.jetbrains.kotlin.j2k.ast.ImportList
+import org.jetbrains.kotlin.j2k.ast.assignPrototype
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
+
+fun Converter.convertImportList(importList: PsiImportList): ImportList =
+        ImportList(importList.allImportStatements.mapNotNull { convertImport(it, true) }).assignPrototype(importList)
+
+fun Converter.convertImport(anImport: PsiImportStatementBase, filter: Boolean): Import? {
+    fun doConvert(): Import? {
+        val reference = anImport.importReference ?: return null
+        val qualifiedName = quoteKeywords(reference.qualifiedName!!)
+        if (anImport.isOnDemand) {
+            return Import(qualifiedName + ".*")
+        }
+        else {
+            return if (filter) {
+                val filteredName = filterImport(qualifiedName, reference)
+                if (filteredName != null) Import(filteredName) else null
+            }
+            else {
+                Import(qualifiedName)
+            }
+        }
+    }
+
+    return doConvert()?.assignPrototype(anImport)
+}
+
+private fun Converter.filterImport(name: String, ref: PsiJavaCodeReferenceElement): String? {
+    if (annotationConverter.isImportNotRequired(name)) return null
+
+    // If imported class has a kotlin analog, drop the import
+    if (!JavaToKotlinClassMap.INSTANCE.mapPlatformClass(FqName(name), DefaultBuiltIns.Instance).isEmpty()) return null
+
+    val target = ref.resolve()
+    if (target is KtLightClassForFacade) {
+        return quoteKeywords(target.getFqName().parent().toString()) + ".*"
+    }
+    else if (target is KtLightClass) {
+        if (isFacadeClassFromLibrary(target)) return null
+
+        if (isImportedByDefault(target)) return null
+    }
+
+    return name
+}
+
+private val DEFAULT_IMPORTS_SET: Set<FqName> = JvmPlatform.defaultModuleParameters.defaultImports
+        .filter { it.isAllUnder }
+        .map { it.fqnPart() }
+        .toSet()
+
+private fun isImportedByDefault(c: KtLightClass) = c.getFqName().parent() in DEFAULT_IMPORTS_SET