ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-20 17:33:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

client: Small tweaks

Browse Source
This commit is contained in:
Andras Slemmer 2016-09-01 10:55:59 +01:00
parent 2ef59ff2ba
commit 3a5247f016
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/kotlin/com/r3corda/client/fxutils/EventStreamFold.kt → client/src/main/kotlin/com/r3corda/client/fxutils/ObservableFold.kt
View File

@ -8,10 +8,10 @@ import javafx.collections.ObservableList
import rx.Observable
/**
* Simple utilities for converting an [rx.Observable] into an [ObservableValue]/[ObservableList]
* Simple utilities for converting an [rx.Observable] into a javafx [ObservableValue]/[ObservableList]
*/
fun <A, B> Observable<A>.foldToObservable(initial: B, folderFun: (A, B) -> B): ObservableValue<B> {
fun <A, B> Observable<A>.foldToObservableValue(initial: B, folderFun: (A, B) -> B): ObservableValue<B> {
val result = SimpleObjectProperty<B>(initial)
subscribe {
Platform.runLater {

1
client/src/main/kotlin/com/r3corda/client/model/ContractStateModel.kt
View File

@ -8,7 +8,6 @@ import com.r3corda.client.fxutils.foldToObservableList
import com.r3corda.node.services.monitor.ServiceToClientEvent
import javafx.collections.ObservableList
import kotlinx.support.jdk8.collections.removeIf
import org.reactfx.EventStream
import rx.Observable
class StatesDiff<out T : ContractState>(

2
client/src/main/kotlin/com/r3corda/client/model/Models.kt
View File

@ -110,7 +110,7 @@ sealed class TrackedDelegate<M : Any>(val klass: KClass<M>) {
return observableListProperty(Models.get(klass, thisRef.javaClass.kotlin))
}
}
class ObservableListReadOnlyDelegate<M : Any, T>(klass: KClass<M>, val observableListReadOnlyProperty: (M) -> ObservableList<out T>) : TrackedDelegate<M>(klass) {
class ObservableListReadOnlyDelegate<M : Any, out T>(klass: KClass<M>, val observableListReadOnlyProperty: (M) -> ObservableList<out T>) : TrackedDelegate<M>(klass) {
operator fun getValue(thisRef: Any, property: KProperty<*>): ObservableList<out T> {
return observableListReadOnlyProperty(Models.get(klass, thisRef.javaClass.kotlin))
}