Loading java arrays as Array<out T> at method return type position, as well.

This commit is contained in:
Evgeny Gerashchenko
2012-11-15 19:19:58 +04:00
parent d2a308964d
commit 21e97b408c
21 changed files with 64 additions and 63 deletions
+3 -3
View File
@@ -34,9 +34,9 @@ public inline fun String.toCharList(): List<Char> = toCharArray().toList()
public inline fun String.format(format : String, vararg args : Any?) : String = java.lang.String.format(format, args)
public inline fun String.split(regex : String) : Array<String> = (this as java.lang.String).split(regex) as Array<String>
public inline fun String.split(regex : String) : Array<out String> = (this as java.lang.String).split(regex)
public inline fun String.split(ch : Char) : Array<String> = (this as java.lang.String).split(java.util.regex.Pattern.quote(ch.toString())) as Array<String>
public inline fun String.split(ch : Char) : Array<out String> = (this as java.lang.String).split(java.util.regex.Pattern.quote(ch.toString()))
public inline fun String.substring(beginIndex : Int) : String = (this as java.lang.String).substring(beginIndex)
@@ -78,7 +78,7 @@ public inline fun String.replaceFirst(regex : String, replacement : String) : St
public inline fun String.charAt(index : Int) : Char = (this as java.lang.String).charAt(index)
public inline fun String.split(regex : String, limit : Int) : Array<String> = (this as java.lang.String).split(regex, limit)
public inline fun String.split(regex : String, limit : Int) : Array<out String> = (this as java.lang.String).split(regex, limit)
public inline fun String.codePointAt(index : Int) : Int = (this as java.lang.String).codePointAt(index)
+1 -1
View File
@@ -206,7 +206,7 @@ fun File.readLines(charset : String = "UTF-8") : List<String> {
/**
* Returns an array of files and directories in the directory that satisfy the specified filter.
*/
fun File.listFiles(filter : (file : File) -> Boolean) : Array<File>? = listFiles(
fun File.listFiles(filter : (file : File) -> Boolean) : Array<out File>? = listFiles(
object : FileFilter {
override fun accept(file: File) = filter(file)
}
+1 -1
View File
@@ -10,7 +10,7 @@ class StringUtilTest() : TestCase() {
fun testToRegex() {
val re = """foo""".toRegex()
val list = re.split("hellofoobar").toList()
val list = (re.split("hellofoobar") as Array<String>).toList()
assertEquals(arrayList("hello", "bar"), list)
}
}
@@ -9,6 +9,7 @@ import java.util.ArrayList
import java.util.TreeMap
import org.w3c.dom.*
import org.w3c.dom.events.*
import java.lang.reflect.*
/**
* This tool generates JavaScript stubs for classes available in the JDK which are already available in the browser environment
@@ -139,7 +140,7 @@ import js.noImpl
}
}
for (method in validMethods) {
val parameterTypes = method.getParameterTypes()!!
val parameterTypes = method.getParameterTypes()!! as jet.Array<Class<out Any?>?>
// TODO in java 7 its not easy with reflection to get the parameter argument name...
var counter = 0
@@ -148,7 +149,7 @@ import js.noImpl
println(" public fun ${method.getName()}($parameters): $returnType = js.noImpl")
}
}
val fields = klass.getDeclaredFields()
val fields = klass.getDeclaredFields() as jet.Array<Field>
if (fields != null) {
if (fields.notEmpty()) {
println("")