From 3a5247f01674448cc6dc4f9244928c07e9de95c3 Mon Sep 17 00:00:00 2001
From: Andras Slemmer <andras.slemmer@r3cev.com>
Date: Thu, 1 Sep 2016 10:55:59 +0100
Subject: [PATCH] client: Small tweaks

---
 .../client/fxutils/{EventStreamFold.kt => ObservableFold.kt}  | 4 ++--
 .../kotlin/com/r3corda/client/model/ContractStateModel.kt     | 1 -
 client/src/main/kotlin/com/r3corda/client/model/Models.kt     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename client/src/main/kotlin/com/r3corda/client/fxutils/{EventStreamFold.kt => ObservableFold.kt} (82%)

diff --git a/client/src/main/kotlin/com/r3corda/client/fxutils/EventStreamFold.kt b/client/src/main/kotlin/com/r3corda/client/fxutils/ObservableFold.kt
similarity index 82%
rename from client/src/main/kotlin/com/r3corda/client/fxutils/EventStreamFold.kt
rename to client/src/main/kotlin/com/r3corda/client/fxutils/ObservableFold.kt
index 65795bdab1..755c85b89d 100644
--- a/client/src/main/kotlin/com/r3corda/client/fxutils/EventStreamFold.kt
+++ b/client/src/main/kotlin/com/r3corda/client/fxutils/ObservableFold.kt
@@ -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 {
diff --git a/client/src/main/kotlin/com/r3corda/client/model/ContractStateModel.kt b/client/src/main/kotlin/com/r3corda/client/model/ContractStateModel.kt
index 42b070d20d..cba8c774f1 100644
--- a/client/src/main/kotlin/com/r3corda/client/model/ContractStateModel.kt
+++ b/client/src/main/kotlin/com/r3corda/client/model/ContractStateModel.kt
@@ -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>(
diff --git a/client/src/main/kotlin/com/r3corda/client/model/Models.kt b/client/src/main/kotlin/com/r3corda/client/model/Models.kt
index e0490439a0..0d65d6a183 100644
--- a/client/src/main/kotlin/com/r3corda/client/model/Models.kt
+++ b/client/src/main/kotlin/com/r3corda/client/model/Models.kt
@@ -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))
         }