Replace get() and set() to getValue() and setValue() (property delegates)

This commit is contained in:
Yan Zhulanow
2015-10-05 20:18:58 +03:00
parent 2fee9d362c
commit 1f2b4e20fe
295 changed files with 718 additions and 511 deletions
@@ -2,7 +2,7 @@
package foo
object NumberDecrypter {
fun get(instance: Any?, data: PropertyMetadata) = when (data.name) {
fun getValue(instance: Any?, data: PropertyMetadata) = when (data.name) {
"four" -> 4
"two" -> 2
else -> throw Exception()
@@ -4,11 +4,11 @@ package foo
object Delegate {
var value = "lol"
fun get(instance: Any?, data: PropertyMetadata): String {
fun getValue(instance: Any?, data: PropertyMetadata): String {
return value
}
fun set(instance: Any?, data: PropertyMetadata, newValue: String) {
fun setValue(instance: Any?, data: PropertyMetadata, newValue: String) {
value = newValue
}
}
@@ -8,12 +8,12 @@ fun format(event: String, property: String, value: Int): String
object LoggerDelegate {
var log = ""
fun get(state: State, desc: PropertyMetadata): Int {
fun getValue(state: State, desc: PropertyMetadata): Int {
log += format("get", desc.name, state.realValue)
return state.realValue
}
fun set(state: State, desc: PropertyMetadata, value: Int) {
fun setValue(state: State, desc: PropertyMetadata, value: Int) {
log += format("set", desc.name, value)
state.realValue = value
}
@@ -2,8 +2,8 @@ package foo
class Delegate {
var inner = 1
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) {
fun getValue(t: Any?, p: PropertyMetadata): Int = inner
fun setValue(t: Any?, p: PropertyMetadata, i: Int) {
inner = i
}
}
@@ -2,8 +2,8 @@ package foo
class Delegate {
var inner = 1
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) {
fun getValue(t: Any?, p: PropertyMetadata): Int = inner
fun setValue(t: Any?, p: PropertyMetadata, i: Int) {
inner = i
}
}
@@ -2,8 +2,8 @@ package foo
class Delegate {
var inner = 1
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) {
fun getValue(t: Any?, p: PropertyMetadata): Int = inner
fun setValue(t: Any?, p: PropertyMetadata, i: Int) {
inner = i
}
}
@@ -3,7 +3,7 @@ package foo
class Delegate {
}
fun Delegate.get(t: Any?, p: PropertyMetadata): Int = 1
fun Delegate.getValue(t: Any?, p: PropertyMetadata): Int = 1
class A {
val prop: Int by Delegate()
@@ -5,10 +5,10 @@ interface WithName {
}
class GetPropertyName() {
fun get(withName: WithName, property: PropertyMetadata): String {
fun getValue(withName: WithName, property: PropertyMetadata): String {
return withName.name + ":" + property.name;
}
fun set(withName: WithName, property: PropertyMetadata, value: String) {
fun setValue(withName: WithName, property: PropertyMetadata, value: String) {
withName.name = value + ":" + property.name
}
}
@@ -2,10 +2,10 @@ package foo
class Delegate {
var inner = 1
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun getValue(t: Any?, p: PropertyMetadata): Int = inner
}
fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) {
fun Delegate.setValue(t: Any?, p: PropertyMetadata, i: Int) {
inner = i
}
+2 -2
View File
@@ -5,10 +5,10 @@ interface WithNumber {
}
class IncNumber(val inc: Int) {
fun get(withNumber: WithNumber, property: PropertyMetadata): Int {
fun getValue(withNumber: WithNumber, property: PropertyMetadata): Int {
return withNumber.number + inc;
}
fun set(withNumber: WithNumber, property: PropertyMetadata, value: Int) {
fun setValue(withNumber: WithNumber, property: PropertyMetadata, value: Int) {
withNumber.number = value;
}
}
@@ -1,7 +1,7 @@
package foo
class Delegate {
fun get(t: Any?, p: PropertyMetadata): Int = 1
fun getValue(t: Any?, p: PropertyMetadata): Int = 1
}
val prop: Int by Delegate()
@@ -2,8 +2,8 @@ package foo
class Delegate {
var inner = 1
fun get(t: Any?, p: PropertyMetadata): Int = inner
fun set(t: Any?, p: PropertyMetadata, i: Int) {
fun getValue(t: Any?, p: PropertyMetadata): Int = inner
fun setValue(t: Any?, p: PropertyMetadata, i: Int) {
inner = i
}
}
@@ -6,13 +6,13 @@ interface Getter<T> {
class Delegate<T>(val getter: Getter<T>) {
var t: T? = null
fun get(obj: Any, property: PropertyMetadata): T {
fun getValue(obj: Any, property: PropertyMetadata): T {
if (t != null) {
return t!!
}
return getter.get()
}
fun set(obj: Any, property: PropertyMetadata, value: T) {
fun setValue(obj: Any, property: PropertyMetadata, value: T) {
t = value
}
}
@@ -7,9 +7,9 @@ interface Base {
}
class Delegate(val multiplier: Int) {
fun get(state: State, desc: PropertyMetadata): Int = multiplier * state.value
fun getValue(state: State, desc: PropertyMetadata): Int = multiplier * state.value
fun set(state: State, desc: PropertyMetadata, value: Int) {
fun setValue(state: State, desc: PropertyMetadata, value: Int) {
state.value = value / multiplier
}