ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-08 11:38:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compilation fixes after OS merged.

Browse Source
This commit is contained in:
Viktor Kolomeyko 2018-05-10 15:49:22 +01:00
parent 355c65ad62
commit e0dfe7a75a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/explorer/src/main/kotlin/net/corda/explorer/model/MembershipListModel.kt
View File

@ -24,7 +24,7 @@ import net.corda.sample.businessnetwork.membership.flow.ObtainMembershipListCont
class MembershipListModel { class MembershipListModel {
private val proxy by observableValue(NodeMonitorModel::proxyObservable) private val proxy by observableValue(NodeMonitorModel::proxyObservable)
private val members = proxy.map { it?.startFlow(::ObtainMembershipListContentFlow, IOUFlow.allowedMembershipName)?.returnValue?.getOrThrow() } private val members = proxy.map { it?.cordaRPCOps?.startFlow(::ObtainMembershipListContentFlow, IOUFlow.allowedMembershipName)?.returnValue?.getOrThrow() }
private val observableValueOfParties = members.map { private val observableValueOfParties = members.map {
FXCollections.observableList(it?.toList() ?: emptyList<AbstractParty>()) FXCollections.observableList(it?.toList() ?: emptyList<AbstractParty>())
} }

2
tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt
View File

@ -71,7 +71,7 @@ class TransactionViewer : CordaView("Transactions") {
private var scrollPosition: Int = 0 private var scrollPosition: Int = 0
private lateinit var expander: ExpanderColumn<TransactionViewer.Transaction> private lateinit var expander: ExpanderColumn<TransactionViewer.Transaction>
private var txIdToScroll: SecureHash? = null // Passed as param. var txIdToScroll: SecureHash? = null // Passed as param.
/** /**
* This is what holds data for a single transaction node. Note how a lot of these are nullable as we often simply don't * This is what holds data for a single transaction node. Note how a lot of these are nullable as we often simply don't

2
tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/iou/NewTransaction.kt
View File

@ -81,7 +81,7 @@ class NewTransaction : Fragment() {
initOwner(window) initOwner(window)
show() show()
} }
val handle: FlowHandle<SignedTransaction> = rpcProxy.value!!.startFlow(::IOUFlow, request.first, request.second) val handle: FlowHandle<SignedTransaction> = rpcProxy.value!!.cordaRPCOps.startFlow(::IOUFlow, request.first, request.second)
runAsync { runAsync {
try { try {
handle.returnValue.getOrThrow() handle.returnValue.getOrThrow()