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

Remove old 'get' delegate convention in interfaces

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-12 01:31:00 +03:00
parent 6d2f9cc669
commit bc3d1ddda0
20 changed files with 11 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/properties/Delegation.kt
-2
View File
@@ -260,8 +260,6 @@ public abstract class MapVar<T, K, V>() : MapVal<T, K, V>(), ReadWriteProperty<T
map.put(key(property), value)
}
override fun get(thisRef: T, property: PropertyMetadata) = getValue(thisRef, property)
override fun getValue(thisRef: T, property: PropertyMetadata): V {
return super<MapVal>.getValue(thisRef, property)
}
libraries/stdlib/src/kotlin/properties/Interfaces.kt
+3 -17
View File
@@ -17,11 +17,7 @@ public interface ReadOnlyProperty<in R, out T> {
* @param property the metadata for the property.
* @return the property value.
*/
public fun getValue(thisRef: R, property: PropertyMetadata): T = get(thisRef, property)
//TODO drop after bootstrap
@Deprecated("Use getValue() instead.", ReplaceWith("getValue(thisRef, property)"))
public fun get(thisRef: R, property: PropertyMetadata): T = getValue(thisRef, property)
public fun getValue(thisRef: R, property: PropertyMetadata): T
}
/**
@@ -40,11 +36,7 @@ public interface ReadWriteProperty<in R, T> {
* @param property the metadata for the property.
* @return the property value.
*/
public fun getValue(thisRef: R, property: PropertyMetadata): T = get(thisRef, property)
//TODO drop after bootstrap
@Deprecated("Use getValue() instead.", ReplaceWith("getValue(thisRef, property)"))
public fun get(thisRef: R, property: PropertyMetadata): T = getValue(thisRef, property)
public fun getValue(thisRef: R, property: PropertyMetadata): T
/**
* Sets the value of the property for the given object.
@@ -52,11 +44,5 @@ public interface ReadWriteProperty<in R, T> {
* @param property the metadata for the property.
* @param value the value to set.
*/
public fun setValue(thisRef: R, property: PropertyMetadata, value: T) {
set(thisRef, property, value)
}
//TODO drop after bootstrap
@Deprecated("Use setValue() instead.", ReplaceWith("setValue(thisRef, property, value)"))
public fun set(thisRef: R, property: PropertyMetadata, value: T) = setValue(thisRef, property, value)
public fun setValue(thisRef: R, property: PropertyMetadata, value: T)
}
libraries/stdlib/src/kotlin/properties/MapAccessors.kt
+1 -13
View File
@@ -13,9 +13,6 @@ package kotlin.properties
*/
public fun <V> Map<in String, *>.getValue(thisRef: Any?, property: PropertyMetadata): V = getOrImplicitDefault(property.name) as V
@Deprecated("Use getValue() instead")
public fun <V> Map<in String, *>.get(thisRef: Any?, property: PropertyMetadata): V = getOrImplicitDefault(property.name) as V
/**
* Returns the value of the property for the given object from this mutable map.
* @param thisRef the object for which the value is requested (not used).
@@ -27,10 +24,6 @@ public fun <V> Map<in String, *>.get(thisRef: Any?, property: PropertyMetadata):
@kotlin.jvm.JvmName("getVar")
public fun <V> MutableMap<in String, in V>.getValue(thisRef: Any?, property: PropertyMetadata): V = getOrImplicitDefault(property.name) as V
@Deprecated("Use getValue() instead")
@kotlin.jvm.JvmName("getVarDeprecated")
public fun <V> MutableMap<in String, in V>.get(thisRef: Any?, property: PropertyMetadata): V = getOrImplicitDefault(property.name) as V
/**
* Stores the value of the property for the given object in this mutable map.
* @param thisRef the object for which the value is requested (not used).
@@ -39,9 +32,4 @@ public fun <V> MutableMap<in String, in V>.get(thisRef: Any?, property: Property
*/
public fun <V> MutableMap<in String, in V>.setValue(thisRef: Any?, property: PropertyMetadata, value: V) {
this.put(property.name, value)
}
@Deprecated("Use setValue() instead")
public fun <V> MutableMap<in String, in V>.set(thisRef: Any?, property: PropertyMetadata, value: V) {
this.put(property.name, value)
}
}
libraries/stdlib/src/kotlin/util/Lazy.kt
-3
View File
@@ -76,9 +76,6 @@ public fun lazy<T>(lock: Any?, initializer: () -> T): Lazy<T> = SynchronizedLazy
*/
public fun <T> Lazy<T>.getValue(thisRef: Any?, property: PropertyMetadata): T = value
@Deprecated("Use getValue() instead")
public fun <T> Lazy<T>.get(thisRef: Any?, property: PropertyMetadata): T = value
/**
* Specifies how a [Lazy] instance synchronizes access among multiple threads.
*/