From 3a4ed6a85fb4de1afc9afa1cbccccb2360e8cc04 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Mon, 26 Mar 2012 08:58:50 +0100
Subject: [PATCH] for consistency, moved extension functions on
 iterator/iterable/collection to the kotlin package rather than being split
 across kotlin and kotlin.util. Once intrinsic collections are here we could
 consider moving the java.util extension functions into kotlin.java.util

---
 .../kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt  |  1 -
 .../src/main/kotlin/kotlin/jdbc/ResultSets.kt        | 12 ++++++------
 libraries/stdlib/src/JavaCollections.kt              |  2 +-
 libraries/stdlib/src/JavaIterables.kt                |  2 +-
 libraries/stdlib/src/JavaIterablesLazy.kt            |  2 +-
 libraries/stdlib/src/JavaIterablesSpecial.kt         |  2 +-
 libraries/stdlib/src/JavaUtil.kt                     |  2 +-
 libraries/stdlib/src/JavaUtilMap.kt                  |  2 +-
 libraries/stdlib/src/Nullables.kt                    |  1 -
 .../JavaUtilIterablesFromJavaCollections.kt          |  2 +-
 .../generated/JavaUtilIteratorsFromJavaIterables.kt  |  2 +-
 libraries/stdlib/test/GenerateStandardLib.kt         |  4 ++--
 libraries/stdlib/test/regressions/Kt1617Test.kt      |  3 +--
 libraries/stdlib/test/regressions/Kt1619Test.kt      |  1 -
 .../org/jetbrains/kotlin/site/GenerateSiteTest.kt    |  1 -
 15 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
index 06c78eb6064..1ce3e6f6467 100644
--- a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
+++ b/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt
@@ -5,7 +5,6 @@ import org.jetbrains.jet.compiler.CompileEnvironment
 import org.jetbrains.jet.cli.CompilerArguments
 import java.io.PrintStream
 import java.io.File
