From e059f8b6502d83b071b7a5a7bb8a4d07bfe25ac2 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 7 Sep 2012 23:36:09 +0400
Subject: [PATCH] removed imports of java mapped classes  in tools code

---
 .../kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt  | 1 -
 .../kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt   | 5 +----
 .../extensionTraits/src/kotlin2/BindExtensionFunctions.kt   | 6 +++---
 .../sandbox/extensionTraits/src/kotlin2/EagerTraversable.kt | 2 --
 .../sandbox/extensionTraits/src/kotlin2/Traversable.kt      | 2 +-
 .../src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt | 2 --
 .../jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt   | 1 -
 .../kotlin/doc/highlighter2/Html2CompilerPlugin.kt          | 1 -
 .../org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt       | 1 -
 .../org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt  | 1 -
 .../org/jetbrains/kotlin/doc/templates/KDocTemplate.kt      | 1 -
 .../kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt    | 2 --
 .../tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt  | 1 -
 .../kotlin/org/jetbrains/kotlin/js/qunit/SeleniumQUnit.kt   | 1 -
 .../src/test/kotlin/tests/SeleniumTestSuite.kt              | 1 -
 15 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt
index 0ae16761fd3..6f3afc5e18f 100644
--- a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt
+++ b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/Connections.kt
@@ -3,7 +3,6 @@ package kotlin.jdbc
 import java.sql.*
 import kotlin.template.StringTemplate
 import java.math.BigDecimal
-import java.util.Map
 import java.util.Properties
 
 /**
diff --git a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
index 1d76372db80..55689978d74 100644
--- a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
+++ b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
@@ -2,9 +2,6 @@ package kotlin.jdbc
 
 import java.sql.*
 import java.util.ArrayList
-import java.util.Collection
-import java.util.List
-import java.util.Map
 
 /**
  * Executes the specfied block with result set and then closes it
@@ -68,7 +65,7 @@ fun ResultSet.getValues(columnNames : jet.Array<String> = getColumnNames()) : je
  * Return map filled with values from current row in the cursor. Uses column names as keys for result map.
  * @param columnNames you can specify column names to extract otherwise all columns will be extracted
  */
