diff --git a/libraries/stdlib/src/kotlin/collections/Iterators.kt b/libraries/stdlib/src/kotlin/collections/Iterators.kt index 710dfaa8f5d..b3cdf0bff5b 100644 --- a/libraries/stdlib/src/kotlin/collections/Iterators.kt +++ b/libraries/stdlib/src/kotlin/collections/Iterators.kt @@ -1,12 +1,14 @@ package kotlin +import java.util.* + /** Helper to make java.util.Enumeration usable in for */ public fun java.util.Enumeration.iterator(): Iterator = object: Iterator { override fun hasNext(): Boolean = hasMoreElements() - public override fun next() : T = nextElement() + public override fun next(): T = nextElement() } /** diff --git a/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt b/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt index 18a0ea23086..27fb8175976 100644 --- a/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt +++ b/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt @@ -58,3 +58,11 @@ public fun linkedMapOf(vararg values: Pair): LinkedHashMap { /** Returns the Set if its not null otherwise returns the empty set */ public fun Set?.orEmpty(): Set = if (this != null) this else Collections.EMPTY_SET as Set + + +/** + * Returns a list containing the elements returned by the + * specified enumeration in the order they are returned by the + * enumeration. + */ +fun Enumeration.toList(): List = Collections.list(this)