From 6df5e8b73a77882df13574c4c93a78d1437f9917 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 3 Dec 2012 15:23:30 +0400
Subject: [PATCH] Deprecate confusing arrayList(), hashSet() and such.
 Introduce arrayListOf(...) ans such

---
 libraries/stdlib/src/kotlin/JUtilJVM.kt | 42 ++++++++++++++++++-------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/JUtilJVM.kt b/libraries/stdlib/src/kotlin/JUtilJVM.kt
index af6296cd6b5..039a26f0034 100644
--- a/libraries/stdlib/src/kotlin/JUtilJVM.kt
+++ b/libraries/stdlib/src/kotlin/JUtilJVM.kt
@@ -3,20 +3,32 @@ package kotlin
 import java.util.*
 
 /** Returns a new LinkedList with a variable number of initial elements */
-public inline fun linkedList<T>(vararg values: T) : LinkedList<T>  = values.toCollection(LinkedList<T>())
+public inline fun linkedListOf<T>(vararg values: T) : LinkedList<T>  = values.toCollection(LinkedList<T>())
+
+deprecated("Use linkedListOf() instead")
+public inline fun linkedList<T>(vararg values: T) : LinkedList<T>  = linkedListOf(*values)
 
 /** Returns a new HashSet with a variable number of initial elements */
-public inline fun hashSet<T>(vararg values: T) : HashSet<T> = values.toCollection(HashSet<T>(values.size))
+public inline fun hashSetOf<T>(vararg values: T) : HashSet<T> = values.toCollection(HashSet<T>(values.size))
+
+deprecated("Use hashSetOf() instead")
+public inline fun hashSet<T>(vararg values: T) : HashSet<T> = hashSetOf(*values)
 
 /**
  * Returns a new [[SortedSet]] with the initial elements
  */
-public inline fun sortedSet<T>(vararg values: T) : TreeSet<T> = values.toCollection(TreeSet<T>())
+public inline fun sortedSetOf<T>(vararg values: T) : TreeSet<T> = values.toCollection(TreeSet<T>())
+
+deprecated("Use sortedSetOf() instead")
+public inline fun sortedSet<T>(vararg values: T) : TreeSet<T> = sortedSetOf(*values)
 
 /**
  * Returns a new [[SortedSet]] with the given *comparator* and the initial elements
  */
-public inline fun sortedSet<T>(comparator: Comparator<T>, vararg values: T) : TreeSet<T> = values.toCollection(TreeSet<T>(comparator))
+public inline fun sortedSetOf<T>(comparator: Comparator<T>, vararg values: T) : TreeSet<T> = values.toCollection(TreeSet<T>(comparator))
+
+deprecated("Use sortedSetOf() instead")
+public inline fun sortedSet<T>(comparator: Comparator<T>, vararg values: T) : TreeSet<T> = sortedSetOf(comparator, *values)
 
 /**
  * Returns a new [[HashMap]] populated with the given tuple values where the first value in each tuple
@@ -24,7 +36,7 @@ public inline fun sortedSet<T>(comparator: Comparator<T>, vararg values: T) : Tr
  *
  * @includeFunctionBody ../../test/MapTest.kt createUsingTuples
  */
-public inline fun <K,V> hashMap(vararg values: Pair<K,V>): HashMap<K,V> {
+public inline fun <K,V> hashMapOf(vararg values: Pair<K,V>): HashMap<K,V> {
     val answer = HashMap<K,V>(values.size)
     /**
         TODO replace by this simpler call when we can pass vararg values into other methods
@@ -36,13 +48,16 @@ public inline fun <K,V> hashMap(vararg values: Pair<K,V>): HashMap<K,V> {
     return answer
 }
 
+deprecated("Use hashMapOf() instead")
+public inline fun <K,V> hashMap(vararg values: Pair<K,V>): HashMap<K,V> = hashMapOf(*values)
+
 /**
  * Returns a new [[SortedMap]] populated with the given tuple values where the first value in each tuple
  * is the key and the second value is the value
  *
  * @includeFunctionBody ../../test/MapTest.kt createSortedMap
  */
-public inline fun <K,V> sortedMap(vararg values: Pair<K, V>): SortedMap<K,V> {
+public inline fun <K,V> sortedMapOf(vararg values: Pair<K, V>): SortedMap<K,V> {
     val answer = TreeMap<K,V>()
     /**
         TODO replace by this simpler call when we can pass vararg values into other methods
@@ -54,6 +69,9 @@ public inline fun <K,V> sortedMap(vararg values: Pair<K, V>): SortedMap<K,V> {
     return answer
 }
 
+deprecated("Use sortedMapOf() instead")
+public inline fun <K,V> sortedMap(vararg values: Pair<K, V>): SortedMap<K,V> = sortedMapOf(*values)
+
 /**
  * Returns a new [[LinkedHashMap]] populated with the given tuple values where the first value in each tuple
  * is the key and the second value is the value. This map preserves insertion order so iterating through
@@ -61,7 +79,7 @@ public inline fun <K,V> sortedMap(vararg values: Pair<K, V>): SortedMap<K,V> {
  *
  * @includeFunctionBody ../../test/MapTest.kt createLinkedMap
  */
-public inline fun <K,V> linkedMap(vararg values: Pair<K, V>): LinkedHashMap<K,V> {
+public inline fun <K,V> linkedMapOf(vararg values: Pair<K, V>): LinkedHashMap<K,V> {
     val answer = LinkedHashMap<K,V>(values.size)
     /**
         TODO replace by this simpler call when we can pass vararg values into other methods
@@ -73,13 +91,15 @@ public inline fun <K,V> linkedMap(vararg values: Pair<K, V>): LinkedHashMap<K,V>
     return answer
 }
 
+deprecated("Use linkedMapOf() instead")
+public inline fun <K,V> linkedMap(vararg values: Pair<K, V>): LinkedHashMap<K,V> = linkedMapOf(*values)
 
 /** Returns the Set if its not null otherwise returns the empty set */
 public inline fun <T> Set<T>?.orEmpty() : Set<T>
     = if (this != null) this else Collections.EMPTY_SET as Set<T>
 
+deprecated("Use arrayListOf() instead")
+public inline fun arrayList<T>(vararg values: T) : ArrayList<T> = arrayListOf(*values)
+
 /** Returns a new ArrayList with a variable number of initial elements */
-public inline fun arrayList<T>(vararg values: T) : ArrayList<T> = values.toCollection(ArrayList<T>(values.size))
-
-
-
+public inline fun arrayListOf<T>(vararg values: T) : ArrayList<T> = values.toCollection(ArrayList<T>(values.size))
\ No newline at end of file