From f8c8e59f94b7bf1322ab899db4772774ed7b3f13 Mon Sep 17 00:00:00 2001
From: Pavel Talanov <talanov.pavel@gmail.com>
Date: Sat, 30 Nov 2013 21:05:52 +0400
Subject: [PATCH] Refactor converter: Remove unneeded filtering

---
 j2k/src/org/jetbrains/jet/j2k/Converter.kt | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
index 2befd5b166f..9d4a63df253 100644
--- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
@@ -30,9 +30,6 @@ import java.util.*
 import com.intellij.psi.CommonClassNames.*
 import org.jetbrains.jet.lang.types.expressions.OperatorConventions.*
 import com.intellij.psi.util.PsiUtil
-import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.util.QualifiedNamesUtil
-import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap
 import com.intellij.openapi.project.Project
 
 public class Converter(val project: Project, val settings: ConverterSettings) {
@@ -77,11 +74,9 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
     public fun fileToFile(javaFile: PsiJavaFile): File {
         val body = ArrayList<Node>()
         for (element in javaFile.getChildren()) {
-            if (element !is PsiImportStatementBase) {
-                val node = topElementToElement(element)
-                if (node != null) {
-                    body.add(node)
-                }
+            val node = topElementToElement(element)
+            if (node != null) {
+                body.add(node)
             }
         }
         return File(quoteKeywords(javaFile.getPackageName()), body, createMainFunction(javaFile))
@@ -148,7 +143,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
             for (m in members) {
                 if (m is Constructor) {
                     if (!m.isPrimary) {
-                        for (fo in finalOrWithEmptyInitializer){
+                        for (fo in finalOrWithEmptyInitializer) {
                             val init = getDefaultInitializer(fo)
                             initializers.put(fo.identifier.toKotlin(), init)
                         }
@@ -266,7 +261,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
 
         if (method.isConstructor()) {
             return Constructor(this, identifier, docComments, modifiers, returnType, typeParameters, params,
-                               Block(removeEmpty(body.statements), false), isConstructorPrimary(method))
+                               Block(body.statements), isConstructorPrimary(method))
         }
 
         return Function(this, identifier, docComments, modifiers, returnType, typeParameters, params, body)
@@ -287,7 +282,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
         if (block == null)
             return Block.EMPTY_BLOCK
 
-        return Block(removeEmpty(statementsToStatementList(block.getChildren())), notEmpty)
+        return Block(statementsToStatementList(block.getChildren()), notEmpty)
     }
 
     public fun blockToBlock(block: PsiCodeBlock?): Block {