-fun ResultSet.getValuesAsMap(columnNames : jet.Array<String> = getColumnNames()) : java.util.Map<String, Any?> {
+fun ResultSet.getValuesAsMap(columnNames : jet.Array<String> = getColumnNames()) : Map<String, Any?> {
     val result = java.util.HashMap<String, Any?>(columnNames.size)
 
     columnNames.forEach {
diff --git a/libraries/sandbox/extensionTraits/src/kotlin2/BindExtensionFunctions.kt b/libraries/sandbox/extensionTraits/src/kotlin2/BindExtensionFunctions.kt
index 048112ddcdd..148d7e90b7b 100644
--- a/libraries/sandbox/extensionTraits/src/kotlin2/BindExtensionFunctions.kt
+++ b/libraries/sandbox/extensionTraits/src/kotlin2/BindExtensionFunctions.kt
@@ -11,7 +11,7 @@ annotation class extension() {
 /**
  * Defines the extension functions on a List<T>
  */
-extension open class ListExtensions<T>(private val that: java.util.List<T>): CollectionExtensions<T>(that), ListLike<T> {
+extension open class ListExtensions<T>(private val that: List<T>): CollectionExtensions<T>(that), ListLike<T> {
     public override fun get(index: Int): T {
         return that.get(index)!!
     }
@@ -20,7 +20,7 @@ extension open class ListExtensions<T>(private val that: java.util.List<T>): Col
 /**
  * Defines the extension functions on a Collection<T>
  */
-extension open class CollectionExtensions<T>(private val that: java.util.Collection<T>): CollectionLike<T> {
+extension open class CollectionExtensions<T>(private val that: Collection<T>): CollectionLike<T> {
     public override fun iterator(): Iterator<T> {
         // TODO adapt java.util.Iterator<T> to Iterator<T>
         throw UnsupportedOperationException()
@@ -36,7 +36,7 @@ extension open class CollectionExtensions<T>(private val that: java.util.Collect
 /**
  * Defines the extension functions on a Collection<T>
  */
-extension open class IteratorExtensions<T>(private val that: java.util.Iterator<T>): LazyTraversable<T> {
+extension open class IteratorExtensions<T>(private val that: Iterator<T>): LazyTraversable<T> {
     public override fun iterator(): Iterator<T> {
         // TODO adapt java.util.Iterator<T> to Iterator<T>
         throw UnsupportedOperationException()
diff --git a/libraries/sandbox/extensionTraits/src/kotlin2/EagerTraversable.kt b/libraries/sandbox/extensionTraits/src/kotlin2/EagerTraversable.kt
index 67a0fa63c4a..61d9c9f5fc4 100644
--- a/libraries/sandbox/extensionTraits/src/kotlin2/EagerTraversable.kt
+++ b/libraries/sandbox/extensionTraits/src/kotlin2/EagerTraversable.kt
@@ -1,8 +1,6 @@
 package kotlin2
 
 import java.util.ArrayList
-import java.util.Collection
-import java.util.List
 
 public trait EagerTraversable<T>: Traversable<T> {
     /**
diff --git a/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt b/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt
index c8bd12731ad..902e86c03f3 100644
--- a/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt
+++ b/libraries/sandbox/extensionTraits/src/kotlin2/Traversable.kt
@@ -350,7 +350,7 @@ public trait Traversable<T>: Iterable<T> {
     /*
         public fun withIndices(): java.lang.Iterable<#(Int, T)> {
             return object : java.lang.Iterable<#(Int, T)> {
-                public override fun iterator(): java.util.Iterator<#(Int, T)> {
+                public override fun iterator(): Iterator<#(Int, T)> {
                     return NumberedIterator<T>(iterator())
                 }
             }
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt
index 047419897b8..6612f7c57c3 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/collections.kt
@@ -1,8 +1,6 @@
 package org.jetbrains.kotlin.doc
 
 import java.util.HashMap
-import java.util.List
-import java.util.Map
 
 fun <A, K, V> List<A>.toHashMap(f: (A) -> Pair<K, V>): Map<K, V> {
     val r = HashMap<K, V>()
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
index effe0a068f1..0b0161dc3ec 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.kotlin.doc.highlighter
 
 import java.util.HashMap
-import java.util.Map
 import kotlin.template.HtmlFormatter
 import org.jetbrains.jet.internal.com.intellij.psi.*
 import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
index 37934d1b7f1..d8a84451a54 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.kotlin.doc.highlighter2
 
 import java.io.File
-import java.util.List
 import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
 import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
 import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt
index 4991919bdda..1c07c1a4c3f 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.kotlin.doc.highlighter2
 
-import java.util.List
 import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
 
 private fun PsiElement.getTextChildRelativeOffset() =
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt
index c5dc24b1595..3a91e7d4aa9 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.kotlin.doc.model
 
 import java.io.File
-import java.util.List
 import org.jetbrains.jet.cli.common.CompilerPlugin
 import org.jetbrains.jet.cli.common.CompilerPluginContext
 import org.jetbrains.kotlin.doc.KDocArguments
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
index 988db604925..6749ab7fe3b 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.kotlin.doc.templates
 
-import java.util.List
 import org.jetbrains.kotlin.doc.*
 import org.jetbrains.kotlin.doc.model.KAnnotation
 import org.jetbrains.kotlin.doc.model.KClass
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt
index 7d11d480f99..1de41516d7a 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/HtmlTemplate.kt
@@ -1,7 +1,5 @@
 package org.jetbrains.kotlin.template
 
-import java.util.List
-
 abstract class HtmlTemplate() : TextTemplate() {
 
     fun tag(
diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
index 9c744128f1d..b367f9e0301 100644
--- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
+++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt
@@ -1,6 +1,5 @@
 package test.kotlin
 
-import java.util.List
 import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
 import org.jetbrains.jet.config.CompilerConfiguration
diff --git a/libraries/tools/kotlin-js-tests-junit/src/main/kotlin/org/jetbrains/kotlin/js/qunit/SeleniumQUnit.kt b/libraries/tools/kotlin-js-tests-junit/src/main/kotlin/org/jetbrains/kotlin/js/qunit/SeleniumQUnit.kt
index 13cf03dcecc..aa0b4452764 100644
--- a/libraries/tools/kotlin-js-tests-junit/src/main/kotlin/org/jetbrains/kotlin/js/qunit/SeleniumQUnit.kt
+++ b/libraries/tools/kotlin-js-tests-junit/src/main/kotlin/org/jetbrains/kotlin/js/qunit/SeleniumQUnit.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.kotlin.js.qunit
 
-import java.util.List
 import kotlin.test.*
 import org.openqa.selenium.By
 import org.openqa.selenium.WebDriver
diff --git a/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt b/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt
index 8557719bcde..5f0cb0d9cc1 100644
--- a/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt
+++ b/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt
@@ -5,7 +5,6 @@ import org.junit.runners.AllTests
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import org.junit.runners.Parameterized.Parameters
-import java.util.List
 
 /*
 [RunWith(javaClass<Parameterized>())]