From 350d446031600cea8998f51accc6fe99114274fa Mon Sep 17 00:00:00 2001 From: Ilya Ryzhenkov Date: Wed, 17 Sep 2014 22:40:44 +0400 Subject: [PATCH] Make UTF-8 default for delegated java.lang.util functions. Convert getBytes() to toByteArray() to make it clear of copy operation. --- libraries/stdlib/src/kotlin/text/StringsJVM.kt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt index 40b318eaf31..2cef0d875df 100644 --- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt @@ -32,8 +32,6 @@ public fun String.toLowerCase(): String = (this as java.lang.String).toLowerCase public fun String.length(): Int = (this as java.lang.String).length() -public fun String.getBytes(): ByteArray = (this as java.lang.String).getBytes() - public fun String.toCharArray(): CharArray = (this as java.lang.String).toCharArray() public fun String.format(vararg args: Any?): String = java.lang.String.format(this, *args) @@ -70,9 +68,9 @@ public fun String(bytes: ByteArray, charsetName: String): String = java.lang.Str public fun String(bytes: ByteArray, charset: Charset): String = java.lang.String(bytes, charset) as String -public fun String(bytes: ByteArray, i: Int, i1: Int): String = java.lang.String(bytes, i, i1) as String +public fun String(bytes: ByteArray, i: Int, i1: Int): String = java.lang.String(bytes, i, i1, Charsets.UTF_8) as String -public fun String(bytes: ByteArray): String = java.lang.String(bytes) as String +public fun String(bytes: ByteArray): String = java.lang.String(bytes, Charsets.UTF_8) as String public fun String(chars: CharArray): String = java.lang.String(chars) as String @@ -100,10 +98,6 @@ public fun String.contentEquals(cs: CharSequence): Boolean = (this as java.lang. public fun String.contentEquals(sb: StringBuffer): Boolean = (this as java.lang.String).contentEquals(sb) -public fun String.getBytes(charset: Charset): ByteArray = (this as java.lang.String).getBytes(charset) - -public fun String.getBytes(charset: String): ByteArray = (this as java.lang.String).getBytes(charset) - public fun String.getChars(srcBegin: Int, srcEnd: Int, dst: CharArray, dstBegin: Int): Unit = (this as java.lang.String).getChars(srcBegin, srcEnd, dst, dstBegin) public fun String.indexOf(ch: Char): Int = (this as java.lang.String).indexOf(ch.toString())