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, explorer: Fix compile after rebase

Browse Source
This commit is contained in:
Andras Slemmer 2016-09-08 11:50:44 +01:00
parent 9877299ba8
commit f673d18fb8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class GatheredTransactionDataModel {
* (Note that a transaction may be mapped by one or both)
* TODO: Expose a writable stream to combine [serviceToClient] with to allow recording of transactions made locally(UUID)
*/
val gatheredGatheredTransactionDataList: ObservableList<out GatheredTransactionData> =
val gatheredTransactionDataList: ObservableList<out GatheredTransactionData> =
serviceToClient.foldToObservableList<ServiceToClientEvent, GatheredTransactionDataWritable, Unit>(
initialAccumulator = Unit,
folderFun = { serviceToClientEvent, _unit, transactionStates ->

2
explorer/src/main/kotlin/com/r3corda/explorer/Main.kt
View File

@ -54,7 +54,7 @@ class Main : App() {
val bobOutStream = PublishSubject.create<ClientToServiceCommand>()
val bobClient = startClient(bobNode).get()
val bobMonitorClient = WalletMonitorClient(bobClient, bobNode, bobOutStream, bobInStream)
val bobMonitorClient = WalletMonitorClient(bobClient, bobNode, bobOutStream, bobInStream, PublishSubject.create())
assert(bobMonitorClient.register().get())
for (i in 0 .. 10000) {

8
explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt
View File

@ -34,8 +34,8 @@ class Home : View() {
private val selectedView: WritableValue<SelectedView> by writableValue(TopLevelModel::selectedView)
private val cashStates: ObservableList<StateAndRef<Cash.State>> by observableList(ContractStateModel::cashStates)
private val transactionCreateStates: ObservableList<out TransactionCreateState>
by observableListReadOnly(TransactionCreateStateModel::transactionCreateStates)
private val gatheredTransactionDataList: ObservableList<out GatheredTransactionData>
by observableListReadOnly(GatheredTransactionDataModel::gatheredTransactionDataList)
private val reportingCurrency: ObservableValue<Currency> by observableValue(SettingsModel::reportingCurrency)
private val exchangeRate: ObservableValue<ExchangeRate> by observableValue(ExchangeRateModel::exchangeRate)
@ -57,8 +57,8 @@ class Home : View() {
ourTransactionsLabel.textProperty().bind(
Bindings.createStringBinding({
NumberFormatter.intComma.format(transactionCreateStates.size)
}, arrayOf(transactionCreateStates))
NumberFormatter.intComma.format(gatheredTransactionDataList.size)
}, arrayOf(gatheredTransactionDataList))
)
ourTransactionsPane.setOnMouseClicked { clickEvent ->
if (clickEvent.button == MouseButton.PRIMARY) {

8
explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt
View File

@ -4,8 +4,8 @@ import com.r3corda.client.model.*
import com.r3corda.contracts.asset.Cash
import com.r3corda.core.contracts.Amount
import com.r3corda.core.contracts.CommandData
import com.r3corda.core.contracts.SignedTransaction
import com.r3corda.core.contracts.withoutIssuer
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.explorer.formatters.AmountFormatter
import com.r3corda.explorer.model.ReportingCurrencyModel
import com.r3corda.explorer.ui.setColumnPrefWidthPolicy
@ -39,8 +39,8 @@ class TransactionViewer: View() {
private val transactionViewCommandTypes: TableColumn<ViewerNode, String> by fxid("TransactionViewCommandTypes")
private val transactionViewTotalValueEquiv: TableColumn<ViewerNode, Amount<Currency>> by fxid("TransactionViewTotalValueEquiv")
private val transactionCreateStates: ObservableList<out TransactionCreateState>
by observableListReadOnly(TransactionCreateStateModel::transactionCreateStates)
private val gatheredTransactionDataList: ObservableList<out GatheredTransactionData>
by observableListReadOnly(GatheredTransactionDataModel::gatheredTransactionDataList)
private val reportingExchange: ObservableValue<Pair<Currency, (Amount<Currency>) -> Amount<Currency>>>
by observableValue(ReportingCurrencyModel::reportingExchange)
@ -54,7 +54,7 @@ class TransactionViewer: View() {
val transaction: ObservableValue<SignedTransaction?>
)
private val viewerNodes = EasyBind.map(transactionCreateStates) {
private val viewerNodes = EasyBind.map(gatheredTransactionDataList) {
ViewerNode(
transactionId = EasyBind.combine(it.fiberId, it.uuid) { fiberId, uuid -> Pair(fiberId, uuid) },
originator = EasyBind.map(it.uuid) { uuid ->