From 50cd620f92119daff2a9146bc35afc74cac3660e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 16 Nov 2016 21:06:57 +0300
Subject: [PATCH] Remove java.util.* imports from common code.

---
 js/js.libraries/src/core/kotlin.kt                         | 2 --
 js/js.libraries/src/dom/Dom.kt                             | 1 -
 libraries/stdlib/src/kotlin/collections/Arrays.kt          | 2 --
 libraries/stdlib/src/kotlin/collections/Collections.kt     | 7 +++----
 libraries/stdlib/src/kotlin/collections/Iterators.kt       | 4 +---
 libraries/stdlib/src/kotlin/collections/MapWithDefault.kt  | 2 --
 libraries/stdlib/src/kotlin/collections/Maps.kt            | 6 ++----
 .../stdlib/src/kotlin/collections/MutableCollections.kt    | 2 --
 libraries/stdlib/src/kotlin/collections/Sequences.kt       | 4 +---
 libraries/stdlib/src/kotlin/collections/Sets.kt            | 4 +---
 libraries/stdlib/test/OrderingTest.kt                      | 1 -
 libraries/stdlib/test/collections/ArraysTest.kt            | 1 -
 libraries/stdlib/test/collections/CollectionTest.kt        | 1 -
 libraries/stdlib/test/collections/MapTest.kt               | 1 -
 .../stdlib/test/collections/MutableCollectionsTest.kt      | 2 --
 libraries/stdlib/test/collections/SequenceTest.kt          | 1 -
 libraries/stdlib/test/js/JsArrayTest.kt                    | 1 -
 libraries/stdlib/test/js/MapJsTest.kt                      | 1 -
 libraries/stdlib/test/js/SetJsTest.kt                      | 1 -
 libraries/stdlib/test/js/StubsJVM.kt                       | 3 +--
 .../stdlib/test/properties/delegation/MapAccessorsTest.kt  | 2 --
 21 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/js/js.libraries/src/core/kotlin.kt b/js/js.libraries/src/core/kotlin.kt
index db61d056276..bbfe454dfc3 100644
--- a/js/js.libraries/src/core/kotlin.kt
+++ b/js/js.libraries/src/core/kotlin.kt
@@ -16,8 +16,6 @@
 
 package kotlin
 
-import java.util.*
-
 /**
  * Returns an empty array of the specified type [T].
  */
diff --git a/js/js.libraries/src/dom/Dom.kt b/js/js.libraries/src/dom/Dom.kt
index 44e26ccd47a..f8ada9b343b 100644
--- a/js/js.libraries/src/dom/Dom.kt
+++ b/js/js.libraries/src/dom/Dom.kt
@@ -17,7 +17,6 @@
 package kotlin.dom
 
 import org.w3c.dom.*
-import java.util.*
 import kotlin.dom.*
 import kotlin.collections.*
 
diff --git a/libraries/stdlib/src/kotlin/collections/Arrays.kt b/libraries/stdlib/src/kotlin/collections/Arrays.kt
index 5abe69dbce9..b9369defe97 100644
--- a/libraries/stdlib/src/kotlin/collections/Arrays.kt
+++ b/libraries/stdlib/src/kotlin/collections/Arrays.kt
@@ -20,8 +20,6 @@
 
 package kotlin.collections
 
-import java.util.*
-
 
 /** Returns the array if it's not `null`, or an empty array otherwise. */
 public inline fun <reified T> Array<out T>?.orEmpty(): Array<out T> = this ?: arrayOf<T>()
diff --git a/libraries/stdlib/src/kotlin/collections/Collections.kt b/libraries/stdlib/src/kotlin/collections/Collections.kt
index a7517e0e18d..67748803817 100644
--- a/libraries/stdlib/src/kotlin/collections/Collections.kt
+++ b/libraries/stdlib/src/kotlin/collections/Collections.kt
@@ -19,7 +19,6 @@
 
 package kotlin.collections
 
