diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/rpc/NodeRPC.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/rpc/NodeRPC.kt index 115adf68b2..9a8db6f387 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/rpc/NodeRPC.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/rpc/NodeRPC.kt @@ -8,7 +8,7 @@ import net.corda.demobench.model.NodeConfig import java.util.* import java.util.concurrent.TimeUnit.SECONDS -class NodeRPC(config: NodeConfig, start: () -> Unit, invoke: (CordaRPCOps) -> Unit) : AutoCloseable { +class NodeRPC(config: NodeConfig, start: (NodeConfig, CordaRPCOps) -> Unit, invoke: (CordaRPCOps) -> Unit) : AutoCloseable { private companion object { val log = loggerFor() @@ -30,7 +30,7 @@ class NodeRPC(config: NodeConfig, start: () -> Unit, invoke: (CordaRPCOps) -> Un this.cancel() // Run "start-up" task, now that the RPC client is ready. - start() + start(config, ops) // Schedule a new task that will refresh the display once per second. timer.schedule(object : TimerTask() { diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt index 2d61040598..decd35c5fd 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt @@ -3,17 +3,22 @@ package net.corda.demobench.views import com.jediterm.terminal.TerminalColor import com.jediterm.terminal.TextStyle import com.jediterm.terminal.ui.settings.DefaultSettingsProvider +import java.awt.Dimension +import java.net.URI +import java.util.logging.Level +import javax.swing.SwingUtilities import javafx.application.Platform import javafx.embed.swing.SwingNode import javafx.scene.control.Button import javafx.scene.control.Label import javafx.scene.image.ImageView import javafx.scene.layout.StackPane +import javafx.scene.layout.HBox import javafx.scene.layout.VBox import javafx.util.Duration -import net.corda.client.rpc.notUsed import net.corda.core.success import net.corda.core.then +import net.corda.core.messaging.CordaRPCOps import net.corda.demobench.explorer.ExplorerController import net.corda.demobench.model.NodeConfig import net.corda.demobench.model.NodeController @@ -23,11 +28,9 @@ import net.corda.demobench.rpc.NodeRPC import net.corda.demobench.ui.PropertyLabel import net.corda.demobench.web.DBViewer import net.corda.demobench.web.WebServerController +import rx.Subscription +import rx.schedulers.Schedulers import tornadofx.* -import java.awt.Dimension -import java.net.URI -import java.util.logging.Level -import javax.swing.SwingUtilities class NodeTerminalView : Fragment() { override val root by fxml() @@ -41,10 +44,14 @@ class NodeTerminalView : Fragment() { private val transactions by fxid() private val balance by fxid() + private val header by fxid() private val viewDatabaseButton by fxid