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

Remove duplicated Delegated properties classes from stdlib

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2013-10-18 11:44:48 +04:00
parent b8db438db1
commit 97b35ed8ea
2 changed files with 0 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/properties/delegation/Delegation.kt
-118
View File
@@ -1,118 +0,0 @@
package kotlin.properties.delegation
import kotlin.properties.ChangeSupport
public class NotNullVar<T: Any> {
private var value: T? = null
public fun get(thisRef: Any?, desc: PropertyMetadata): T {
return value ?: throw IllegalStateException("Property ${desc.name} should be initialized before get")
}
public fun set(thisRef: Any?, desc: PropertyMetadata, value: T) {
this.value = value
}
}
public class SynchronizedVar<T>(private val initValue: T, private val lock: Any) {
private var value: T = initValue
public fun get(thisRef: Any?, desc: PropertyMetadata): T {
return synchronized(lock) { value }
}
public fun set(thisRef: Any?, desc: PropertyMetadata, newValue: T) {
synchronized(lock) {
value = newValue
}
}
}
class ObservableProperty<T>(initialValue: T, val changeSupport: (name: String, oldValue: T, newValue: T) -> Unit) {
private var value = initialValue
public fun get(thisRef: Any?, desc: PropertyMetadata): T {
return value
}
public fun set(thisRef: Any?, desc: PropertyMetadata, newValue: T) {
changeSupport(desc.name, value, newValue)
value = newValue
}
}
public class KeyMissingException(message: String): RuntimeException(message)
public abstract class MapVal<T, V> {
public abstract fun getMap(thisRef: T): Map<*, *>
public abstract fun getKey(desc: PropertyMetadata): Any?
public open fun getDefaultValue(desc: PropertyMetadata, key: Any?): V {
throw KeyMissingException("Key $key is missing")
}
public fun get(thisRef: T, desc: PropertyMetadata): V {
val key = getKey(desc)
val map = getMap(thisRef)
if (!map.containsKey(key)) {
return getDefaultValue(desc, key)
}
return map[key] as V
}
}
public abstract class MapVar<T, V>: MapVal<T, V>() {
public fun set(thisRef: T, desc: PropertyMetadata, newValue: V) {
val map = getMap(thisRef) as MutableMap<Any?, Any?>
map[getKey(desc)] = newValue
}
}
public fun <V> Map<String, *>.readOnlyProperty(default: (() -> V)? = null): MapVal<Any?, V> {
return object: MapVal<Any?, V>() {
override fun getMap(thisRef: Any?) = this@readOnlyProperty
override fun getKey(desc: PropertyMetadata) = desc.name
override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = if (default == null) super.getDefaultValue(desc, key) else default()
}
}
public fun <V> Map<*, *>.readOnlyProperty(default: (() -> V)? = null, key: Any?): MapVal<Any?, V> {
return object: MapVal<Any?, V>() {
override fun getMap(thisRef: Any?) = this@readOnlyProperty
override fun getKey(desc: PropertyMetadata) = key
override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = if (default == null) super.getDefaultValue(desc, key) else default()
}
}
public fun <V> Map<*, *>.readOnlyProperty(default: (() -> V)? = null, key: (desc: PropertyMetadata) -> Any?): MapVal<Any?, V> {
return object: MapVal<Any?, V>() {
override fun getMap(thisRef: Any?) = this@readOnlyProperty
override fun getKey(desc: PropertyMetadata) = key(desc)
override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = if (default == null) super.getDefaultValue(desc, key) else default()
}
}
public fun <V> MutableMap<String, *>.property(default: (() -> V)? = null): MapVar<Any?, V> {
return object: MapVar<Any?, V>() {
override fun getMap(thisRef: Any?) = this@property
override fun getKey(desc: PropertyMetadata) = desc.name
override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = if (default == null) super.getDefaultValue(desc, key) else default()
}
}
public fun <V> MutableMap<*, *>.property(default: (() -> V)? = null, key: Any?): MapVar<Any?, V> {
return object: MapVar<Any?, V>() {
override fun getMap(thisRef: Any?) = this@property
override fun getKey(desc: PropertyMetadata) = key
override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = if (default == null) super.getDefaultValue(desc, key) else default()
}
}
public fun <V> MutableMap<*, *>.property(default: (() -> V)? = null, key: (desc: PropertyMetadata) -> Any?): MapVar<Any?, V> {
return object: MapVar<Any?, V>() {
override fun getMap(thisRef: Any?) = this@property
override fun getKey(desc: PropertyMetadata) = key(desc)
override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = if (default == null) super.getDefaultValue(desc, key) else default()
}
}
libraries/stdlib/src/kotlin/properties/delegation/lazy/LazyValues.kt
-75
View File
@@ -1,75 +0,0 @@
package kotlin.properties.delegation.lazy
private val NULL_VALUE: Any = Any()
private fun <T> escape(value: T): Any {
return if (value == null) NULL_VALUE else value
}
private fun <T: Any> unescape(value: Any): T? {
return if (value == NULL_VALUE) null else value as T
}
public open class LazyVal<T: Any>(initializer: () -> T): NullableLazyVal<T>(initializer) {
override fun get(thisRef: Any?, desc: PropertyMetadata): T {
return super.get(thisRef, desc)!!
}
}
public open class NullableLazyVal<T: Any>(private val initializer: () -> T?) {
private var value: Any? = null
public open fun get(thisRef: Any?, desc: PropertyMetadata): T? {
if (value == null) {
value = escape(initializer())
}
return unescape(value!!)
}
}
public open class VolatileLazyVal<T: Any>(initializer: () -> T): VolatileNullableLazyVal<T>(initializer) {
override fun get(thisRef: Any?, desc: PropertyMetadata): T {
return super.get(thisRef, desc)!!
}
}
public open class VolatileNullableLazyVal<T: Any>(private val initializer: () -> T?) {
private volatile var value: Any? = null
public open fun get(thisRef: Any?, desc: PropertyMetadata): T? {
if (value == null) {
value = escape(initializer())
}
return unescape(value!!)
}
}
public open class AtomicLazyVal<T: Any>(lock: Any? = null, initializer: () -> T): AtomicNullableLazyVal<T>(lock, initializer) {
override fun get(thisRef: Any?, desc: PropertyMetadata): T {
return super.get(thisRef, desc)!!
}
}
public open class AtomicNullableLazyVal<T: Any>(lock: Any? = null, private val initializer: () -> T?) {
private val lock = lock ?: this
private volatile var value: Any? = null
public open fun get(thisRef: Any?, desc: PropertyMetadata): T? {
val _v1 = value
if (_v1 != null) {
return unescape(_v1)
}
return synchronized(lock) {
val _v2 = value
if (_v2 != null) {
unescape<T>(_v2)
}
else {
val typedValue = initializer()
value = escape(typedValue)
typedValue
}
}
}
}