-import java.util.*
 import kotlin.comparisons.compareValues
 
 internal object EmptyIterator : ListIterator<Nothing> {
@@ -89,7 +88,7 @@ public inline fun <T> listOf(): List<T> = emptyList()
  * The returned list is serializable.
  */
 @JvmVersion
-public fun <T> listOf(element: T): List<T> = Collections.singletonList(element)
+public fun <T> listOf(element: T): List<T> = java.util.Collections.singletonList(element)
 
 /** Returns a new [MutableList] with the given elements. */
 public fun <T> mutableListOf(vararg elements: T): MutableList<T>
@@ -137,7 +136,7 @@ public inline fun <T> List<T>?.orEmpty(): List<T> = this ?: emptyList()
  */
 @JvmVersion
 @kotlin.internal.InlineOnly
-public inline fun <T> Enumeration<T>.toList(): List<T> = Collections.list(this)
+public inline fun <T> java.util.Enumeration<T>.toList(): List<T> = java.util.Collections.list(this)
 
 /**
  * Checks if all elements in the specified collection are contained in this collection.
@@ -160,7 +159,7 @@ private fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean): Array<Any?> =
             // if the array came from varargs and already is array of Any, copying isn't required
             @Suppress("UNCHECKED_CAST") (this as Array<Any?>)
         else
-            Arrays.copyOf(this, this.size, Array<Any?>::class.java)
+            java.util.Arrays.copyOf(this, this.size, Array<Any?>::class.java)
 
 /**
  * Searches this list or its range for the provided [element] using the binary search algorithm.
diff --git a/libraries/stdlib/src/kotlin/collections/Iterators.kt b/libraries/stdlib/src/kotlin/collections/Iterators.kt
index 2c26059fe7c..2e0dc5ca3ab 100644
--- a/libraries/stdlib/src/kotlin/collections/Iterators.kt
+++ b/libraries/stdlib/src/kotlin/collections/Iterators.kt
@@ -3,13 +3,11 @@
 
 package kotlin.collections
 
-import java.util.*
-
 /**
  * Creates an [Iterator] for an [Enumeration], allowing to use it in `for` loops.
  */
 @kotlin.jvm.JvmVersion
-public operator fun <T> Enumeration<T>.iterator(): Iterator<T> = object : Iterator<T> {
+public operator fun <T> java.util.Enumeration<T>.iterator(): Iterator<T> = object : Iterator<T> {
     override fun hasNext(): Boolean = hasMoreElements()
 
     public override fun next(): T = nextElement()
diff --git a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
index b12d76021a6..6ad08cc3fe2 100644
--- a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
+++ b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt
@@ -3,8 +3,6 @@
 
 package kotlin.collections
 
-import java.util.*
-
 /**
  * Returns the value for the given key, or the implicit default value for this map.
  * By default no implicit value is provided for maps and a [NoSuchElementException] is thrown.
diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt
index cce4f70512d..a44f9444ece 100644
--- a/libraries/stdlib/src/kotlin/collections/Maps.kt
+++ b/libraries/stdlib/src/kotlin/collections/Maps.kt
@@ -3,8 +3,6 @@
 
 package kotlin.collections
 
-import java.util.*
-
 private object EmptyMap : Map<Any?, Nothing>, Serializable {
     private const val serialVersionUID: Long = 8246714829545688274
 
@@ -47,7 +45,7 @@ public inline fun <K, V> mapOf(): Map<K, V> = emptyMap()
  * specified value.  The returned map is serializable.
  */
 @JvmVersion
-public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = Collections.singletonMap(pair.first, pair.second)
+public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = java.util.Collections.singletonMap(pair.first, pair.second)
 
 /**
  * Returns a new [MutableMap] with the specified contents, given as a list of pairs
@@ -568,4 +566,4 @@ internal inline fun <K, V> Map<K, V>.toSingletonMapOrSelf(): Map<K, V> = toSingl
 // creates a singleton copy of map
 @kotlin.jvm.JvmVersion
 internal fun <K, V> Map<out K, V>.toSingletonMap(): Map<K, V>
-    = with (entries.iterator().next()) { Collections.singletonMap(key, value) }
+    = with (entries.iterator().next()) { java.util.Collections.singletonMap(key, value) }
diff --git a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
index 185e992f447..195dad391c9 100644
--- a/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
+++ b/libraries/stdlib/src/kotlin/collections/MutableCollections.kt
@@ -3,8 +3,6 @@
 
 package kotlin.collections
 
-import java.util.*
-
 /**
  * Removes a single instance of the specified element from this
  * collection, if it is present.
diff --git a/libraries/stdlib/src/kotlin/collections/Sequences.kt b/libraries/stdlib/src/kotlin/collections/Sequences.kt
index 2689b9060b2..956041139a6 100644
--- a/libraries/stdlib/src/kotlin/collections/Sequences.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sequences.kt
@@ -3,8 +3,6 @@
 
 package kotlin.sequences
 
-import java.util.*
-
 /**
  * Given an [iterator] function constructs a [Sequence] that returns values through the [Iterator]
  * provided by that function.
@@ -25,7 +23,7 @@ public fun <T> Iterator<T>.asSequence(): Sequence<T> = Sequence { this }.constra
  */
 @kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
-public inline fun<T> Enumeration<T>.asSequence(): Sequence<T> = this.iterator().asSequence()
+public inline fun<T> java.util.Enumeration<T>.asSequence(): Sequence<T> = this.iterator().asSequence()
 
 /**
  * Creates a sequence that returns the specified values.
diff --git a/libraries/stdlib/src/kotlin/collections/Sets.kt b/libraries/stdlib/src/kotlin/collections/Sets.kt
index 7152d4ef57a..aaf5f3f0ab7 100644
--- a/libraries/stdlib/src/kotlin/collections/Sets.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sets.kt
@@ -3,8 +3,6 @@
 
 package kotlin.collections
 
-import java.util.*
-
 
 internal object EmptySet : Set<Nothing>, Serializable {
     private const val serialVersionUID: Long = 3406603774387020532
@@ -61,7 +59,7 @@ public inline fun <T> Set<T>?.orEmpty(): Set<T> = this ?: emptySet()
  * The returned set is serializable.
  */
 @JvmVersion
-public fun <T> setOf(element: T): Set<T> = Collections.singleton(element)
+public fun <T> setOf(element: T): Set<T> = java.util.Collections.singleton(element)
 
 
 /**
diff --git a/libraries/stdlib/test/OrderingTest.kt b/libraries/stdlib/test/OrderingTest.kt
index 3ff88f07504..523029def14 100644
--- a/libraries/stdlib/test/OrderingTest.kt
+++ b/libraries/stdlib/test/OrderingTest.kt
@@ -1,6 +1,5 @@
 package test.comparisons
 
-import java.util.*
 import kotlin.test.*
 import org.junit.Test
 import kotlin.comparisons.*
diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt
index e114968a081..50e0efc70b4 100644
--- a/libraries/stdlib/test/collections/ArraysTest.kt
+++ b/libraries/stdlib/test/collections/ArraysTest.kt
@@ -18,7 +18,6 @@ package test.collections
 
 import test.collections.behaviors.listBehavior
 import test.comparisons.STRING_CASE_INSENSITIVE_ORDER
-import java.util.*
 import kotlin.test.*
 import org.junit.Test as test
 import kotlin.comparisons.*
diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt
index d8429dfe4f8..a3c1d9f74be 100644
--- a/libraries/stdlib/test/collections/CollectionTest.kt
+++ b/libraries/stdlib/test/collections/CollectionTest.kt
@@ -16,7 +16,6 @@
 
 package test.collections
 
-import java.util.*
 import kotlin.test.*
 import org.junit.Test as test
 import test.collections.behaviors.*
diff --git a/libraries/stdlib/test/collections/MapTest.kt b/libraries/stdlib/test/collections/MapTest.kt
index 543c948a699..6ba7fb79f21 100644
--- a/libraries/stdlib/test/collections/MapTest.kt
+++ b/libraries/stdlib/test/collections/MapTest.kt
@@ -1,6 +1,5 @@
 package test.collections
 
-import java.util.*
 import kotlin.test.*
 import org.junit.Test as test
 
diff --git a/libraries/stdlib/test/collections/MutableCollectionsTest.kt b/libraries/stdlib/test/collections/MutableCollectionsTest.kt
index a0013b80def..f028decdac7 100644
--- a/libraries/stdlib/test/collections/MutableCollectionsTest.kt
+++ b/libraries/stdlib/test/collections/MutableCollectionsTest.kt
@@ -2,8 +2,6 @@ package test.collections
 
 import kotlin.test.*
 
-import java.util.*
-
 import org.junit.Test as test
 
 class MutableCollectionTest {
diff --git a/libraries/stdlib/test/collections/SequenceTest.kt b/libraries/stdlib/test/collections/SequenceTest.kt
index c9fee5e40c5..18cc79e37d6 100644
--- a/libraries/stdlib/test/collections/SequenceTest.kt
+++ b/libraries/stdlib/test/collections/SequenceTest.kt
@@ -3,7 +3,6 @@ package test.collections
 import org.junit.Test as test
 import org.junit.Test
 import kotlin.test.*
-import java.util.*
 import kotlin.comparisons.*
 
 fun fibonacci(): Sequence<Int> {
diff --git a/libraries/stdlib/test/js/JsArrayTest.kt b/libraries/stdlib/test/js/JsArrayTest.kt
index c1eecb49a59..62a16816925 100644
--- a/libraries/stdlib/test/js/JsArrayTest.kt
+++ b/libraries/stdlib/test/js/JsArrayTest.kt
@@ -18,7 +18,6 @@ package test.collections.js
 
 import org.junit.Test as test
 import kotlin.test.*
-import java.util.*
 
 class JsArrayTest {
 
diff --git a/libraries/stdlib/test/js/MapJsTest.kt b/libraries/stdlib/test/js/MapJsTest.kt
index 3259afadf51..1821aec54d9 100644
--- a/libraries/stdlib/test/js/MapJsTest.kt
+++ b/libraries/stdlib/test/js/MapJsTest.kt
@@ -2,7 +2,6 @@ package test.collections.js
 
 import kotlin.test.*
 import org.junit.Test as test
-import java.util.*
 import test.collections.*
 import test.collections.behaviors.*
 
diff --git a/libraries/stdlib/test/js/SetJsTest.kt b/libraries/stdlib/test/js/SetJsTest.kt
index e573d6918f7..93c025bd120 100644
--- a/libraries/stdlib/test/js/SetJsTest.kt
+++ b/libraries/stdlib/test/js/SetJsTest.kt
@@ -4,7 +4,6 @@ import kotlin.test.*
 import org.junit.Test
 import test.collections.*
 import test.collections.behaviors.*
-import java.util.*
 
 class ComplexSetJsTest : SetJsTest() {
     // Helper function with generic parameter to force to use ComlpexHashMap
diff --git a/libraries/stdlib/test/js/StubsJVM.kt b/libraries/stdlib/test/js/StubsJVM.kt
index 1322a4077ab..3a76a73fc02 100644
--- a/libraries/stdlib/test/js/StubsJVM.kt
+++ b/libraries/stdlib/test/js/StubsJVM.kt
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
+@file:JvmVersion
 package test.collections.js
 
-import java.util.*
-
 public fun <V> stringMapOf(vararg pairs: Pair<String, V>): HashMap<String, V> = hashMapOf<String, V>(*pairs)
 public fun <V> linkedStringMapOf(vararg pairs: Pair<String, V>): LinkedHashMap<String, V> = linkedMapOf(*pairs)
 public fun stringSetOf(vararg elements: String): HashSet<String> = hashSetOf(*elements)
diff --git a/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt b/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt
index cca6bc3c21f..8c256829c01 100644
--- a/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt
+++ b/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt
@@ -1,7 +1,5 @@
 package test.properties.delegation.map
 
-import java.util.*
-import kotlin.properties.*
 import kotlin.test.*
 import org.junit.Test as test