From 1ecece4f0e9c8fbfd4e7534e605793af92300287 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 27 Nov 2014 02:46:38 +0100 Subject: [PATCH] Cleanup --- .../io/bitsquare/gui/main/MainViewModel.java | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/src/main/java/io/bitsquare/gui/main/MainViewModel.java index f9d9d43497..15f4a496ad 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -87,7 +87,6 @@ class MainViewModel implements ViewModel { private final WalletService walletService; private final MessageService messageService; private final TradeManager tradeManager; - private final BSFormatter formatter; @@ -170,9 +169,7 @@ class MainViewModel implements ViewModel { }); } - public void initBackend() { - walletService.getDownloadProgress().subscribe( percentage -> Platform.runLater(() -> networkSyncProgress.set(percentage / 100.0)), error -> log.error(error.toString()), @@ -197,22 +194,18 @@ class MainViewModel implements ViewModel { next -> { }, error -> log.error(error.toString()), - () -> Platform.runLater(() -> { - log.trace("backend completed"); - backEndCompleted(); - }) + () -> Platform.runLater(() -> backEndCompleted()) ); - } private void backEndCompleted() { + log.trace("backend completed"); tradeManager.getPendingTrades().addListener( (MapChangeListener) change -> updateNumPendingTrades()); updateNumPendingTrades(); isReadyForMainScreen.set(true); } - public StringConverter getBankAccountsConverter() { return new StringConverter() { @Override @@ -227,6 +220,13 @@ class MainViewModel implements ViewModel { }; } + public ObservableList getBankAccounts() { + return user.getBankAccounts(); + } + + public void setCurrentBankAccount(BankAccount currentBankAccount) { + user.setCurrentBankAccount(currentBankAccount); + } private void updateNumPendingTrades() { numPendingTrades.set(tradeManager.getPendingTrades().size()); @@ -245,13 +245,4 @@ class MainViewModel implements ViewModel { blockchainSyncIndicatorVisible.set(value < 1); } - - public ObservableList getBankAccounts() { - return user.getBankAccounts(); - } - - public void setCurrentBankAccount(BankAccount currentBankAccount) { - user.setCurrentBankAccount(currentBankAccount); - } - }