No need to insert imports of Kotlin standard classes if java.util.* is imported

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

@@ -41,7 +41,6 @@ class Converter private(private val elementToConvert: PsiElement,
 
     // state which is shared between all converter's based on this one
     private class CommonState(val usageProcessingsCollector: (UsageProcessing) -> Unit) {
-        val importsToAdd = LinkedHashSet<String>()
         val deferredElements = ArrayList<DeferredElement<*>>()
         val postUnfoldActions = ArrayList<() -> Unit>()
     }
@@ -54,10 +53,6 @@ class Converter private(private val elementToConvert: PsiElement,
     public val annotationConverter: AnnotationConverter = AnnotationConverter(this)
 
     public val specialContext: PsiElement? = personalState.specialContext
-    public val importsToAdd: MutableCollection<String> = commonState.importsToAdd
-
-    private val importList = (elementToConvert as? PsiJavaFile)?.getImportList()?.let { convertImportList(it) }
-    public val importNames: Set<String> = importList?.imports?.mapTo(HashSet<String>()) { it.name } ?: setOf()
 
     class object {
         public fun create(elementToConvert: PsiElement, settings: ConverterSettings, conversionScope: ConversionScope,
@@ -127,23 +122,7 @@ class Converter private(private val elementToConvert: PsiElement,
     }
 
     private fun convertFile(javaFile: PsiJavaFile): File {
-        var convertedChildren = javaFile.getChildren().map {
-            if (it is PsiImportList) {
-                assert(it == javaFile.getImportList())
-                importList
-            }
-            else {
-                convertTopElement(it)
-            }
-        }.filterNotNull()
-
-        addPostUnfoldDeferredElementsAction {
-            assert(importList != null)
-            if (importsToAdd.isNotEmpty()) {
-                importList!!.imports = importList.imports + importsToAdd.map { Import(it).assignNoPrototype() }
-            }
-        }
-
+        var convertedChildren = javaFile.getChildren().map { convertTopElement(it) }.filterNotNull()
         return File(convertedChildren, createMainFunction(javaFile)).assignPrototype(javaFile)
     }
 

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

@@ -65,11 +65,7 @@ class TypeVisitor(private val converter: Converter,
             val kotlinClassName = (if (mutability.isMutable(converter.settings)) toKotlinMutableTypesMap[javaClassName] else null)
                                   ?: toKotlinTypesMap[javaClassName]
             if (kotlinClassName != null) {
-                val kotlinShortName = getShortName(kotlinClassName)
-                if (kotlinShortName == getShortName(javaClassName!!) && converter.importNames.contains(getPackageName(javaClassName) + ".*")) {
-                    converter.importsToAdd.add(kotlinClassName)
-                }
-                return ReferenceElement(Identifier(kotlinShortName).assignNoPrototype(), typeArgs).assignNoPrototype()
+                return ReferenceElement(Identifier(getShortName(kotlinClassName)).assignNoPrototype(), typeArgs).assignNoPrototype()
             }
         }
 

j2k/tests/testData/fileOrElement/field/specifyType.kt

@@ -1,5 +1,4 @@
 import java.util.*
-import kotlin.List
 
 class A {
     private val field1 = ArrayList<String>()

j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.kt

@@ -1,5 +1,4 @@
 import java.util.*
-import kotlin.List
 
 class A {
     var list: List<String> = ArrayList()

j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.kt

@@ -1,5 +1,4 @@
 import java.util.*
-import kotlin.Map
 
 class A {
     fun foo(): Map<String, String> {

j2k/tests/testData/fileOrElement/mutableCollections/FunctionParameters.kt

@@ -1,6 +1,5 @@
 // ERROR: Type mismatch: inferred type is T? but T was expected
 import java.util.*
-import kotlin.Collection
 
 class A<T> {
     fun foo(nonMutableCollection: Collection<String>, mutableCollection: MutableCollection<String>, mutableSet: MutableSet<T>, mutableMap: MutableMap<String, T>) {

j2k/tests/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt

@@ -1,5 +1,4 @@
 import java.util.*
-import kotlin.Collection
 
 class A {
     fun createCollection(): MutableCollection<String> {

j2k/tests/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt

@@ -1,5 +1,4 @@
 import java.util.*
-import kotlin.Collection
 
 class A {
     private val collection: MutableCollection<String>

j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt

@@ -1,6 +1,5 @@
 // !specifyFieldTypeByDefault: true
 import java.util.*
-import kotlin.List
 
 class A {
     private val field1: List<String> = ArrayList()

j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt

@@ -1,6 +1,4 @@
 import java.util.*
-import kotlin.Iterator
-import kotlin.List
 
 trait I<T : List<Iterator<String>>>
 

j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt

@@ -3,7 +3,6 @@
 package demo
 
 import java.util.*
-import kotlin.Iterator
 
 class Test : Iterable<String> {
     override fun iterator(): Iterator<String> {

j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.kt

@@ -1,6 +1,5 @@
 // ERROR: Type inference failed. Expected type mismatch: found: java.util.HashMap<kotlin.Any!, kotlin.Any!> required: kotlin.Map<kotlin.String, kotlin.String>
 import java.util.*
-import kotlin.Map
 
 class A {
     class object {

j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.kt

@@ -1,6 +1,5 @@
 import java.util.*
 import javaApi.T
-import kotlin.Set
 
 class A {
     public fun foo(t: T): Any {