From 70d064052b04422880c57c668a161d83b8c5c53b Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 29 Sep 2015 21:29:08 +0300 Subject: [PATCH] StdLib cleanup: get rid of platformName and platformStatic usages --- .../stdlib/src/kotlin/collections/MapWithDefault.kt | 3 +-- .../stdlib/src/kotlin/collections/ReversedViews.kt | 3 +-- .../stdlib/src/kotlin/properties/MapAccessors.kt | 3 +-- libraries/stdlib/src/kotlin/text/CharsetsJVM.kt | 13 ++++++------- libraries/stdlib/src/kotlin/text/Strings.kt | 3 +-- libraries/stdlib/src/kotlin/util/Ordering.kt | 3 +-- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt index 36cf8b0c32e..09aaea4235a 100644 --- a/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt +++ b/libraries/stdlib/src/kotlin/collections/MapWithDefault.kt @@ -4,7 +4,6 @@ package kotlin import java.util.* -import kotlin.platform.platformName /** * Returns the value for the given key, or the implicit default value for this map. @@ -40,7 +39,7 @@ public fun Map.withDefault(default: (key: K) -> V): Map = * * When this map already have an implicit default value provided with a former call to [withDefault], it is being replaced by this call. */ -@platformName("withDefaultMutable") +@kotlin.jvm.JvmName("withDefaultMutable") public fun MutableMap.withDefault(default: (key: K) -> V): MutableMap = when (this) { is MutableMapWithDefault -> this.map.withDefault(default) diff --git a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt index 42343476518..bfc84efc9d4 100644 --- a/libraries/stdlib/src/kotlin/collections/ReversedViews.kt +++ b/libraries/stdlib/src/kotlin/collections/ReversedViews.kt @@ -19,7 +19,6 @@ package kotlin import java.util.AbstractList -import kotlin.platform.platformName private open class ReversedListReadOnly(protected open val delegate: List) : AbstractList() { override val size: Int get() = delegate.size() @@ -49,6 +48,6 @@ public fun List.asReversed(): List = ReversedListReadOnly(this) * Returns a reversed mutable view of the original mutable List. * All changes made in the original list will be reflected in the reversed one and vice versa. */ -@platformName("asReversedMutable") +@kotlin.jvm.JvmName("asReversedMutable") public fun MutableList.asReversed(): MutableList = ReversedList(this) diff --git a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt index 887ce1bba13..9d8a32725b7 100644 --- a/libraries/stdlib/src/kotlin/properties/MapAccessors.kt +++ b/libraries/stdlib/src/kotlin/properties/MapAccessors.kt @@ -3,7 +3,6 @@ package kotlin.properties import java.io.Serializable import java.util.NoSuchElementException -import kotlin.platform.platformName // extensions for Map and MutableMap @@ -25,7 +24,7 @@ public fun Map.get(thisRef: Any?, property: PropertyMetadata): * * @throws NoSuchElementException when the map doesn't contain value for the property name and doesn't provide an implicit default (see [withDefault]). */ -@platformName("getVar") +@kotlin.jvm.JvmName("getVar") public fun MutableMap.get(thisRef: Any?, property: PropertyMetadata): V = getOrImplicitDefault(property.name) as V /** diff --git a/libraries/stdlib/src/kotlin/text/CharsetsJVM.kt b/libraries/stdlib/src/kotlin/text/CharsetsJVM.kt index 34a8812a8c9..75a2a3f3d07 100644 --- a/libraries/stdlib/src/kotlin/text/CharsetsJVM.kt +++ b/libraries/stdlib/src/kotlin/text/CharsetsJVM.kt @@ -1,7 +1,6 @@ package kotlin import java.nio.charset.* -import kotlin.platform.* /** * Constant definitions for the standard [charsets](Charset). These @@ -12,38 +11,38 @@ public object Charsets { /** * Eight-bit UCS Transformation Format. */ - @platformStatic + @JvmStatic public val UTF_8: Charset = Charset.forName("UTF-8") /** * Sixteen-bit UCS Transformation Format, byte order identified by an * optional byte-order mark. */ - @platformStatic + @JvmStatic public val UTF_16: Charset = Charset.forName("UTF-16") /** * Sixteen-bit UCS Transformation Format, big-endian byte order. */ - @platformStatic + @JvmStatic public val UTF_16BE: Charset = Charset.forName("UTF-16BE") /** * Sixteen-bit UCS Transformation Format, little-endian byte order. */ - @platformStatic + @JvmStatic public val UTF_16LE: Charset = Charset.forName("UTF-16LE") /** * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the * Unicode character set. */ - @platformStatic + @JvmStatic public val US_ASCII: Charset = Charset.forName("US-ASCII") /** * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1. */ - @platformStatic + @JvmStatic public val ISO_8859_1: Charset = Charset.forName("ISO-8859-1") } diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index 8d3a39e4b67..81868ad7208 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -5,7 +5,6 @@ package kotlin import java.util.NoSuchElementException -import kotlin.platform.platformName import kotlin.text.MatchResult import kotlin.text.Regex @@ -154,7 +153,7 @@ public fun String.padEnd(length: Int, padChar: Char = ' '): String { /** Returns `true` if the string is not `null` and not empty */ @Deprecated("Use !isNullOrEmpty() or isNullOrEmpty().not() for nullable strings.", ReplaceWith("this != null && this.isNotEmpty()")) -@platformName("isNotEmptyNullable") +@kotlin.jvm.JvmName("isNotEmptyNullable") public fun String?.isNotEmpty(): Boolean = this != null && this.length() > 0 /** diff --git a/libraries/stdlib/src/kotlin/util/Ordering.kt b/libraries/stdlib/src/kotlin/util/Ordering.kt index f3a594b6f4e..997fa671d84 100644 --- a/libraries/stdlib/src/kotlin/util/Ordering.kt +++ b/libraries/stdlib/src/kotlin/util/Ordering.kt @@ -18,7 +18,6 @@ package kotlin import java.util.Comparator -import kotlin.platform.platformName /** * Compares two values using the specified sequence of functions to calculate the result of the comparison. @@ -48,7 +47,7 @@ public fun compareValuesBy(a: T?, b: T?, vararg functions: (T) -> Comp * compare as equal, the result of that comparison is returned. */ // TODO: Remove platformName after M13 -@platformName("compareValuesByNullable") +@kotlin.jvm.JvmName("compareValuesByNullable") public fun compareValuesBy(a: T, b: T, vararg selectors: (T) -> Comparable<*>?): Int { require(selectors.size() > 0) for (fn in selectors) {