Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-18 14:55:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduce Model and accept it as generic param to ViewCB

Browse Source
This commit is contained in:
Chris Beams 2014-11-22 14:41:46 +01:00
parent cc2de07901
commit 21b4fc7019
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
25 changed files with 364 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/io/bitsquare/gui/CachedViewCB.java
View File

@ -27,15 +27,12 @@ import org.slf4j.LoggerFactory;
/**
* If caching is used for loader we use the CachedViewController for turning the controller into sleep mode if not
* active and awake it at reactivation.
* * @param <T> The PresentationModel used in that class
*/
public class CachedViewCB<T extends Activatable> extends ViewCB {
public class CachedViewCB<M extends Activatable & Model> extends ViewCB<M> {
private static final Logger log = LoggerFactory.getLogger(CachedViewCB.class);
protected final T presentationModel;
public CachedViewCB(T presentationModel) {
this.presentationModel = presentationModel;
public CachedViewCB(M model) {
super(model);
}
public CachedViewCB() {
@ -74,8 +71,8 @@ public class CachedViewCB<T extends Activatable> extends ViewCB {
public void activate() {
log.trace("Lifecycle: activate " + this.getClass().getSimpleName());
if (presentationModel != null)
presentationModel.activate();
if (model != null)
model.activate();
}
/**
@ -84,8 +81,8 @@ public class CachedViewCB<T extends Activatable> extends ViewCB {
public void deactivate() {
log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName());
if (presentationModel != null)
presentationModel.deactivate();
if (model != null)
model.deactivate();
}
/**
@ -96,8 +93,8 @@ public class CachedViewCB<T extends Activatable> extends ViewCB {
log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
super.terminate();
if (presentationModel != null)
presentationModel.deactivate();
if (model != null)
model.deactivate();
}
}

2
src/main/java/io/bitsquare/gui/Controller.java
View File

@ -25,7 +25,7 @@ import javafx.fxml.Initializable;
import static com.google.common.base.Preconditions.checkNotNull;
public abstract class Controller<M extends Model> implements Initializable {
public abstract class Controller<M extends XModel> implements Initializable {
public static final String TITLE_KEY = "view.title";

2
src/main/java/io/bitsquare/gui/DataModel.java
View File

@ -17,5 +17,5 @@
package io.bitsquare.gui;
public interface DataModel {
public interface DataModel extends Model {
}

2
src/main/java/io/bitsquare/gui/FxmlController.java
View File

@ -24,7 +24,7 @@ import java.util.ResourceBundle;
import javafx.fxml.FXML;
import javafx.scene.*;
public abstract class FxmlController<R extends Node, M extends Model> extends Controller<M> {
public abstract class FxmlController<R extends Node, M extends XModel> extends Controller<M> {
protected @FXML R root;

1
src/main/java/io/bitsquare/gui/Model.java
View File

@ -18,5 +18,4 @@
package io.bitsquare.gui;
public interface Model {
void initialize();
}

14
src/main/java/io/bitsquare/gui/ViewCB.java
View File

@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory;
/**
* Non caching version for code behind classes using the PM pattern
*/
public class ViewCB implements Initializable {
public class ViewCB<M extends Model> implements Initializable {
private static final Logger log = LoggerFactory.getLogger(ViewCB.class);
public static final String TITLE_KEY = "view.title";
@ -39,8 +40,18 @@ public class ViewCB implements Initializable {
protected Initializable childController;
protected Initializable parent;
protected final M model;
@FXML protected Parent root;
public ViewCB(M model) {
this.model = model;
}
public ViewCB() {
this(null);
}
/**
* Get called form GUI framework when the UI is ready.
*
@ -87,4 +98,5 @@ public class ViewCB implements Initializable {
"= " + navigationItem);
return null;
}
}

2
src/main/java/io/bitsquare/gui/ViewModel.java
View File

@ -17,5 +17,5 @@
package io.bitsquare.gui;
public interface ViewModel {
public interface ViewModel extends Model {
}

22
src/main/java/io/bitsquare/gui/XModel.java Normal file
View File

@ -0,0 +1,22 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui;
public interface XModel {
void initialize();
}

4
src/main/java/io/bitsquare/gui/main/MainModel.java
View File

@ -20,7 +20,7 @@ package io.bitsquare.gui.main;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.btc.WalletService;
import io.bitsquare.gui.Model;
import io.bitsquare.gui.XModel;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.msg.MessageService;
import io.bitsquare.network.BootstrapState;
@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
import rx.Observable;
class MainModel implements Model {
class MainModel implements XModel {
private static final Logger log = LoggerFactory.getLogger(MainModel.class);
final DoubleProperty networkSyncProgress = new SimpleDoubleProperty(-1);

1
src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java
View File

@ -102,6 +102,7 @@ public class ArbitratorRegistrationViewCB extends CachedViewCB {
@Inject
private ArbitratorRegistrationViewCB(Persistence persistence, WalletService walletService,
MessageService messageService, User user, BSFormatter formatter) {
super();
this.persistence = persistence;
this.walletService = walletService;
this.messageService = messageService;

6
src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java
View File

@ -36,12 +36,10 @@ import javafx.scene.layout.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ChangePasswordViewCB extends ViewCB implements ContextAware {
public class ChangePasswordViewCB extends ViewCB<ChangePasswordPM> implements ContextAware {
private static final Logger log = LoggerFactory.getLogger(ChangePasswordViewCB.class);
private final ChangePasswordPM model;
@FXML HBox buttonsHBox;
@FXML Button saveButton, skipButton;
@FXML PasswordField oldPasswordField, passwordField, repeatedPasswordField;
@ -53,7 +51,7 @@ public class ChangePasswordViewCB extends ViewCB implements ContextAware {
@Inject
private ChangePasswordViewCB(ChangePasswordPM model) {
this.model = model;
super(model);
}

78
src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java
View File

@ -76,8 +76,8 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
FiatAccountViewCB(FiatAccountPM presentationModel, OverlayManager overlayManager) {
super(presentationModel);
FiatAccountViewCB(FiatAccountPM model, OverlayManager overlayManager) {
super(model);
this.overlayManager = overlayManager;
}
@ -89,19 +89,19 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
@Override
public void initialize(URL url, ResourceBundle rb) {
typesComboBox.setItems(presentationModel.getAllTypes());
typesComboBox.setConverter(presentationModel.getTypesConverter());
selectionComboBox.setConverter(presentationModel.getSelectionConverter());
currencyComboBox.setItems(presentationModel.getAllCurrencies());
currencyComboBox.setConverter(presentationModel.getCurrencyConverter());
regionComboBox.setItems(presentationModel.getAllRegions());
regionComboBox.setConverter(presentationModel.getRegionConverter());
countryComboBox.setConverter(presentationModel.getCountryConverter());
typesComboBox.setItems(model.getAllTypes());
typesComboBox.setConverter(model.getTypesConverter());
selectionComboBox.setConverter(model.getSelectionConverter());
currencyComboBox.setItems(model.getAllCurrencies());
currencyComboBox.setConverter(model.getCurrencyConverter());
regionComboBox.setItems(model.getAllRegions());
regionComboBox.setConverter(model.getRegionConverter());
countryComboBox.setConverter(model.getCountryConverter());
nameOfBankTextField.setValidator(presentationModel.getBankAccountNumberValidator());
holderNameTextField.setValidator(presentationModel.getBankAccountNumberValidator());
primaryIDTextField.setValidator(presentationModel.getBankAccountNumberValidator());
secondaryIDTextField.setValidator(presentationModel.getBankAccountNumberValidator());
nameOfBankTextField.setValidator(model.getBankAccountNumberValidator());
holderNameTextField.setValidator(model.getBankAccountNumberValidator());
primaryIDTextField.setValidator(model.getBankAccountNumberValidator());
secondaryIDTextField.setValidator(model.getBankAccountNumberValidator());
super.initialize(url, rb);
}
@ -113,7 +113,7 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
setupListeners();
setupBindings();
selectionComboBox.setItems(presentationModel.getAllBankAccounts());
selectionComboBox.setItems(model.getAllBankAccounts());
}
@SuppressWarnings("EmptyMethod")
@ -147,17 +147,17 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
@FXML
void onSelectAccount() {
if (selectionComboBox.getSelectionModel().getSelectedItem() != null)
presentationModel.selectBankAccount(selectionComboBox.getSelectionModel().getSelectedItem());
model.selectBankAccount(selectionComboBox.getSelectionModel().getSelectedItem());
}
@FXML
void onSelectType() {
presentationModel.setType(typesComboBox.getSelectionModel().getSelectedItem());
model.setType(typesComboBox.getSelectionModel().getSelectedItem());
}
@FXML
void onSelectCurrency() {
presentationModel.setCurrency(currencyComboBox.getSelectionModel().getSelectedItem());
model.setCurrency(currencyComboBox.getSelectionModel().getSelectedItem());
}
@FXML
@ -165,19 +165,19 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
countryComboBox.setVisible(true);
Region region = regionComboBox.getSelectionModel().getSelectedItem();
if (region != null)
countryComboBox.setItems(presentationModel.getAllCountriesFor(region));
countryComboBox.setItems(model.getAllCountriesFor(region));
}
@FXML
void onSelectCountry() {
Country country = countryComboBox.getSelectionModel().getSelectedItem();
if (country != null)
presentationModel.setCountry(country);
model.setCountry(country);
}
@FXML
void onSave() {
InputValidator.ValidationResult result = presentationModel.requestSaveBankAccount();
InputValidator.ValidationResult result = model.requestSaveBankAccount();
if (result.isValid) {
selectionComboBox.getSelectionModel().select(null);
Popups.openInfoPopup("Your payments account has been saved.",
@ -193,7 +193,7 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
@FXML
void onRemoveAccount() {
presentationModel.removeBankAccount();
model.removeBankAccount();
selectionComboBox.getSelectionModel().select(null);
}
@ -213,21 +213,21 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
///////////////////////////////////////////////////////////////////////////////////////////
private void setupListeners() {
presentationModel.type.addListener((ov, oldValue, newValue) -> {
model.type.addListener((ov, oldValue, newValue) -> {
if (newValue != null)
typesComboBox.getSelectionModel().select(typesComboBox.getItems().indexOf(newValue));
else
typesComboBox.getSelectionModel().clearSelection();
});
presentationModel.currency.addListener((ov, oldValue, newValue) -> {
model.currency.addListener((ov, oldValue, newValue) -> {
if (newValue != null)
currencyComboBox.getSelectionModel().select(currencyComboBox.getItems().indexOf(newValue));
else
currencyComboBox.getSelectionModel().clearSelection();
});
presentationModel.country.addListener((ov, oldValue, newValue) -> {
model.country.addListener((ov, oldValue, newValue) -> {
if (newValue != null) {
int regionIndex = regionComboBox.getItems().indexOf(newValue.getRegion());
if (regionIndex >= 0 && regionIndex < regionComboBox.getItems().size())
@ -243,7 +243,7 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
}
});
presentationModel.getCountryNotInAcceptedCountriesList().addListener((ov, oldValue, newValue) -> {
model.getCountryNotInAcceptedCountriesList().addListener((ov, oldValue, newValue) -> {
if (newValue) {
overlayManager.blurContent();
List<Action> actions = new ArrayList<>();
@ -271,28 +271,28 @@ public class FiatAccountViewCB extends CachedViewCB<FiatAccountPM> implements Co
actions);
if (Popups.isYes(response))
presentationModel.addCountryToAcceptedCountriesList();
model.addCountryToAcceptedCountriesList();
}
});
presentationModel.getAllBankAccounts().addListener((ListChangeListener<BankAccount>) change ->
completedButton.setDisable(presentationModel.getAllBankAccounts().isEmpty()));
completedButton.setDisable(presentationModel.getAllBankAccounts().isEmpty());
model.getAllBankAccounts().addListener((ListChangeListener<BankAccount>) change ->
completedButton.setDisable(model.getAllBankAccounts().isEmpty()));
completedButton.setDisable(model.getAllBankAccounts().isEmpty());
}
private void setupBindings() {
// input
nameOfBankTextField.textProperty().bindBidirectional(presentationModel.title);
holderNameTextField.textProperty().bindBidirectional(presentationModel.holderName);
primaryIDTextField.textProperty().bindBidirectional(presentationModel.primaryID);
secondaryIDTextField.textProperty().bindBidirectional(presentationModel.secondaryID);
nameOfBankTextField.textProperty().bindBidirectional(model.title);
holderNameTextField.textProperty().bindBidirectional(model.holderName);
primaryIDTextField.textProperty().bindBidirectional(model.primaryID);
secondaryIDTextField.textProperty().bindBidirectional(model.secondaryID);
primaryIDTextField.promptTextProperty().bind(presentationModel.primaryIDPrompt);
secondaryIDTextField.promptTextProperty().bind(presentationModel.secondaryIDPrompt);
selectionComboBox.promptTextProperty().bind(presentationModel.selectionPrompt);
selectionComboBox.disableProperty().bind(presentationModel.selectionDisable);
primaryIDTextField.promptTextProperty().bind(model.primaryIDPrompt);
secondaryIDTextField.promptTextProperty().bind(model.secondaryIDPrompt);
selectionComboBox.promptTextProperty().bind(model.selectionPrompt);
selectionComboBox.disableProperty().bind(model.selectionDisable);
saveButton.disableProperty().bind(presentationModel.saveButtonDisable);
saveButton.disableProperty().bind(model.saveButtonDisable);
removeBankAccountButton.disableProperty().bind(createBooleanBinding(() ->
(selectionComboBox.getSelectionModel().selectedIndexProperty().get() == -1),

30
src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewCB.java
View File

@ -63,8 +63,8 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
IrcAccountViewCB(IrcAccountPM presentationModel) {
super(presentationModel);
IrcAccountViewCB(IrcAccountPM model) {
super(model);
}
@ -74,10 +74,10 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
@Override
public void initialize(URL url, ResourceBundle rb) {
ircNickNameTextField.setValidator(presentationModel.getNickNameValidator());
ircNickNameTextField.setValidator(model.getNickNameValidator());
typesComboBox.setItems(presentationModel.getAllTypes());
typesComboBox.setConverter(presentationModel.getTypesConverter());
typesComboBox.setItems(model.getAllTypes());
typesComboBox.setConverter(model.getTypesConverter());
// we use a custom cell for deactivating non IRC items, later we use the standard cell and the StringConverter
typesComboBox.setCellFactory(new Callback<ListView<BankAccountType>, ListCell<BankAccountType>>() {
@Override
@ -88,7 +88,7 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
protected void updateItem(BankAccountType item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getBankAccountType(item));
setText(model.getBankAccountType(item));
if (item == null || empty) {
setGraphic(null);
@ -103,8 +103,8 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
});
typesComboBox.getSelectionModel().select(0);
currencyComboBox.setItems(presentationModel.getAllCurrencies());
currencyComboBox.setConverter(presentationModel.getCurrencyConverter());
currencyComboBox.setItems(model.getAllCurrencies());
currencyComboBox.setConverter(model.getCurrencyConverter());
// we use a custom cell for deactivating non EUR items, later we use the standard cell and the StringConverter
currencyComboBox.setCellFactory(new Callback<ListView<Currency>, ListCell<Currency>>() {
@Override
@ -182,17 +182,17 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
@FXML
void onSelectType() {
presentationModel.setType(typesComboBox.getSelectionModel().getSelectedItem());
model.setType(typesComboBox.getSelectionModel().getSelectedItem());
}
@FXML
void onSelectCurrency() {
presentationModel.setCurrency(currencyComboBox.getSelectionModel().getSelectedItem());
model.setCurrency(currencyComboBox.getSelectionModel().getSelectedItem());
}
@FXML
void onSave() {
InputValidator.ValidationResult result = presentationModel.requestSaveBankAccount();
InputValidator.ValidationResult result = model.requestSaveBankAccount();
if (result.isValid && parent instanceof MultiStepNavigation)
((MultiStepNavigation) parent).nextStep(this);
}
@ -217,14 +217,14 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
///////////////////////////////////////////////////////////////////////////////////////////
private void setupListeners() {
presentationModel.type.addListener((ov, oldValue, newValue) -> {
model.type.addListener((ov, oldValue, newValue) -> {
if (newValue != null)
typesComboBox.getSelectionModel().select(typesComboBox.getItems().indexOf(newValue));
else
typesComboBox.getSelectionModel().clearSelection();
});
presentationModel.currency.addListener((ov, oldValue, newValue) -> {
model.currency.addListener((ov, oldValue, newValue) -> {
if (newValue != null)
currencyComboBox.getSelectionModel().select(currencyComboBox.getItems().indexOf(newValue));
else
@ -234,8 +234,8 @@ public class IrcAccountViewCB extends CachedViewCB<IrcAccountPM> implements Cont
private void setupBindings() {
// input
ircNickNameTextField.textProperty().bindBidirectional(presentationModel.ircNickName);
saveButton.disableProperty().bind(presentationModel.saveButtonDisable);
ircNickNameTextField.textProperty().bindBidirectional(model.ircNickName);
saveButton.disableProperty().bind(model.saveButtonDisable);
}

6
src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java
View File

@ -36,12 +36,10 @@ import javafx.scene.layout.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PasswordViewCB extends ViewCB implements ContextAware {
public class PasswordViewCB extends ViewCB<PasswordPM> implements ContextAware {
private static final Logger log = LoggerFactory.getLogger(PasswordViewCB.class);
private final PasswordPM model;
@FXML HBox buttonsHBox;
@FXML Button saveButton, skipButton;
@FXML PasswordField oldPasswordField, passwordField, repeatedPasswordField;
@ -53,7 +51,7 @@ public class PasswordViewCB extends ViewCB implements ContextAware {
@Inject
private PasswordViewCB(PasswordPM model) {
this.model = model;
super(model);
}

5
src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java
View File

@ -48,12 +48,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RegistrationViewCB extends ViewCB implements ContextAware {
public class RegistrationViewCB extends ViewCB<RegistrationPM> implements ContextAware {
private static final Logger log = LoggerFactory.getLogger(RegistrationViewCB.class);
private final OverlayManager overlayManager;
private final RegistrationPM model;
@FXML TextField feeTextField;
@FXML AddressTextField addressTextField;
@ -69,7 +68,7 @@ public class RegistrationViewCB extends ViewCB implements ContextAware {
@Inject
private RegistrationViewCB(RegistrationPM model, OverlayManager overlayManager) {
this.model = model;
super(model);
this.overlayManager = overlayManager;
}

34
src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java
View File

@ -71,8 +71,8 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private RestrictionsViewCB(RestrictionsPM presentationModel, ViewLoader viewLoader, Stage primaryStage) {
super(presentationModel);
private RestrictionsViewCB(RestrictionsPM model, ViewLoader viewLoader, Stage primaryStage) {
super(model);
this.viewLoader = viewLoader;
this.primaryStage = primaryStage;
}
@ -90,16 +90,16 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
initCountry();
initArbitrators();
completedButton.disableProperty().bind(presentationModel.doneButtonDisable);
completedButton.disableProperty().bind(model.doneButtonDisable);
}
@Override
public void activate() {
super.activate();
languagesListView.setItems(presentationModel.getLanguageList());
countriesListView.setItems(presentationModel.getCountryList());
arbitratorsListView.setItems(presentationModel.getArbitratorList());
languagesListView.setItems(model.getLanguageList());
countriesListView.setItems(model.getCountryList());
arbitratorsListView.setItems(model.getArbitratorList());
}
@SuppressWarnings("EmptyMethod")
@ -132,7 +132,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
@FXML
private void onAddLanguage() {
presentationModel.addLanguage(languageComboBox.getSelectionModel().getSelectedItem());
model.addLanguage(languageComboBox.getSelectionModel().getSelectedItem());
languageComboBox.getSelectionModel().clearSelection();
}
@ -140,20 +140,20 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
private void onSelectRegion() {
countryComboBox.setVisible(true);
Region region = regionComboBox.getSelectionModel().getSelectedItem();
countryComboBox.setItems(presentationModel.getAllCountriesFor(region));
countryComboBox.setItems(model.getAllCountriesFor(region));
addAllEuroCountriesButton.setVisible(region.getCode().equals("EU"));
}
@FXML
private void onAddCountry() {
presentationModel.addCountry(countryComboBox.getSelectionModel().getSelectedItem());
model.addCountry(countryComboBox.getSelectionModel().getSelectedItem());
countryComboBox.getSelectionModel().clearSelection();
}
@FXML
private void onAddAllEuroCountries() {
countriesListView.setItems(presentationModel.getListWithAllEuroCountries());
countriesListView.setItems(model.getListWithAllEuroCountries());
}
@FXML
@ -219,8 +219,8 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
///////////////////////////////////////////////////////////////////////////////////////////
void updateArbitratorList() {
presentationModel.updateArbitratorList();
arbitratorsListView.setItems(presentationModel.getArbitratorList());
model.updateArbitratorList();
arbitratorsListView.setItems(model.getArbitratorList());
}
private void initLanguage() {
@ -255,7 +255,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
}
});
languageComboBox.setItems(presentationModel.getAllLanguages());
languageComboBox.setItems(model.getAllLanguages());
languageComboBox.setConverter(new StringConverter<Locale>() {
@Override
public String toString(Locale locale) {
@ -270,7 +270,7 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
}
private void initCountry() {
regionComboBox.setItems(presentationModel.getAllRegions());
regionComboBox.setItems(model.getAllRegions());
regionComboBox.setConverter(new StringConverter<io.bitsquare.locale.Region>() {
@Override
public String toString(io.bitsquare.locale.Region region) {
@ -361,15 +361,15 @@ public class RestrictionsViewCB extends CachedViewCB<RestrictionsPM> implements
}
private void removeLanguage(Locale locale) {
presentationModel.removeLanguage(locale);
model.removeLanguage(locale);
}
private void removeCountry(Country country) {
presentationModel.removeCountry(country);
model.removeCountry(country);
}
private void removeArbitrator(Arbitrator arbitrator) {
presentationModel.removeArbitrator(arbitrator);
model.removeArbitrator(arbitrator);
}

6
src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java
View File

@ -36,15 +36,13 @@ import javafx.scene.layout.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SeedWordsViewCB extends ViewCB implements ContextAware {
public class SeedWordsViewCB extends ViewCB<SeedWordsPM> implements ContextAware {
private static final Logger log = LoggerFactory.getLogger(SeedWordsViewCB.class);
@FXML Button completedButton;
@FXML TextArea seedWordsTextArea;
private final SeedWordsPM model;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
@ -52,7 +50,7 @@ public class SeedWordsViewCB extends ViewCB implements ContextAware {
@Inject
private SeedWordsViewCB(SeedWordsPM model) {
this.model = model;
super(model);
}

2
src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java
View File

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.account.setup;
import io.bitsquare.gui.Model;
import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.ViewCB;
import io.bitsquare.gui.ViewLoader;
@ -67,6 +68,7 @@ public class AccountSetupViewCB extends ViewCB implements MultiStepNavigation {
@Inject
private AccountSetupViewCB(ViewLoader viewLoader, Navigation navigation) {
super();
this.viewLoader = viewLoader;
this.navigation = navigation;
}

20
src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewCB.java
View File

@ -47,8 +47,8 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private ClosedTradesViewCB(ClosedTradesPM presentationModel) {
super(presentationModel);
private ClosedTradesViewCB(ClosedTradesPM model) {
super(model);
}
@ -75,7 +75,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
public void activate() {
super.activate();
table.setItems(presentationModel.getList());
table.setItems(model.getList());
}
@SuppressWarnings("EmptyMethod")
@ -124,9 +124,9 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
super.updateItem(item, empty);
if (item != null && !empty) {
hyperlink = new Hyperlink(presentationModel.getTradeId(item));
hyperlink = new Hyperlink(model.getTradeId(item));
hyperlink.setId("id-link");
Tooltip.install(hyperlink, new Tooltip(presentationModel.getTradeId(item)));
Tooltip.install(hyperlink, new Tooltip(model.getTradeId(item)));
hyperlink.setOnAction(event -> openOfferDetails(item));
setGraphic(hyperlink);
}
@ -153,7 +153,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
public void updateItem(final ClosedTradesListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null)
setText(presentationModel.getDate(item));
setText(model.getDate(item));
else
setText("");
}
@ -175,7 +175,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
@Override
public void updateItem(final ClosedTradesListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getAmount(item));
setText(model.getAmount(item));
}
};
}
@ -194,7 +194,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
@Override
public void updateItem(final ClosedTradesListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getPrice(item));
setText(model.getPrice(item));
}
};
}
@ -214,7 +214,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
public void updateItem(final ClosedTradesListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null)
setText(presentationModel.getVolume(item));
setText(model.getVolume(item));
else
setText("");
}
@ -235,7 +235,7 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
@Override
public void updateItem(final ClosedTradesListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getDirectionLabel(item));
setText(model.getDirectionLabel(item));
}
};
}

22
src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewCB.java
View File

@ -49,8 +49,8 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private OffersViewCB(OffersPM presentationModel) {
super(presentationModel);
private OffersViewCB(OffersPM model) {
super(model);
}
@ -78,7 +78,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
public void activate() {
super.activate();
table.setItems(presentationModel.getList());
table.setItems(model.getList());
}
@SuppressWarnings("EmptyMethod")
@ -99,7 +99,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
///////////////////////////////////////////////////////////////////////////////////////////
private void removeOffer(OfferListItem item) {
presentationModel.removeOffer(item);
model.removeOffer(item);
}
private void openOfferDetails(OfferListItem item) {
@ -133,9 +133,9 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
super.updateItem(item, empty);
if (item != null && !empty) {
hyperlink = new Hyperlink(presentationModel.getTradeId(item));
hyperlink = new Hyperlink(model.getTradeId(item));
hyperlink.setId("id-link");
Tooltip.install(hyperlink, new Tooltip(presentationModel.getTradeId(item)));
Tooltip.install(hyperlink, new Tooltip(model.getTradeId(item)));
hyperlink.setOnAction(event -> openOfferDetails(item));
setGraphic(hyperlink);
}
@ -162,7 +162,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null)
setText(presentationModel.getDate(item));
setText(model.getDate(item));
else
setText("");
}
@ -184,7 +184,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
@Override
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getAmount(item));
setText(model.getAmount(item));
}
};
}
@ -203,7 +203,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
@Override
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getPrice(item));
setText(model.getPrice(item));
}
};
}
@ -223,7 +223,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null)
setText(presentationModel.getVolume(item));
setText(model.getVolume(item));
else
setText("");
}
@ -244,7 +244,7 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
@Override
public void updateItem(final OfferListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getDirectionLabel(item));
setText(model.getDirectionLabel(item));
}
};
}

116
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
View File

@ -99,8 +99,8 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
PendingTradesViewCB(PendingTradesPM presentationModel, Navigation navigation) {
super(presentationModel);
PendingTradesViewCB(PendingTradesPM model, Navigation navigation) {
super(model);
this.navigation = navigation;
}
@ -123,11 +123,11 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
table.setPlaceholder(new Label("No pending trades available"));
txIdChangeListener = (ov, oldValue, newValue) ->
txIdTextField.setup(presentationModel.getWalletService(), newValue);
txIdTextField.setup(model.getWalletService(), newValue);
selectedItemChangeListener = (obsValue, oldValue, newValue) -> {
if (oldValue != null && newValue != null) {
presentationModel.selectTrade(newValue);
model.selectTrade(newValue);
updateScreen();
}
};
@ -143,8 +143,8 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
takerStateChangeListener = (ov, oldValue, newValue) -> applyTakerState(newValue);
faultChangeListener = (ov, oldValue, newValue) -> onFault(newValue);
withdrawAddressTextField.setValidator(presentationModel.getBtcAddressValidator());
withdrawButton.disableProperty().bind(presentationModel.withdrawalButtonDisable);
withdrawAddressTextField.setValidator(model.getBtcAddressValidator());
withdrawButton.disableProperty().bind(model.withdrawalButtonDisable);
super.initialize(url, rb);
}
@ -152,14 +152,14 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
public void activate() {
super.activate();
table.setItems(presentationModel.getList());
table.setItems(model.getList());
presentationModel.getList().addListener(listChangeListener);
presentationModel.txId.addListener(txIdChangeListener);
presentationModel.fault.addListener(faultChangeListener);
model.getList().addListener(listChangeListener);
model.txId.addListener(txIdChangeListener);
model.fault.addListener(faultChangeListener);
txIdTextField.setup(presentationModel.getWalletService(), presentationModel.txId.get());
table.getSelectionModel().select(presentationModel.getSelectedItem());
txIdTextField.setup(model.getWalletService(), model.txId.get());
table.getSelectionModel().select(model.getSelectedItem());
table.getSelectionModel().selectedItemProperty().addListener(selectedItemChangeListener);
// TODO Set focus to row does not work yet...
@ -168,7 +168,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
withdrawAddressTextField.focusedProperty().addListener((ov, oldValue, newValue) -> {
if (oldValue && !newValue)
presentationModel.withdrawAddressFocusOut(withdrawAddressTextField.getText());
model.withdrawAddressFocusOut(withdrawAddressTextField.getText());
});
updateScreen();
}
@ -178,12 +178,12 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
super.deactivate();
table.getSelectionModel().selectedItemProperty().removeListener(selectedItemChangeListener);
presentationModel.getList().removeListener(listChangeListener);
presentationModel.txId.removeListener(txIdChangeListener);
presentationModel.fault.removeListener(faultChangeListener);
model.getList().removeListener(listChangeListener);
model.txId.removeListener(txIdChangeListener);
model.fault.removeListener(faultChangeListener);
presentationModel.state.removeListener(offererStateChangeListener);
presentationModel.state.removeListener(takerStateChangeListener);
model.state.removeListener(offererStateChangeListener);
model.state.removeListener(takerStateChangeListener);
}
@ -193,18 +193,18 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
@FXML
void onPaymentStarted() {
presentationModel.fiatPaymentStarted();
model.fiatPaymentStarted();
}
@FXML
void onConfirmPaymentReceipt() {
presentationModel.fiatPaymentReceived();
model.fiatPaymentReceived();
}
@FXML
public void onWithdraw() {
setSummaryControlsVisible(false);
presentationModel.withdraw(withdrawAddressTextField.getText());
model.withdraw(withdrawAddressTextField.getText());
Platform.runLater(() ->
navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO,
Navigation.Item.CLOSED_TRADES));
@ -212,7 +212,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
@FXML
void onOpenHelp() {
Help.openWindow(presentationModel.isOfferer() ? HelpId.PENDING_TRADE_OFFERER : HelpId.PENDING_TRADE_TAKER);
Help.openWindow(model.isOfferer() ? HelpId.PENDING_TRADE_OFFERER : HelpId.PENDING_TRADE_TAKER);
}
@FXML
@ -240,7 +240,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
///////////////////////////////////////////////////////////////////////////////////////////
private void updateScreen() {
boolean dataAvailable = !presentationModel.getList().isEmpty();
boolean dataAvailable = !model.getList().isEmpty();
titledGroupBg.setVisible(dataAvailable);
processBar.setVisible(dataAvailable);
statusLabel.setVisible(dataAvailable);
@ -258,7 +258,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
infoDisplay.setManaged(dataAvailable);
if (dataAvailable) {
if (presentationModel.isOfferer())
if (model.isOfferer())
setupScreenForOfferer();
else
setupScreenForTaker();
@ -275,8 +275,8 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
processBar.setProcessStepItems(items);
}
presentationModel.state.addListener(offererStateChangeListener);
applyOffererState(presentationModel.state.get());
model.state.addListener(offererStateChangeListener);
applyOffererState(model.state.get());
}
private void setupScreenForTaker() {
@ -290,8 +290,8 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
processBar.setProcessStepItems(items);
}
presentationModel.state.addListener(takerStateChangeListener);
applyTakerState(presentationModel.state.get());
model.state.addListener(takerStateChangeListener);
applyTakerState(model.state.get());
}
private void applyOffererState(PendingTradesPM.State state) {
@ -321,26 +321,26 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
infoDisplay.setText("You are now safe to start the payment. You can wait for up to 6 block chain " +
"confirmations if you want more security.");
paymentMethodTextField.setText(presentationModel.getPaymentMethod());
fiatAmountTextField.setText(presentationModel.getFiatAmount());
holderNameTextField.setText(presentationModel.getHolderName());
primaryIdTextField.setText(presentationModel.getPrimaryId());
secondaryIdTextField.setText(presentationModel.getSecondaryId());
paymentMethodTextField.setText(model.getPaymentMethod());
fiatAmountTextField.setText(model.getFiatAmount());
holderNameTextField.setText(model.getHolderName());
primaryIdTextField.setText(model.getPrimaryId());
secondaryIdTextField.setText(model.getSecondaryId());
paymentsInfoDisplay.setText(BSResources.get("Copy and paste the payment account data to your " +
"internet banking web page and transfer the {0} amount to the other traders " +
"payment account. When the transfer is completed inform the other trader by " +
"clicking the button below.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
break;
case OFFERER_BUYER_WAIT_CONFIRM_PAYMENT_RECEIVED:
processBar.setSelectedIndex(2);
statusTextField.setText(BSResources.get("Waiting for the Bitcoin sellers confirmation " +
"that the {0} payment has arrived.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
infoDisplay.setText(BSResources.get("When the confirmation that the {0} payment arrived at the " +
"Bitcoin sellers payment account, the payout transaction will be published.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
break;
case OFFERER_BUYER_COMPLETED:
processBar.setSelectedIndex(3);
@ -354,14 +354,14 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
btcTradeAmountLabel.setText("You have bought:");
fiatTradeAmountLabel.setText("You have paid:");
btcTradeAmountTextField.setText(presentationModel.getTradeVolume());
fiatTradeAmountTextField.setText(presentationModel.getFiatVolume());
feesTextField.setText(presentationModel.getTotalFees());
securityDepositTextField.setText(presentationModel.getSecurityDeposit());
btcTradeAmountTextField.setText(model.getTradeVolume());
fiatTradeAmountTextField.setText(model.getFiatVolume());
feesTextField.setText(model.getTotalFees());
securityDepositTextField.setText(model.getSecurityDeposit());
summaryInfoDisplay.setText("Your security deposit has been refunded to you. " +
"You can review the details to that trade any time in the closed trades screen.");
withdrawAmountTextField.setText(presentationModel.getAmountToWithdraw());
withdrawAmountTextField.setText(model.getAmountToWithdraw());
break;
}
}
@ -388,7 +388,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
"That is needed to assure that the deposit input funding has not been " +
"double-spent. " +
"For higher trade volumes it is recommended to wait up to 6 confirmations.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
break;
case TAKER_SELLER_WAIT_PAYMENT_STARTED:
processBar.setSelectedIndex(1);
@ -396,10 +396,10 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
statusTextField.setText(BSResources.get("Deposit transaction has at least one block chain " +
"confirmation. " +
"Waiting that other trader starts the {0} payment.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
infoDisplay.setText(BSResources.get("You will get informed when the other trader has indicated " +
"the {0} payment has been started.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
break;
case TAKER_SELLER_CONFIRM_RECEIVE_PAYMENT:
processBar.setSelectedIndex(2);
@ -409,11 +409,11 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
statusTextField.setText(BSResources.get("The Bitcoin buyer has started the {0} payment." +
"Check your payments account and confirm when you have received the payment.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
infoDisplay.setText(BSResources.get("It is important that you confirm when you have received the " +
"{0} payment as this will publish the payout transaction where you get returned " +
"your security deposit and the Bitcoin buyer receive the Bitcoin amount you sold.",
presentationModel.getCurrencyCode()));
model.getCurrencyCode()));
break;
case TAKER_SELLER_COMPLETED:
@ -429,14 +429,14 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
btcTradeAmountLabel.setText("You have sold:");
fiatTradeAmountLabel.setText("You have received:");
btcTradeAmountTextField.setText(presentationModel.getTradeVolume());
fiatTradeAmountTextField.setText(presentationModel.getFiatVolume());
feesTextField.setText(presentationModel.getTotalFees());
securityDepositTextField.setText(presentationModel.getSecurityDeposit());
btcTradeAmountTextField.setText(model.getTradeVolume());
fiatTradeAmountTextField.setText(model.getFiatVolume());
feesTextField.setText(model.getTotalFees());
securityDepositTextField.setText(model.getSecurityDeposit());
summaryInfoDisplay.setText("Your security deposit has been refunded to you. " +
"You can review the details to that trade any time in the closed trades screen.");
withdrawAmountTextField.setText(presentationModel.getAmountToWithdraw());
withdrawAmountTextField.setText(model.getAmountToWithdraw());
break;
}
}
@ -552,9 +552,9 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
super.updateItem(id, empty);
if (id != null && !empty) {
hyperlink = new Hyperlink(presentationModel.formatTradeId(id));
hyperlink = new Hyperlink(model.formatTradeId(id));
hyperlink.setId("id-link");
Tooltip.install(hyperlink, new Tooltip(presentationModel.formatTradeId(id)));
Tooltip.install(hyperlink, new Tooltip(model.formatTradeId(id)));
hyperlink.setOnAction(event -> openOfferDetails(id));
setGraphic(hyperlink);
}
@ -574,7 +574,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
new StringConverter<Date>() {
@Override
public String toString(Date value) {
return presentationModel.formatDate(value);
return model.formatDate(value);
}
@Override
@ -589,7 +589,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
new StringConverter<Coin>() {
@Override
public String toString(Coin value) {
return presentationModel.formatTradeAmount(value);
return model.formatTradeAmount(value);
}
@Override
@ -604,7 +604,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
new StringConverter<Fiat>() {
@Override
public String toString(Fiat value) {
return presentationModel.formatPrice(value);
return model.formatPrice(value);
}
@Override
@ -620,7 +620,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
new StringConverter<Fiat>() {
@Override
public String toString(Fiat value) {
return presentationModel.formatTradeVolume(value);
return model.formatTradeVolume(value);
}
@Override
@ -643,7 +643,7 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
public void updateItem(final PendingTradesListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty)
setText(presentationModel.evaluateDirection(item));
setText(model.evaluateDirection(item));
else
setText(null);
}

14
src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewCB.java
View File

@ -47,8 +47,8 @@ public class PreferencesViewCB extends CachedViewCB<PreferencesPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private PreferencesViewCB(PreferencesPM presentationModel) {
super(presentationModel);
private PreferencesViewCB(PreferencesPM model) {
super(model);
}
@ -65,11 +65,11 @@ public class PreferencesViewCB extends CachedViewCB<PreferencesPM> {
public void activate() {
super.activate();
btcDenominationComboBox.setItems(presentationModel.getBtcDenominationItems());
btcDenominationComboBox.getSelectionModel().select(presentationModel.btcDenomination().get());
btcDenominationComboBox.setItems(model.getBtcDenominationItems());
btcDenominationComboBox.getSelectionModel().select(model.btcDenomination().get());
useAnimationsCheckBox.selectedProperty().bindBidirectional(presentationModel.useAnimations());
useEffectsCheckBox.selectedProperty().bindBidirectional(presentationModel.useEffects());
useAnimationsCheckBox.selectedProperty().bindBidirectional(model.useAnimations());
useEffectsCheckBox.selectedProperty().bindBidirectional(model.useEffects());
}
@ -94,6 +94,6 @@ public class PreferencesViewCB extends CachedViewCB<PreferencesPM> {
@FXML
void onSelectBtcDenomination() {
presentationModel.btcDenomination().set(btcDenominationComboBox.getSelectionModel().getSelectedItem());
model.btcDenomination().set(btcDenominationComboBox.getSelectionModel().getSelectedItem());
}
}

130
src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java
View File

@ -117,9 +117,9 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private CreateOfferViewCB(CreateOfferPM presentationModel, Navigation navigation,
private CreateOfferViewCB(CreateOfferPM model, Navigation navigation,
OverlayManager overlayManager) {
super(presentationModel);
super(model);
this.navigation = navigation;
this.overlayManager = overlayManager;
}
@ -135,9 +135,9 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
setupListeners();
setupBindings();
balanceTextField.setup(presentationModel.getWalletService(), presentationModel.address.get(),
presentationModel.getFormatter());
volumeTextField.setPromptText(BSResources.get("createOffer.volume.prompt", presentationModel.fiatCode.get()));
balanceTextField.setup(model.getWalletService(), model.address.get(),
model.getFormatter());
volumeTextField.setPromptText(BSResources.get("createOffer.volume.prompt", model.fiatCode.get()));
}
@SuppressWarnings("EmptyMethod")
@ -168,7 +168,7 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
///////////////////////////////////////////////////////////////////////////////////////////
public void initWithData(Direction direction, Coin amount, Fiat price) {
presentationModel.initWithData(direction, amount, price);
model.initWithData(direction, amount, price);
if (direction == Direction.BUY)
imageView.setId("image-buy-large");
@ -179,7 +179,7 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
public void configCloseHandlers(CloseListener closeListener, BooleanProperty tabIsClosable) {
this.closeListener = closeListener;
this.tabIsClosable = tabIsClosable;
tabIsClosable.bind(presentationModel.tabIsClosable);
tabIsClosable.bind(model.tabIsClosable);
}
@ -189,12 +189,12 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
@FXML
void onPlaceOffer() {
presentationModel.placeOffer();
model.placeOffer();
}
@FXML
void onShowPayFundsScreen() {
if (presentationModel.displaySecurityDepositInfo()) {
if (model.displaySecurityDepositInfo()) {
overlayManager.blurContent();
List<Action> actions = new ArrayList<>();
actions.add(new AbstractAction(BSResources.get("shared.close")) {
@ -211,7 +211,7 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
"\nIt will be refunded to you after the trade has successfully completed.",
actions);
presentationModel.securityDepositInfoDisplayed();
model.securityDepositInfoDisplayed();
}
@ -241,7 +241,7 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
setupTotalToPayInfoIconLabel();
presentationModel.onShowPayFundsScreen();
model.onShowPayFundsScreen();
}
@FXML
@ -303,60 +303,60 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
// focus out
amountTextField.focusedProperty().addListener((o, oldValue, newValue) -> {
presentationModel.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
amountTextField.setText(presentationModel.amount.get());
model.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
amountTextField.setText(model.amount.get());
});
minAmountTextField.focusedProperty().addListener((o, oldValue, newValue) -> {
presentationModel.onFocusOutMinAmountTextField(oldValue, newValue, minAmountTextField.getText());
minAmountTextField.setText(presentationModel.minAmount.get());
model.onFocusOutMinAmountTextField(oldValue, newValue, minAmountTextField.getText());
minAmountTextField.setText(model.minAmount.get());
});
priceTextField.focusedProperty().addListener((o, oldValue, newValue) -> {
presentationModel.onFocusOutPriceTextField(oldValue, newValue, priceTextField.getText());
priceTextField.setText(presentationModel.price.get());
model.onFocusOutPriceTextField(oldValue, newValue, priceTextField.getText());
priceTextField.setText(model.price.get());
});
volumeTextField.focusedProperty().addListener((o, oldValue, newValue) -> {
presentationModel.onFocusOutVolumeTextField(oldValue, newValue, volumeTextField.getText());
volumeTextField.setText(presentationModel.volume.get());
model.onFocusOutVolumeTextField(oldValue, newValue, volumeTextField.getText());
volumeTextField.setText(model.volume.get());
});
// warnings
presentationModel.showWarningInvalidBtcDecimalPlaces.addListener((o, oldValue, newValue) -> {
model.showWarningInvalidBtcDecimalPlaces.addListener((o, oldValue, newValue) -> {
if (newValue) {
Popups.openWarningPopup(BSResources.get("shared.warning"),
BSResources.get("createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces"));
presentationModel.showWarningInvalidBtcDecimalPlaces.set(false);
model.showWarningInvalidBtcDecimalPlaces.set(false);
}
});
presentationModel.showWarningInvalidFiatDecimalPlaces.addListener((o, oldValue, newValue) -> {
model.showWarningInvalidFiatDecimalPlaces.addListener((o, oldValue, newValue) -> {
if (newValue) {
Popups.openWarningPopup(BSResources.get("shared.warning"),
BSResources.get("createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces"));
presentationModel.showWarningInvalidFiatDecimalPlaces.set(false);
model.showWarningInvalidFiatDecimalPlaces.set(false);
}
});
presentationModel.showWarningAdjustedVolume.addListener((o, oldValue, newValue) -> {
model.showWarningAdjustedVolume.addListener((o, oldValue, newValue) -> {
if (newValue) {
Popups.openWarningPopup(BSResources.get("shared.warning"),
BSResources.get("createOffer.amountPriceBox.warning.adjustedVolume"));
presentationModel.showWarningAdjustedVolume.set(false);
volumeTextField.setText(presentationModel.volume.get());
model.showWarningAdjustedVolume.set(false);
volumeTextField.setText(model.volume.get());
}
});
presentationModel.requestPlaceOfferErrorMessage.addListener((o, oldValue, newValue) -> {
model.requestPlaceOfferErrorMessage.addListener((o, oldValue, newValue) -> {
if (newValue != null) {
Popups.openErrorPopup(BSResources.get("shared.error"),
BSResources.get("createOffer.amountPriceBox.error.message",
presentationModel.requestPlaceOfferErrorMessage.get()));
model.requestPlaceOfferErrorMessage.get()));
}
});
presentationModel.showTransactionPublishedScreen.addListener((o, oldValue, newValue) -> {
model.showTransactionPublishedScreen.addListener((o, oldValue, newValue) -> {
if (newValue) {
overlayManager.blurContent();
@ -367,7 +367,7 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
@Override
public void handle(ActionEvent actionEvent) {
getProperties().put("type", "COPY");
Utilities.copyToClipboard(presentationModel.transactionId.get());
Utilities.copyToClipboard(model.transactionId.get());
}
});*/
actions.add(new AbstractAction(BSResources.get("shared.close")) {
@ -392,54 +392,54 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
}
private void setupBindings() {
amountBtcLabel.textProperty().bind(presentationModel.btcCode);
priceFiatLabel.textProperty().bind(presentationModel.fiatCode);
volumeFiatLabel.textProperty().bind(presentationModel.fiatCode);
minAmountBtcLabel.textProperty().bind(presentationModel.btcCode);
amountBtcLabel.textProperty().bind(model.btcCode);
priceFiatLabel.textProperty().bind(model.fiatCode);
volumeFiatLabel.textProperty().bind(model.fiatCode);
minAmountBtcLabel.textProperty().bind(model.btcCode);
priceDescriptionLabel.textProperty().bind(createStringBinding(() ->
BSResources.get("createOffer.amountPriceBox.priceDescription",
presentationModel.fiatCode.get()),
presentationModel.fiatCode));
model.fiatCode.get()),
model.fiatCode));
volumeDescriptionLabel.textProperty().bind(createStringBinding(() ->
BSResources.get("createOffer.amountPriceBox.volumeDescription",
presentationModel.fiatCode.get()),
presentationModel.fiatCode));
model.fiatCode.get()),
model.fiatCode));
buyLabel.textProperty().bind(presentationModel.directionLabel);
buyLabel.textProperty().bind(model.directionLabel);
amountTextField.textProperty().bindBidirectional(presentationModel.amount);
minAmountTextField.textProperty().bindBidirectional(presentationModel.minAmount);
priceTextField.textProperty().bindBidirectional(presentationModel.price);
volumeTextField.textProperty().bindBidirectional(presentationModel.volume);
amountTextField.textProperty().bindBidirectional(model.amount);
minAmountTextField.textProperty().bindBidirectional(model.minAmount);
priceTextField.textProperty().bindBidirectional(model.price);
volumeTextField.textProperty().bindBidirectional(model.volume);
totalToPayTextField.textProperty().bind(presentationModel.totalToPay);
totalToPayTextField.textProperty().bind(model.totalToPay);
addressTextField.amountAsCoinProperty().bind(presentationModel.totalToPayAsCoin);
addressTextField.paymentLabelProperty().bind(presentationModel.paymentLabel);
addressTextField.addressProperty().bind(presentationModel.addressAsString);
addressTextField.amountAsCoinProperty().bind(model.totalToPayAsCoin);
addressTextField.paymentLabelProperty().bind(model.paymentLabel);
addressTextField.addressProperty().bind(model.addressAsString);
bankAccountTypeTextField.textProperty().bind(presentationModel.bankAccountType);
bankAccountCurrencyTextField.textProperty().bind(presentationModel.bankAccountCurrency);
bankAccountCountyTextField.textProperty().bind(presentationModel.bankAccountCounty);
bankAccountTypeTextField.textProperty().bind(model.bankAccountType);
bankAccountCurrencyTextField.textProperty().bind(model.bankAccountCurrency);
bankAccountCountyTextField.textProperty().bind(model.bankAccountCounty);
acceptedCountriesTextField.textProperty().bind(presentationModel.acceptedCountries);
acceptedLanguagesTextField.textProperty().bind(presentationModel.acceptedLanguages);
acceptedArbitratorsTextField.textProperty().bind(presentationModel.acceptedArbitrators);
acceptedCountriesTextField.textProperty().bind(model.acceptedCountries);
acceptedLanguagesTextField.textProperty().bind(model.acceptedLanguages);
acceptedArbitratorsTextField.textProperty().bind(model.acceptedArbitrators);
// Validation
amountTextField.validationResultProperty().bind(presentationModel.amountValidationResult);
minAmountTextField.validationResultProperty().bind(presentationModel.minAmountValidationResult);
priceTextField.validationResultProperty().bind(presentationModel.priceValidationResult);
volumeTextField.validationResultProperty().bind(presentationModel.volumeValidationResult);
amountTextField.validationResultProperty().bind(model.amountValidationResult);
minAmountTextField.validationResultProperty().bind(model.minAmountValidationResult);
priceTextField.validationResultProperty().bind(model.priceValidationResult);
volumeTextField.validationResultProperty().bind(model.volumeValidationResult);
// buttons
placeOfferButton.visibleProperty().bind(presentationModel.isPlaceOfferButtonVisible);
placeOfferButton.disableProperty().bind(presentationModel.isPlaceOfferButtonDisabled);
placeOfferButton.visibleProperty().bind(model.isPlaceOfferButtonVisible);
placeOfferButton.disableProperty().bind(model.isPlaceOfferButtonDisabled);
placeOfferSpinnerInfoLabel.visibleProperty().bind(presentationModel.isPlaceOfferSpinnerVisible);
placeOfferSpinnerInfoLabel.visibleProperty().bind(model.isPlaceOfferSpinnerVisible);
presentationModel.isPlaceOfferSpinnerVisible.addListener((ov, oldValue, newValue) -> {
model.isPlaceOfferSpinnerVisible.addListener((ov, oldValue, newValue) -> {
placeOfferSpinner.setProgress(newValue ? -1 : 0);
placeOfferSpinner.setVisible(newValue);
});
@ -535,18 +535,18 @@ public class CreateOfferViewCB extends CachedViewCB<CreateOfferPM> {
addPayInfoEntry(infoGridPane, 0,
BSResources.get("createOffer.fundsBox.securityDeposit"),
presentationModel.securityDeposit.get());
model.securityDeposit.get());
addPayInfoEntry(infoGridPane, 1, BSResources.get("createOffer.fundsBox.offerFee"),
presentationModel.offerFee.get());
model.offerFee.get());
addPayInfoEntry(infoGridPane, 2, BSResources.get("createOffer.fundsBox.networkFee"),
presentationModel.networkFee.get());
model.networkFee.get());
Separator separator = new Separator();
separator.setOrientation(Orientation.HORIZONTAL);
separator.setStyle("-fx-background: #666;");
GridPane.setConstraints(separator, 1, 3);
infoGridPane.getChildren().add(separator);
addPayInfoEntry(infoGridPane, 4, BSResources.get("createOffer.fundsBox.total"),
presentationModel.totalToPay.get());
model.totalToPay.get());
totalToPayInfoPopover = new PopOver(infoGridPane);
if (totalToPayInfoIconLabel.getScene() != null) {
totalToPayInfoPopover.setDetachable(false);

68
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewCB.java
View File

@ -90,12 +90,12 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
OfferBookViewCB(OfferBookPM presentationModel,
OfferBookViewCB(OfferBookPM model,
Navigation navigation,
OverlayManager overlayManager,
OptionalBtcValidator optionalBtcValidator,
OptionalFiatValidator optionalFiatValidator) {
super(presentationModel);
super(model);
this.navigation = navigation;
this.overlayManager = overlayManager;
@ -150,10 +150,10 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
setupBindings();
// setOfferBookInfo has been called before
SortedList<OfferBookListItem> offerList = presentationModel.getOfferList();
SortedList<OfferBookListItem> offerList = model.getOfferList();
table.setItems(offerList);
offerList.comparatorProperty().bind(table.comparatorProperty());
priceColumn.setSortType((presentationModel.getDirection() == Direction.BUY) ?
priceColumn.setSortType((model.getDirection() == Direction.BUY) ?
TableColumn.SortType.ASCENDING : TableColumn.SortType.DESCENDING);
table.sort();
}
@ -188,7 +188,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
///////////////////////////////////////////////////////////////////////////////////////////
public void setDirection(Direction direction) {
presentationModel.setDirection(direction);
model.setDirection(direction);
}
@ -198,10 +198,10 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
@FXML
void createOffer() {
if (presentationModel.isRegistered()) {
if (model.isRegistered()) {
createOfferButton.setDisable(true);
((TradeNavigator) parent).createOffer(presentationModel.getAmountAsCoin(),
presentationModel.getPriceAsCoin());
((TradeNavigator) parent).createOffer(model.getAmountAsCoin(),
model.getPriceAsCoin());
}
else {
openSetupScreen();
@ -264,10 +264,10 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
private void takeOffer(Offer offer) {
if (presentationModel.isRegistered()) {
if (model.isRegistered()) {
if (offer.getDirection() == Direction.BUY) {
((TradeNavigator) parent).takeOffer(presentationModel.getAmountAsCoin(),
presentationModel.getPriceAsCoin(), offer);
((TradeNavigator) parent).takeOffer(model.getAmountAsCoin(),
model.getPriceAsCoin(), offer);
}
else {
Popups.openInfoPopup("Not implemented yet",
@ -352,23 +352,23 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
///////////////////////////////////////////////////////////////////////////////////////////
private void setupBindings() {
amountTextField.textProperty().bindBidirectional(presentationModel.amount);
priceTextField.textProperty().bindBidirectional(presentationModel.price);
volumeTextField.textProperty().bindBidirectional(presentationModel.volume);
amountBtcLabel.textProperty().bind(presentationModel.btcCode);
priceFiatLabel.textProperty().bind(presentationModel.fiatCode);
volumeFiatLabel.textProperty().bind(presentationModel.fiatCode);
priceDescriptionLabel.textProperty().bind(presentationModel.fiatCode);
volumeDescriptionLabel.textProperty().bind(presentationModel.fiatCode);//Price per Bitcoin in EUR
amountTextField.textProperty().bindBidirectional(model.amount);
priceTextField.textProperty().bindBidirectional(model.price);
volumeTextField.textProperty().bindBidirectional(model.volume);
amountBtcLabel.textProperty().bind(model.btcCode);
priceFiatLabel.textProperty().bind(model.fiatCode);
volumeFiatLabel.textProperty().bind(model.fiatCode);
priceDescriptionLabel.textProperty().bind(model.fiatCode);
volumeDescriptionLabel.textProperty().bind(model.fiatCode);//Price per Bitcoin in EUR
priceDescriptionLabel.textProperty().bind(createStringBinding(() ->
BSResources.get("Filter by price in {0}", presentationModel.fiatCode.get()),
presentationModel.fiatCode));
BSResources.get("Filter by price in {0}", model.fiatCode.get()),
model.fiatCode));
volumeDescriptionLabel.textProperty().bind(createStringBinding(() ->
BSResources.get("Filter by amount in {0}", presentationModel.fiatCode.get()),
presentationModel.fiatCode));
BSResources.get("Filter by amount in {0}", model.fiatCode.get()),
model.fiatCode));
volumeTextField.promptTextProperty().bind(createStringBinding(() ->
BSResources.get("Amount in {0}", presentationModel.fiatCode.get()),
presentationModel.fiatCode));
BSResources.get("Amount in {0}", model.fiatCode.get()),
model.fiatCode));
}
private void removeBindings() {
@ -419,7 +419,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getAmount(item));
setText(model.getAmount(item));
}
};
}
@ -438,7 +438,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getPrice(item));
setText(model.getPrice(item));
}
};
}
@ -457,7 +457,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
setText(presentationModel.getVolume(item));
setText(model.getVolume(item));
}
};
}
@ -483,7 +483,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
}
private void verifyIfTradable(final OfferBookListItem item) {
boolean isMatchingRestrictions = presentationModel.isTradable(item
boolean isMatchingRestrictions = model.isTradable(item
.getOffer());
button.setDisable(!isMatchingRestrictions);
@ -504,7 +504,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
if (tableRow != null) {
getTableRow().setTooltip(new Tooltip("Click for more information."));
getTableRow().setOnMouseClicked((e) -> openRestrictionsWarning
(presentationModel.restrictionsInfo.get()));
(model.restrictionsInfo.get()));
}
}
}
@ -517,10 +517,10 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
String title;
Offer offer = item.getOffer();
if (presentationModel.isMyOffer(offer)) {
if (model.isMyOffer(offer)) {
iconView.setId("image-remove");
title = "Remove";
button.setOnAction(event -> presentationModel.removeOffer(item
button.setOnAction(event -> model.removeOffer(item
.getOffer()));
}
else {
@ -528,7 +528,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
iconView.setId("image-buy");
else
iconView.setId("image-sell");
title = presentationModel.getDirectionLabel(offer);
title = model.getDirectionLabel(offer);
button.setOnAction(event -> takeOffer(item.getOffer()));
}
@ -595,7 +595,7 @@ public class OfferBookViewCB extends CachedViewCB<OfferBookPM> {
@Override
public void updateItem(final OfferBookListItem offerBookListItem, boolean empty) {
super.updateItem(offerBookListItem, empty);
setText(presentationModel.getBankAccountType(offerBookListItem));
setText(model.getBankAccountType(offerBookListItem));
}
};
}

94
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewCB.java
View File

@ -112,9 +112,9 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private TakeOfferViewCB(TakeOfferPM presentationModel, Navigation navigation,
private TakeOfferViewCB(TakeOfferPM model, Navigation navigation,
OverlayManager overlayManager) {
super(presentationModel);
super(model);
this.navigation = navigation;
this.overlayManager = overlayManager;
@ -158,7 +158,7 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
///////////////////////////////////////////////////////////////////////////////////////////
public void initWithData(Direction direction, Coin amount, Offer offer) {
presentationModel.initWithData(direction, amount, offer);
model.initWithData(direction, amount, offer);
if (direction == Direction.BUY)
imageView.setId("image-buy-large");
@ -166,31 +166,31 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
imageView.setId("image-sell-large");
priceDescriptionLabel.setText(BSResources.get("takeOffer.amountPriceBox.priceDescription",
presentationModel.getFiatCode()));
model.getFiatCode()));
volumeDescriptionLabel.setText(BSResources.get("takeOffer.amountPriceBox.volumeDescription",
presentationModel.getFiatCode()));
model.getFiatCode()));
balanceTextField.setup(presentationModel.getWalletService(), presentationModel.address.get(),
presentationModel.getFormatter());
balanceTextField.setup(model.getWalletService(), model.address.get(),
model.getFormatter());
buyLabel.setText(presentationModel.getDirectionLabel());
amountRangeTextField.setText(presentationModel.getAmountRange());
priceTextField.setText(presentationModel.getPrice());
addressTextField.setPaymentLabel(presentationModel.getPaymentLabel());
addressTextField.setAddress(presentationModel.getAddressAsString());
bankAccountTypeTextField.setText(presentationModel.getBankAccountType());
bankAccountTypeTextField.setText(presentationModel.getBankAccountType());
bankAccountCurrencyTextField.setText(presentationModel.getBankAccountCurrency());
bankAccountCountyTextField.setText(presentationModel.getBankAccountCounty());
acceptedCountriesTextField.setText(presentationModel.getAcceptedCountries());
acceptedLanguagesTextField.setText(presentationModel.getAcceptedLanguages());
acceptedArbitratorsTextField.setText(presentationModel.getAcceptedArbitrators());
buyLabel.setText(model.getDirectionLabel());
amountRangeTextField.setText(model.getAmountRange());
priceTextField.setText(model.getPrice());
addressTextField.setPaymentLabel(model.getPaymentLabel());
addressTextField.setAddress(model.getAddressAsString());
bankAccountTypeTextField.setText(model.getBankAccountType());
bankAccountTypeTextField.setText(model.getBankAccountType());
bankAccountCurrencyTextField.setText(model.getBankAccountCurrency());
bankAccountCountyTextField.setText(model.getBankAccountCounty());
acceptedCountriesTextField.setText(model.getAcceptedCountries());
acceptedLanguagesTextField.setText(model.getAcceptedLanguages());
acceptedArbitratorsTextField.setText(model.getAcceptedArbitrators());
}
public void setCloseListener(CloseListener closeListener, BooleanProperty tabIsClosable) {
this.closeListener = closeListener;
this.tabIsClosable = tabIsClosable;
tabIsClosable.bind(presentationModel.tabIsClosable);
tabIsClosable.bind(model.tabIsClosable);
}
@ -200,13 +200,13 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
@FXML
void onTakeOffer() {
presentationModel.takeOffer();
model.takeOffer();
}
@FXML
void onShowPayFundsScreen() {
if (presentationModel.displaySecurityDepositInfo()) {
if (model.displaySecurityDepositInfo()) {
overlayManager.blurContent();
List<Action> actions = new ArrayList<>();
actions.add(new AbstractAction(BSResources.get("shared.close")) {
@ -223,7 +223,7 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
"\nIt will be refunded to you after the trade has successfully completed.",
actions);
presentationModel.securityDepositInfoDisplayed();
model.securityDepositInfoDisplayed();
}
priceAmountPane.setInactive();
@ -252,7 +252,7 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
setupTotalToPayInfoIconLabel();
presentationModel.onShowPayFundsScreen();
model.onShowPayFundsScreen();
}
@FXML
@ -305,28 +305,28 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
// focus out
amountTextField.focusedProperty().addListener((o, oldValue, newValue) -> {
presentationModel.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
amountTextField.setText(presentationModel.amount.get());
model.onFocusOutAmountTextField(oldValue, newValue, amountTextField.getText());
amountTextField.setText(model.amount.get());
});
// warnings
presentationModel.showWarningInvalidBtcDecimalPlaces.addListener((o, oldValue, newValue) -> {
model.showWarningInvalidBtcDecimalPlaces.addListener((o, oldValue, newValue) -> {
if (newValue) {
Popups.openWarningPopup(BSResources.get("shared.warning"),
BSResources.get("takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces"));
presentationModel.showWarningInvalidBtcDecimalPlaces.set(false);
model.showWarningInvalidBtcDecimalPlaces.set(false);
}
});
presentationModel.requestTakeOfferErrorMessage.addListener((o, oldValue, newValue) -> {
model.requestTakeOfferErrorMessage.addListener((o, oldValue, newValue) -> {
if (newValue != null) {
Popups.openErrorPopup(BSResources.get("shared.error"),
BSResources.get("takeOffer.amountPriceBox.error.message",
presentationModel.requestTakeOfferErrorMessage.get()));
model.requestTakeOfferErrorMessage.get()));
}
});
presentationModel.showTransactionPublishedScreen.addListener((o, oldValue, newValue) -> {
model.showTransactionPublishedScreen.addListener((o, oldValue, newValue) -> {
if (newValue) {
overlayManager.blurContent();
@ -337,7 +337,7 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
@Override
public void handle(ActionEvent actionEvent) {
getProperties().put("type", "COPY");
Utilities.copyToClipboard(presentationModel.transactionId.get());
Utilities.copyToClipboard(model.transactionId.get());
}
});*/
actions.add(new AbstractAction(BSResources.get("shared.close")) {
@ -364,22 +364,22 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
}
private void setupBindings() {
amountBtcLabel.textProperty().bind(presentationModel.btcCode);
amountTextField.textProperty().bindBidirectional(presentationModel.amount);
volumeTextField.textProperty().bindBidirectional(presentationModel.volume);
totalToPayTextField.textProperty().bind(presentationModel.totalToPay);
addressTextField.amountAsCoinProperty().bind(presentationModel.totalToPayAsCoin);
amountBtcLabel.textProperty().bind(model.btcCode);
amountTextField.textProperty().bindBidirectional(model.amount);
volumeTextField.textProperty().bindBidirectional(model.volume);
totalToPayTextField.textProperty().bind(model.totalToPay);
addressTextField.amountAsCoinProperty().bind(model.totalToPayAsCoin);
// Validation
amountTextField.validationResultProperty().bind(presentationModel.amountValidationResult);
amountTextField.validationResultProperty().bind(model.amountValidationResult);
// buttons
takeOfferButton.visibleProperty().bind(presentationModel.isTakeOfferButtonVisible);
takeOfferButton.disableProperty().bind(presentationModel.isTakeOfferButtonDisabled);
takeOfferButton.visibleProperty().bind(model.isTakeOfferButtonVisible);
takeOfferButton.disableProperty().bind(model.isTakeOfferButtonDisabled);
takeOfferSpinnerInfoLabel.visibleProperty().bind(presentationModel.isTakeOfferSpinnerVisible);
takeOfferSpinnerInfoLabel.visibleProperty().bind(model.isTakeOfferSpinnerVisible);
presentationModel.isTakeOfferSpinnerVisible.addListener((ov, oldValue, newValue) -> {
model.isTakeOfferSpinnerVisible.addListener((ov, oldValue, newValue) -> {
takeOfferSpinner.setProgress(newValue ? -1 : 0);
takeOfferSpinner.setVisible(newValue);
});
@ -452,21 +452,21 @@ public class TakeOfferViewCB extends CachedViewCB<TakeOfferPM> {
addPayInfoEntry(infoGridPane, 0,
BSResources.get("takeOffer.fundsBox.amount"),
presentationModel.getAmount());
model.getAmount());
addPayInfoEntry(infoGridPane, 1,
BSResources.get("takeOffer.fundsBox.securityDeposit"),
presentationModel.securityDeposit.get());
model.securityDeposit.get());
addPayInfoEntry(infoGridPane, 2, BSResources.get("takeOffer.fundsBox.offerFee"),
presentationModel.getOfferFee());
model.getOfferFee());
addPayInfoEntry(infoGridPane, 3, BSResources.get("takeOffer.fundsBox.networkFee"),
presentationModel.getNetworkFee());
model.getNetworkFee());
Separator separator = new Separator();
separator.setOrientation(Orientation.HORIZONTAL);
separator.setStyle("-fx-background: #666;");
GridPane.setConstraints(separator, 1, 4);
infoGridPane.getChildren().add(separator);
addPayInfoEntry(infoGridPane, 5, BSResources.get("takeOffer.fundsBox.total"),
presentationModel.totalToPay.get());
model.totalToPay.get());
totalToPayInfoPopover = new PopOver(infoGridPane);
if (totalToPayInfoIconLabel.getScene() != null) {
totalToPayInfoPopover.setDetachable(false);