This commit is contained in:
Manfred Karrer 2014-11-27 02:46:38 +01:00
parent ac95325e5c
commit 1ecece4f0e

View file

@ -87,7 +87,6 @@ class MainViewModel implements ViewModel {
private final WalletService walletService; private final WalletService walletService;
private final MessageService messageService; private final MessageService messageService;
private final TradeManager tradeManager; private final TradeManager tradeManager;
private final BSFormatter formatter; private final BSFormatter formatter;
@ -170,9 +169,7 @@ class MainViewModel implements ViewModel {
}); });
} }
public void initBackend() { public void initBackend() {
walletService.getDownloadProgress().subscribe( walletService.getDownloadProgress().subscribe(
percentage -> Platform.runLater(() -> networkSyncProgress.set(percentage / 100.0)), percentage -> Platform.runLater(() -> networkSyncProgress.set(percentage / 100.0)),
error -> log.error(error.toString()), error -> log.error(error.toString()),
@ -197,22 +194,18 @@ class MainViewModel implements ViewModel {
next -> { next -> {
}, },
error -> log.error(error.toString()), error -> log.error(error.toString()),
() -> Platform.runLater(() -> { () -> Platform.runLater(() -> backEndCompleted())
log.trace("backend completed");
backEndCompleted();
})
); );
} }
private void backEndCompleted() { private void backEndCompleted() {
log.trace("backend completed");
tradeManager.getPendingTrades().addListener( tradeManager.getPendingTrades().addListener(
(MapChangeListener<String, Trade>) change -> updateNumPendingTrades()); (MapChangeListener<String, Trade>) change -> updateNumPendingTrades());
updateNumPendingTrades(); updateNumPendingTrades();
isReadyForMainScreen.set(true); isReadyForMainScreen.set(true);
} }
public StringConverter<BankAccount> getBankAccountsConverter() { public StringConverter<BankAccount> getBankAccountsConverter() {
return new StringConverter<BankAccount>() { return new StringConverter<BankAccount>() {
@Override @Override
@ -227,6 +220,13 @@ class MainViewModel implements ViewModel {
}; };
} }
public ObservableList<BankAccount> getBankAccounts() {
return user.getBankAccounts();
}
public void setCurrentBankAccount(BankAccount currentBankAccount) {
user.setCurrentBankAccount(currentBankAccount);
}
private void updateNumPendingTrades() { private void updateNumPendingTrades() {
numPendingTrades.set(tradeManager.getPendingTrades().size()); numPendingTrades.set(tradeManager.getPendingTrades().size());
@ -245,13 +245,4 @@ class MainViewModel implements ViewModel {
blockchainSyncIndicatorVisible.set(value < 1); blockchainSyncIndicatorVisible.set(value < 1);
} }
public ObservableList<BankAccount> getBankAccounts() {
return user.getBankAccounts();
}
public void setCurrentBankAccount(BankAccount currentBankAccount) {
user.setCurrentBankAccount(currentBankAccount);
}
} }