From 7e93494e2fdddc7da99c4a8491ec84c19a3dbb11 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Sun, 18 Dec 2011 08:15:39 +0000
Subject: [PATCH] renamed the sort() methods on Iterable which create a new
 List and sort that as "toSortedList()" instead which is more accurate.

---
 stdlib/ktSrc/JavaUtil.kt           | 37 ++++++++++++++++++------------
 testlib/test/CollectionApiCheck.kt |  1 +
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/stdlib/ktSrc/JavaUtil.kt b/stdlib/ktSrc/JavaUtil.kt
index 3a6761e9a26..f0faab3ab2f 100644
--- a/stdlib/ktSrc/JavaUtil.kt
+++ b/stdlib/ktSrc/JavaUtil.kt
@@ -141,13 +141,13 @@ inline fun <T, R> java.util.Collection<T>.map(transform : fun(T) : R) : Collecti
   return result
 }
 
-inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort() : List<T> {
+inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList() : List<T> {
   val answer = this.toList()
   answer.sort()
   return answer
 }
 
-inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort(comparator: java.util.Comparator<T>) : List<T> {
+inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> {
   val answer = this.toList()
   answer.sort(comparator)
   return answer
@@ -155,20 +155,9 @@ inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort(comparator
 
 /**
   TODO figure out necessary variance/generics ninja stuff... :)
-inline fun <in T> java.lang.Iterable<T>.sort(transform: fun(T) : java.lang.Comparable<*>) : List<T> {
+inline fun <in T> java.lang.Iterable<T>.toSortedList(transform: fun(T) : java.lang.Comparable<*>) : List<T> {
   val answer = this.toList()
-  val comparator = java.util.Comparator<T>() {
-    fun compare(o1: T, o2: T): Int {
-      val v1 = transform(o1)
-      val v2 = transform(o2)
-      if (v1 == v2) {
-        return 0
-      } else {
-        return v1.compareTo(v2)
-      }
-    }
-  }
-  answer.sort(comparator)
+  answer.sort(transform)
   return answer
 }
 */
@@ -207,6 +196,24 @@ inline fun <in T: java.lang.Comparable<T>> List<T>.sort(comparator: java.util.Co
   Collections.sort(this, comparator)
 }
 
+/**
+  TODO figure out necessary variance/generics ninja stuff... :)
+inline fun <in T> List<T>.sort(transform: fun(T) : java.lang.Comparable<*>) : List<T> {
+  val comparator = java.util.Comparator<T>() {
+    fun compare(o1: T, o2: T): Int {
+      val v1 = transform(o1)
+      val v2 = transform(o2)
+      if (v1 == v2) {
+        return 0
+      } else {
+        return v1.compareTo(v2)
+      }
+    }
+  }
+  answer.sort(comparator)
+}
+*/
+
 val <T> List<T>.head : T?
     get() = this.get(0)
 
diff --git a/testlib/test/CollectionApiCheck.kt b/testlib/test/CollectionApiCheck.kt
index 0b97d4cb974..4396cc2617d 100644
--- a/testlib/test/CollectionApiCheck.kt
+++ b/testlib/test/CollectionApiCheck.kt
@@ -1,5 +1,6 @@
 namespace test.apicheck
 
+import std.util.*
 import java.util.*
 
 trait Traversable<T> {