azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warning with 'orEmpty' function

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-11-21 11:08:19 +04:00
parent 382b2d4a96
commit 191891963c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/JUtil.kt
+2 -4
View File
@@ -24,8 +24,7 @@ val Collection<*>.notEmpty : Boolean
get() = isNotEmpty()
/** Returns the Collection if its not null otherwise it returns the empty list */
public fun <T> Collection<T>?.orEmpty() : Collection<T>
= if (this != null) this else Collections.emptyList<T>() as Collection<T>
public fun <T> Collection<T>?.orEmpty() : Collection<T> = this ?: Collections.emptyList<T>()
/** TODO these functions don't work when they generate the Array<T> versions when they are in JLIterables */
@@ -37,8 +36,7 @@ public fun <T: Comparable<T>> Iterable<T>.toSortedList(comparator: java.util.Com
// List APIs
/** Returns the List if its not null otherwise returns the empty list */
public fun <T> List<T>?.orEmpty() : List<T>
= if (this != null) this else Collections.emptyList<T>() as List<T>
public fun <T> List<T>?.orEmpty() : List<T> = this ?: Collections.emptyList<T>()
/**
TODO figure out necessary variance/generics ninja stuff... :)