added java.lang.Comparable to JavaTypeTransformer

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java

@@ -256,7 +256,7 @@ public class JavaTypeTransformer {
             classDescriptorMap.put(new FqName("java.lang.CharSequence"), JetStandardLibrary.getInstance().getCharSequence());
             classDescriptorMap.put(new FqName("java.lang.Throwable"), JetStandardLibrary.getInstance().getThrowable());
             classDescriptorMap.put(new FqName("java.lang.Number"), JetStandardLibrary.getInstance().getNumber());
-
+            classDescriptorMap.put(new FqName("java.lang.Comparable"), JetStandardLibrary.getInstance().getComparable());
         }
         return classDescriptorMap;
     }

compiler/testData/diagnostics/tests/regressions/kt335.336.kt

@@ -2,9 +2,8 @@
 // KT-335 Type inference fails on Collections.sort
 
 import java.util.*
-import java.lang.Comparable as Comparable
 
-fun <T : java.lang.Comparable<T>> List<T>.sort() {
+fun <T : Comparable<T>> List<T>.sort() {
   Collections.sort(this) // Error here
 }
 

libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt

@@ -109,7 +109,7 @@ public fun <T> java.lang.Iterable<T>.withIndices(): java.util.List<#(Int, T)> {
     return answer
 }
 
-public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.sort() : List<T> {
+public inline fun <in T: Comparable<T>> java.lang.Iterable<T>.sort() : List<T> {
     val list = toList()
     java.util.Collections.sort(list)
     return list

libraries/stdlib/src/kotlin/JUtil.kt

@@ -33,9 +33,9 @@ public inline fun <T> java.util.Collection<T>?.orEmpty() : Collection<T>
 
 
 /** TODO these functions don't work when they generate the Array<T> versions when they are in JLIterables */
-public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList() : List<T> = toList().sort()
+public inline fun <in T: Comparable<T>> java.lang.Iterable<T>.toSortedList() : List<T> = toList().sort()
 
-public inline fun <in T: java.lang.Comparable<T>> java.lang.Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> = toList().sort(comparator)
+public inline fun <in T: Comparable<T>> java.lang.Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> = toList().sort(comparator)
 
 
 // List APIs