-import kotlin.util.orEmpty
 
 /**
  * Main for running the KDocCompiler
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 369eb959762..f90299a2142 100644
--- a/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
+++ b/libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt
@@ -1,13 +1,13 @@
 package kotlin.jdbc
 
-import java.sql. *
-import java.util.List
-import kotlin.util.arrayList
+import java.sql.*
+import java.util.ArrayList
 import java.util.Collection
+import java.util.List
 
 /**
- * Creates an iterator through a [[ResultSet]]
- */
+* Creates an iterator through a [[ResultSet]]
+*/
 fun ResultSet.iterator() : Iterator<ResultSet> {
     val rs = this
     return object : Iterator<ResultSet>{
@@ -32,7 +32,7 @@ fun ResultSet.get(columnName: String): Any? = this.getObject(columnName)
  * Maps the collection of rows to some value
  */
 fun <T> ResultSet.map(fn: (ResultSet) -> T) : List<T> {
-    val answer = arrayList<T>()
+    val answer = ArrayList<T>()
     mapTo(answer, fn)
     return answer
 }
diff --git a/libraries/stdlib/src/JavaCollections.kt b/libraries/stdlib/src/JavaCollections.kt
index 5b39244aa19..3cf81d789fe 100644
--- a/libraries/stdlib/src/JavaCollections.kt
+++ b/libraries/stdlib/src/JavaCollections.kt
@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 
diff --git a/libraries/stdlib/src/JavaIterables.kt b/libraries/stdlib/src/JavaIterables.kt
index 17b18902da1..e2a59670131 100644
--- a/libraries/stdlib/src/JavaIterables.kt
+++ b/libraries/stdlib/src/JavaIterables.kt
@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 
diff --git a/libraries/stdlib/src/JavaIterablesLazy.kt b/libraries/stdlib/src/JavaIterablesLazy.kt
index 28d0faf25ea..a0068efd98a 100644
--- a/libraries/stdlib/src/JavaIterablesLazy.kt
+++ b/libraries/stdlib/src/JavaIterablesLazy.kt
@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 
diff --git a/libraries/stdlib/src/JavaIterablesSpecial.kt b/libraries/stdlib/src/JavaIterablesSpecial.kt
index e665fc759ba..bc50003e38b 100644
--- a/libraries/stdlib/src/JavaIterablesSpecial.kt
+++ b/libraries/stdlib/src/JavaIterablesSpecial.kt
@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 // Number of extension function for java.lang.Iterable that shouldn't participate in auto generation
 
 import java.util.Collection
diff --git a/libraries/stdlib/src/JavaUtil.kt b/libraries/stdlib/src/JavaUtil.kt
index 1195328195a..aedb127fd14 100644
--- a/libraries/stdlib/src/JavaUtil.kt
+++ b/libraries/stdlib/src/JavaUtil.kt
@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 import java.util.regex.Pattern
diff --git a/libraries/stdlib/src/JavaUtilMap.kt b/libraries/stdlib/src/JavaUtilMap.kt
index 4ef04bddf6f..dbe62e5df1e 100644
--- a/libraries/stdlib/src/JavaUtilMap.kt
+++ b/libraries/stdlib/src/JavaUtilMap.kt
@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.Map as JMap
 import java.util.HashMap
diff --git a/libraries/stdlib/src/Nullables.kt b/libraries/stdlib/src/Nullables.kt
index 2ba85f933ff..c6a871e5ae2 100644
--- a/libraries/stdlib/src/Nullables.kt
+++ b/libraries/stdlib/src/Nullables.kt
@@ -1,7 +1,6 @@
 package kotlin.nullable
 
 import java.util.*
-import kotlin.util.getOrPut
 
 /** Returns true if the element is not null and matches the given predicate */
 inline fun <T> T?.any(predicate: (T)-> Boolean): Boolean {
diff --git a/libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt b/libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt
index 93517340613..657a412cb25 100644
--- a/libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt
+++ b/libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt
@@ -1,5 +1,5 @@
 // NOTE this file is auto-generated from src/JavaCollections.kt
-package kotlin.util
+package kotlin
 
 import java.util.*
 
diff --git a/libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt b/libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt
index 84dcaca610e..5810c035ab2 100644
--- a/libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt
+++ b/libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt
@@ -1,5 +1,5 @@
 // NOTE this file is auto-generated from src/JavaIterables.kt
-package kotlin.util
+package kotlin
 
 import java.util.*
 
diff --git a/libraries/stdlib/test/GenerateStandardLib.kt b/libraries/stdlib/test/GenerateStandardLib.kt
index 6d4fb5c34c8..6086b1c42c2 100644
--- a/libraries/stdlib/test/GenerateStandardLib.kt
+++ b/libraries/stdlib/test/GenerateStandardLib.kt
@@ -63,7 +63,7 @@ fun main(args: Array<String>) {
         it.replaceAll("java.lang.Iterable<T", "Iterable<T")
     }
 
-    generateFile(File(outDir, "JavaUtilIteratorsFromJavaIterables.kt"), "package kotlin.util", File(srcDir, "JavaIterables.kt")) {
+    generateFile(File(outDir, "JavaUtilIteratorsFromJavaIterables.kt"), "package kotlin", File(srcDir, "JavaIterables.kt")) {
         it.replaceAll("java.lang.Iterable<T", "java.util.Iterator<T")
     }
 
@@ -74,7 +74,7 @@ fun main(args: Array<String>) {
         it.replaceAll("java.util.Collection<T", "Array<T")
     }
 
-    generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package kotlin.util", File(srcDir, "JavaCollections.kt")) {
+    generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) {
         it.replaceAll("java.util.Collection<T", "java.lang.Iterable<T").replaceAll("(this.size)", "")
     }
 
diff --git a/libraries/stdlib/test/regressions/Kt1617Test.kt b/libraries/stdlib/test/regressions/Kt1617Test.kt
index 6fd3ce138c3..15e23870a10 100644
--- a/libraries/stdlib/test/regressions/Kt1617Test.kt
+++ b/libraries/stdlib/test/regressions/Kt1617Test.kt
@@ -1,8 +1,7 @@
 package regressions
 
 // TODO comment out the next line to reproduce KT-1617
-import kotlin.util.map
-import kotlin.util.arrayList
+//import kotlin.util.map
 
 import java.util.Collection
 import java.io.File
diff --git a/libraries/stdlib/test/regressions/Kt1619Test.kt b/libraries/stdlib/test/regressions/Kt1619Test.kt
index 651e15b69fe..b7673458091 100644
--- a/libraries/stdlib/test/regressions/Kt1619Test.kt
+++ b/libraries/stdlib/test/regressions/Kt1619Test.kt
@@ -2,7 +2,6 @@ package regressions
 
 import junit.framework.TestCase
 import java.util.List
-import kotlin.util.arrayList
 
 class Kt1619Test: TestCase() {
 
diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
index 59e315fae06..769610fc574 100644
--- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
+++ b/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt
@@ -2,7 +2,6 @@ package org.jetbrains.kotlin.site
 
 import junit.framework.TestCase
 import java.io.File
-import kotlin.util.arrayList
 import org.jetbrains.kotlin.doc.KDocArguments
 import org.jetbrains.kotlin.doc.KDocCompiler