diff --git a/src/main/java/io/bitsquare/btc/FeePolicy.java b/src/main/java/io/bitsquare/btc/FeePolicy.java index 296c998f00..b57f791a5e 100644 --- a/src/main/java/io/bitsquare/btc/FeePolicy.java +++ b/src/main/java/io/bitsquare/btc/FeePolicy.java @@ -38,7 +38,7 @@ public class FeePolicy { // The remaining 0.0000454 BTC is given to miners at the moment as it is lower then dust. public static final Coin REGISTRATION_FEE = TX_FEE.add(TX_FEE); - public static final Coin CREATE_OFFER_FEE = Coin.MILLICOIN; // 0.001 + public static final Coin CREATE_OFFER_FEE = REGISTRATION_FEE; // 0.0002 public static final Coin TAKE_OFFER_FEE = CREATE_OFFER_FEE; private static final Logger log = LoggerFactory.getLogger(FeePolicy.class); diff --git a/src/main/java/io/bitsquare/gui/NavigationItem.java b/src/main/java/io/bitsquare/gui/NavigationItem.java index cc3a863005..a93580b94b 100644 --- a/src/main/java/io/bitsquare/gui/NavigationItem.java +++ b/src/main/java/io/bitsquare/gui/NavigationItem.java @@ -20,38 +20,48 @@ package io.bitsquare.gui; import io.bitsquare.gui.util.ImageUtil; public enum NavigationItem { + + // app MAIN("/io/bitsquare/gui/MainView.fxml"), + + // main menu screens HOME("/io/bitsquare/gui/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE), - BUY("/io/bitsquare/gui/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE), - SELL("/io/bitsquare/gui/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE), ORDERS("/io/bitsquare/gui/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE), FUNDS("/io/bitsquare/gui/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE), MSG("/io/bitsquare/gui/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE), SETTINGS("/io/bitsquare/gui/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE), - ACCOUNT("/io/bitsquare/gui/account/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE), + ACCOUNT("/io/bitsquare/gui/view/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE), + // trade ORDER_BOOK("/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml"), + BUY("/io/bitsquare/gui/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE), + SELL("/io/bitsquare/gui/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE), CREATE_OFFER("/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml"), TAKE_OFFER("/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml"), - //OFFERER_TRADE("/io/bitsquare/gui/orders/OffererTradeView.fxml"), + // orders OFFER("/io/bitsquare/gui/orders/offer/OfferView.fxml"), PENDING_TRADE("/io/bitsquare/gui/orders/pending/PendingTradeView.fxml"), CLOSED_TRADE("/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml"), + // funds + DEPOSIT("/io/bitsquare/gui/funds/deposit/DepositView.fxml"), WITHDRAWAL("/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml"), TRANSACTIONS("/io/bitsquare/gui/funds/transactions/TransactionsView.fxml"), - ACCOUNT_SETUP("/io/bitsquare/gui/account/setup/SetupView.fxml"), - ACCOUNT_SETTINGS("/io/bitsquare/gui/account/settings/AccountSettingsView.fxml"), - SEED_WORDS("/io/bitsquare/gui/account/seedwords/SeedWordsView.fxml"), - ADD_PASSWORD("/io/bitsquare/gui/account/addpassword/PasswordView.fxml"), - CHANGE_PASSWORD("/io/bitsquare/gui/account/changepassword/PasswordView.fxml"), - RESTRICTIONS("/io/bitsquare/gui/account/restrictions/RestrictionsView.fxml"), - REGISTRATION("/io/bitsquare/gui/account/registration/RegistrationView.fxml"), - FIAT_ACCOUNT("/io/bitsquare/gui/account/fiataccount/FiatAccountView.fxml"), + // account + ACCOUNT_SETUP("/io/bitsquare/gui/view/account/AccountSetupView.fxml"), + ACCOUNT_SETTINGS("/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), + // account content + SEED_WORDS("/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"), + ADD_PASSWORD("/io/bitsquare/gui/view/account/content/PasswordView.fxml"), + CHANGE_PASSWORD("/io/bitsquare/gui/view/account/content/PasswordView.fxml"), + RESTRICTIONS("/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"), + REGISTRATION("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), + FIAT_ACCOUNT("/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"), + // arbitrator ARBITRATOR_PROFILE("/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml"), ARBITRATOR_BROWSER("/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml"), ARBITRATOR_REGISTRATION("/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml"); diff --git a/src/main/java/io/bitsquare/gui/funds/FundsController.java b/src/main/java/io/bitsquare/gui/funds/FundsController.java index 956825bda2..85bd05a314 100644 --- a/src/main/java/io/bitsquare/gui/funds/FundsController.java +++ b/src/main/java/io/bitsquare/gui/funds/FundsController.java @@ -58,7 +58,8 @@ public class FundsController extends CachedViewController { public void initialize(URL url, ResourceBundle rb) { super.initialize(url, rb); - ((CachingTabPane) root).initialize(this, persistence, NavigationItem.WITHDRAWAL.getFxmlUrl(), + ((CachingTabPane) root).initialize( + this, persistence, NavigationItem.DEPOSIT.getFxmlUrl(), NavigationItem.WITHDRAWAL.getFxmlUrl(), NavigationItem.TRANSACTIONS.getFxmlUrl()); } diff --git a/src/main/java/io/bitsquare/gui/funds/FundsView.fxml b/src/main/java/io/bitsquare/gui/funds/FundsView.fxml index 1e9536afb0..d9acc082c2 100644 --- a/src/main/java/io/bitsquare/gui/funds/FundsView.fxml +++ b/src/main/java/io/bitsquare/gui/funds/FundsView.fxml @@ -24,6 +24,7 @@ AnchorPane.topAnchor="0.0" xmlns:fx="http://javafx.com/fxml"> + diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java b/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java new file mode 100644 index 0000000000..e14f8f2371 --- /dev/null +++ b/src/main/java/io/bitsquare/gui/funds/deposit/DepositController.java @@ -0,0 +1,246 @@ +/* + * 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 . + */ + +package io.bitsquare.gui.funds.deposit; + +import io.bitsquare.btc.AddressEntry; +import io.bitsquare.btc.WalletFacade; +import io.bitsquare.gui.CachedViewController; + +import java.net.URL; + +import java.util.List; +import java.util.ResourceBundle; +import java.util.stream.Collectors; + +import javax.inject.Inject; + +import javafx.beans.property.ReadOnlyObjectWrapper; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.scene.control.*; +import javafx.scene.input.*; +import javafx.util.Callback; + +import de.jensd.fx.fontawesome.AwesomeDude; +import de.jensd.fx.fontawesome.AwesomeIcon; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +// TODO: might be removed completely +public class DepositController extends CachedViewController { + private static final Logger log = LoggerFactory.getLogger(DepositController.class); + + private final WalletFacade walletFacade; + private ObservableList addressList; + + @FXML private TableView tableView; + @FXML private TableColumn labelColumn, addressColumn, balanceColumn, copyColumn, + confidenceColumn; + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Constructor + /////////////////////////////////////////////////////////////////////////////////////////// + + @Inject + private DepositController(WalletFacade walletFacade) { + this.walletFacade = walletFacade; + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Lifecycle + /////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void initialize(URL url, ResourceBundle rb) { + super.initialize(url, rb); + + tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY); + + setLabelColumnCellFactory(); + setBalanceColumnCellFactory(); + setCopyColumnCellFactory(); + setConfidenceColumnCellFactory(); + } + + @Override + public void deactivate() { + super.deactivate(); + + for (DepositListItem anAddressList : addressList) + anAddressList.cleanup(); + } + + @Override + public void activate() { + super.activate(); + + List addressEntryList = walletFacade.getAddressEntryList(); + addressList = FXCollections.observableArrayList(); + addressList.addAll(addressEntryList.stream().map(anAddressEntryList -> + new DepositListItem(anAddressEntryList, walletFacade)).collect(Collectors.toList())); + + tableView.setItems(addressList); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // UI handlers + /////////////////////////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Private methods + /////////////////////////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Cell factories + /////////////////////////////////////////////////////////////////////////////////////////// + + private void setLabelColumnCellFactory() { + labelColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper(addressListItem.getValue())); + labelColumn.setCellFactory(new Callback, TableCell>() { + + @Override + public TableCell call(TableColumn column) { + return new TableCell() { + + Hyperlink hyperlink; + + @Override + public void updateItem(final DepositListItem item, boolean empty) { + super.updateItem(item, empty); + + if (item != null && !empty) { + hyperlink = new Hyperlink(item.getLabel()); + hyperlink.setId("id-link"); + if (item.getAddressEntry().getOfferId() != null) { + Tooltip tooltip = new Tooltip(item.getAddressEntry().getOfferId()); + Tooltip.install(hyperlink, tooltip); + + hyperlink.setOnAction(event -> + log.info("Show trade details " + item.getAddressEntry().getOfferId())); + } + setGraphic(hyperlink); + } + else { + setGraphic(null); + setId(null); + } + } + }; + } + }); + } + + private void setBalanceColumnCellFactory() { + balanceColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper(addressListItem.getValue())); + balanceColumn.setCellFactory( + new Callback, TableCell>() { + + @Override + public TableCell call(TableColumn column) { + return new TableCell() { + @Override + public void updateItem(final DepositListItem item, boolean empty) { + super.updateItem(item, empty); + + if (item != null && !empty) { + setGraphic(item.getBalanceLabel()); + } + else { + setGraphic(null); + } + } + }; + } + }); + } + + private void setCopyColumnCellFactory() { + copyColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper(addressListItem.getValue())); + copyColumn.setCellFactory( + new Callback, TableCell>() { + + @Override + public TableCell call(TableColumn column) { + return new TableCell() { + final Label copyIcon = new Label(); + + { + copyIcon.getStyleClass().add("copy-icon"); + AwesomeDude.setIcon(copyIcon, AwesomeIcon.COPY); + Tooltip.install(copyIcon, new Tooltip("Copy address to clipboard")); + } + + @Override + public void updateItem(final DepositListItem item, boolean empty) { + super.updateItem(item, empty); + + if (item != null && !empty) { + setGraphic(copyIcon); + copyIcon.setOnMouseClicked(e -> { + Clipboard clipboard = Clipboard.getSystemClipboard(); + ClipboardContent content = new ClipboardContent(); + content.putString(item.addressStringProperty().get()); + clipboard.setContent(content); + }); + + } + else { + setGraphic(null); + } + } + }; + } + }); + } + + private void setConfidenceColumnCellFactory() { + confidenceColumn.setCellValueFactory((addressListItem) -> new ReadOnlyObjectWrapper(addressListItem.getValue + ())); + confidenceColumn.setCellFactory(new Callback, TableCell>() { + + @Override + public TableCell call(TableColumn column) { + return new TableCell() { + + @Override + public void updateItem(final DepositListItem item, boolean empty) { + super.updateItem(item, empty); + + if (item != null && !empty) { + setGraphic(item.getProgressIndicator()); + } + else { + setGraphic(null); + } + } + }; + } + }); + } + +} + diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java b/src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java new file mode 100644 index 0000000000..9f443f97de --- /dev/null +++ b/src/main/java/io/bitsquare/gui/funds/deposit/DepositListItem.java @@ -0,0 +1,29 @@ +/* + * 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 . + */ + +package io.bitsquare.gui.funds.deposit; + +import io.bitsquare.btc.AddressEntry; +import io.bitsquare.btc.WalletFacade; +import io.bitsquare.gui.funds.withdrawal.WithdrawalListItem; + +public class DepositListItem extends WithdrawalListItem { + public DepositListItem(AddressEntry addressEntry, WalletFacade walletFacade) { + super(addressEntry, walletFacade); + } + +} diff --git a/src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml b/src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml new file mode 100644 index 0000000000..98030250a2 --- /dev/null +++ b/src/main/java/io/bitsquare/gui/funds/deposit/DepositView.fxml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/io/bitsquare/gui/account/AccountModel.java b/src/main/java/io/bitsquare/gui/model/AccountModel.java similarity index 95% rename from src/main/java/io/bitsquare/gui/account/AccountModel.java rename to src/main/java/io/bitsquare/gui/model/AccountModel.java index cd59dd5f4e..b8351f39ed 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountModel.java +++ b/src/main/java/io/bitsquare/gui/model/AccountModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.model; import io.bitsquare.gui.UIModel; import io.bitsquare.user.User; @@ -25,7 +25,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class AccountModel extends UIModel { +public class AccountModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(AccountModel.class); private final User user; @@ -54,7 +54,7 @@ class AccountModel extends UIModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - boolean getNeedRegistration() { + public boolean getNeedRegistration() { return user.getAccountId() == null; } diff --git a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java b/src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java similarity index 96% rename from src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java rename to src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java index 72a708a69e..0a92b4d454 100644 --- a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/AccountSettingsModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.settings; +package io.bitsquare.gui.model.account; import io.bitsquare.gui.UIModel; @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class AccountSettingsModel extends UIModel { +public class AccountSettingsModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(AccountSettingsModel.class); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupModel.java b/src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java similarity index 91% rename from src/main/java/io/bitsquare/gui/account/setup/SetupModel.java rename to src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java index 9d89b6a839..8398dce6ed 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/AccountSetupModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.setup; +package io.bitsquare.gui.model.account; import io.bitsquare.gui.UIModel; @@ -24,15 +24,15 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class SetupModel extends UIModel { - private static final Logger log = LoggerFactory.getLogger(SetupModel.class); +public class AccountSetupModel extends UIModel { + private static final Logger log = LoggerFactory.getLogger(AccountSetupModel.class); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private SetupModel() { + private AccountSetupModel() { } diff --git a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java b/src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java similarity index 61% rename from src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java rename to src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java index 649c8ef9bf..b09eb191f2 100644 --- a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/content/ChangePasswordModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.changepassword; +package io.bitsquare.gui.model.account.content; import io.bitsquare.gui.UIModel; @@ -24,47 +24,55 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class PasswordModel extends UIModel { - private static final Logger log = LoggerFactory.getLogger(PasswordModel.class); +public class ChangePasswordModel extends UIModel { + private static final Logger log = LoggerFactory.getLogger(ChangePasswordModel.class); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private PasswordModel() { + private ChangePasswordModel() { } - void savePassword(String password) { + + /////////////////////////////////////////////////////////////////////////////////////////// + // Lifecycle + /////////////////////////////////////////////////////////////////////////////////////////// + + @SuppressWarnings("EmptyMethod") + @Override + public void initialized() { + super.initialized(); + } + + @Override + public void activate() { + super.activate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void deactivate() { + super.deactivate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void terminate() { + super.terminate(); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Public + /////////////////////////////////////////////////////////////////////////////////////////// + + @SuppressWarnings("EmptyMethod") + public void savePassword(String password) { //TODO Implement password encryption for wallet } - - /////////////////////////////////////////////////////////////////////////////////////////// - // Public methods - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Interface implementation: Initializable - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Getters - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Setters - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Private methods - /////////////////////////////////////////////////////////////////////////////////////////// - - } diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java b/src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java similarity index 76% rename from src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java rename to src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java index fcdecc0454..ca27772d44 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/content/FiatAccountModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.fiataccount; +package io.bitsquare.gui.model.account.content; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; @@ -44,29 +44,30 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class FiatAccountModel extends UIModel { +public class FiatAccountModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(FiatAccountModel.class); private final User user; private final Settings settings; private final Persistence persistence; - final StringProperty title = new SimpleStringProperty(); - final StringProperty holderName = new SimpleStringProperty(); - final StringProperty primaryID = new SimpleStringProperty(); - final StringProperty secondaryID = new SimpleStringProperty(); - final StringProperty primaryIDPrompt = new SimpleStringProperty(); - final StringProperty secondaryIDPrompt = new SimpleStringProperty(); - final BooleanProperty countryNotInAcceptedCountriesList = new SimpleBooleanProperty(); - final ObjectProperty type = new SimpleObjectProperty<>(); - final ObjectProperty country = new SimpleObjectProperty<>(); - final ObjectProperty currency = new SimpleObjectProperty<>(); - final ObjectProperty currentBankAccount = new SimpleObjectProperty<>(); - final ObservableList allTypes = FXCollections.observableArrayList(BankAccountType + public final StringProperty title = new SimpleStringProperty(); + public final StringProperty holderName = new SimpleStringProperty(); + public final StringProperty primaryID = new SimpleStringProperty(); + public final StringProperty secondaryID = new SimpleStringProperty(); + public final StringProperty primaryIDPrompt = new SimpleStringProperty(); + public final StringProperty secondaryIDPrompt = new SimpleStringProperty(); + public final BooleanProperty countryNotInAcceptedCountriesList = new SimpleBooleanProperty(); + public final ObjectProperty type = new SimpleObjectProperty<>(); + public final ObjectProperty country = new SimpleObjectProperty<>(); + public final ObjectProperty currency = new SimpleObjectProperty<>(); + public final ObjectProperty currentBankAccount = new SimpleObjectProperty<>(); + public final ObservableList allTypes = FXCollections.observableArrayList(BankAccountType .getAllBankAccountTypes()); - final ObservableList allBankAccounts = FXCollections.observableArrayList(); - final ObservableList allCurrencies = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencies()); - final ObservableList allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); + public final ObservableList allBankAccounts = FXCollections.observableArrayList(); + public final ObservableList allCurrencies = FXCollections.observableArrayList(CurrencyUtil + .getAllCurrencies()); + public final ObservableList allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); /////////////////////////////////////////////////////////////////////////////////////////// @@ -85,6 +86,7 @@ class FiatAccountModel extends UIModel { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("EmptyMethod") @Override public void initialized() { super.initialized(); @@ -98,11 +100,13 @@ class FiatAccountModel extends UIModel { allBankAccounts.setAll(user.getBankAccounts()); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -110,10 +114,10 @@ class FiatAccountModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// - // Package scope + // Public /////////////////////////////////////////////////////////////////////////////////////////// - void saveBankAccount() { + public void saveBankAccount() { BankAccount bankAccount = new BankAccount(type.get(), currency.get(), country.get(), @@ -128,7 +132,7 @@ class FiatAccountModel extends UIModel { reset(); } - void removeBankAccount() { + public void removeBankAccount() { user.removeCurrentBankAccount(); saveUser(); allBankAccounts.setAll(user.getBankAccounts()); @@ -137,13 +141,13 @@ class FiatAccountModel extends UIModel { // We ask the user if he likes to add his own bank account country to the accepted country list if he has not // already added it before - void addCountryToAcceptedCountriesList() { + public void addCountryToAcceptedCountriesList() { settings.addAcceptedCountry(country.get()); saveSettings(); countryNotInAcceptedCountriesList.set(false); } - void selectBankAccount(BankAccount bankAccount) { + public void selectBankAccount(BankAccount bankAccount) { currentBankAccount.set(bankAccount); user.setCurrentBankAccount(bankAccount); @@ -171,7 +175,7 @@ class FiatAccountModel extends UIModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - ObservableList getAllCountriesFor(Region selectedRegion) { + public ObservableList getAllCountriesFor(Region selectedRegion) { return FXCollections.observableArrayList(CountryUtil.getAllCountriesFor(selectedRegion)); } @@ -180,7 +184,7 @@ class FiatAccountModel extends UIModel { // Setters /////////////////////////////////////////////////////////////////////////////////////////// - void setType(BankAccountType type) { + public void setType(BankAccountType type) { this.type.set(type); if (type != null) { @@ -193,11 +197,11 @@ class FiatAccountModel extends UIModel { } } - void setCountry(Country country) { + public void setCountry(Country country) { this.country.set(country); } - void setCurrency(Currency currency) { + public void setCurrency(Currency currency) { this.currency.set(currency); } diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java b/src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java similarity index 66% rename from src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java rename to src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java index 18da311b8f..d479201626 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/content/PasswordModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.addpassword; +package io.bitsquare.gui.model.account.content; import io.bitsquare.gui.UIModel; @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class PasswordModel extends UIModel { +public class PasswordModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(PasswordModel.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -33,38 +33,45 @@ class PasswordModel extends UIModel { @Inject private PasswordModel() { - } - void savePassword(String password) { + /////////////////////////////////////////////////////////////////////////////////////////// + // Lifecycle + /////////////////////////////////////////////////////////////////////////////////////////// + + @SuppressWarnings("EmptyMethod") + @Override + public void initialized() { + super.initialized(); + } + + @Override + public void activate() { + super.activate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void deactivate() { + super.deactivate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void terminate() { + super.terminate(); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Public + /////////////////////////////////////////////////////////////////////////////////////////// + + @SuppressWarnings("EmptyMethod") + public void savePassword(String password) { //TODO Implement password encryption for wallet } - /////////////////////////////////////////////////////////////////////////////////////////// - // Public methods - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Interface implementation: Initializable - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Getters - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Setters - /////////////////////////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////////////////////////// - // Private methods - /////////////////////////////////////////////////////////////////////////////////////////// - - } diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java b/src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java similarity index 91% rename from src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java rename to src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java index 07692b4b2c..fddfadc0f0 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/content/RegistrationModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.registration; +package io.bitsquare.gui.model.account.content; import io.bitsquare.btc.AddressEntry; import io.bitsquare.btc.FeePolicy; @@ -45,17 +45,17 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class RegistrationModel extends UIModel { +public class RegistrationModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(RegistrationModel.class); private final WalletFacade walletFacade; private final User user; private final Persistence persistence; - AddressEntry addressEntry; - final BooleanProperty isWalletFunded = new SimpleBooleanProperty(); - final BooleanProperty payFeeSuccess = new SimpleBooleanProperty(); + public AddressEntry addressEntry; + public final BooleanProperty isWalletFunded = new SimpleBooleanProperty(); + public final BooleanProperty payFeeSuccess = new SimpleBooleanProperty(); private String transactionId; - final StringProperty payFeeErrorMessage = new SimpleStringProperty(); + public final StringProperty payFeeErrorMessage = new SimpleStringProperty(); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor @@ -113,7 +113,7 @@ class RegistrationModel extends UIModel { // Methods /////////////////////////////////////////////////////////////////////////////////////////// - void payFee() { + public void payFee() { FutureCallback callback = new FutureCallback() { @Override public void onSuccess(@Nullable Transaction transaction) { @@ -148,15 +148,15 @@ class RegistrationModel extends UIModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - WalletFacade getWalletFacade() { + public WalletFacade getWalletFacade() { return walletFacade; } - Coin getFeeAsCoin() { + public Coin getFeeAsCoin() { return FeePolicy.REGISTRATION_FEE; } - String getTransactionId() { + public String getTransactionId() { return transactionId; } diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java b/src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java similarity index 79% rename from src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java rename to src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java index dfc5b751dd..96a40f1d70 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/content/RestrictionsModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.restrictions; +package io.bitsquare.gui.model.account.content; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.arbitrator.Reputation; @@ -45,7 +45,7 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class RestrictionsModel extends UIModel { +public class RestrictionsModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(RestrictionsModel.class); private final User user; @@ -53,12 +53,13 @@ class RestrictionsModel extends UIModel { private final Persistence persistence; private final MessageFacade messageFacade; - ObservableList languageList = FXCollections.observableArrayList(); - ObservableList countryList = FXCollections.observableArrayList(); - ObservableList arbitratorList = FXCollections.observableArrayList(); + public final ObservableList languageList = FXCollections.observableArrayList(); + public final ObservableList countryList = FXCollections.observableArrayList(); + public final ObservableList arbitratorList = FXCollections.observableArrayList(); - final ObservableList allLanguages = FXCollections.observableArrayList(LanguageUtil.getAllLanguageLocales()); - final ObservableList allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); + public final ObservableList allLanguages = FXCollections.observableArrayList(LanguageUtil + .getAllLanguageLocales()); + public final ObservableList allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); /////////////////////////////////////////////////////////////////////////////////////////// @@ -87,10 +88,6 @@ class RestrictionsModel extends UIModel { settings.applyPersistedSettings(persistedSettings); } else { - languageList = FXCollections.observableArrayList(new ArrayList<>()); - countryList = FXCollections.observableArrayList(new ArrayList<>()); - arbitratorList = FXCollections.observableArrayList(new ArrayList<>()); - if (Locale.getDefault() != null) { addLanguage(LanguageUtil.getDefaultLanguageLocale()); addCountry(CountryUtil.getDefaultCountry()); @@ -106,18 +103,19 @@ class RestrictionsModel extends UIModel { @Override public void activate() { super.activate(); - - languageList = FXCollections.observableArrayList(settings.getAcceptedLanguageLocales()); - countryList = FXCollections.observableArrayList(settings.getAcceptedCountries()); - arbitratorList = FXCollections.observableArrayList(settings.getAcceptedArbitrators()); + languageList.setAll(settings.getAcceptedLanguageLocales()); + countryList.setAll(settings.getAcceptedCountries()); + arbitratorList.setAll(settings.getAcceptedArbitrators()); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -125,31 +123,31 @@ class RestrictionsModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// - // Package scope + // Public /////////////////////////////////////////////////////////////////////////////////////////// - ObservableList getAllCountriesFor(Region selectedRegion) { + public ObservableList getAllCountriesFor(Region selectedRegion) { return FXCollections.observableArrayList(CountryUtil.getAllCountriesFor(selectedRegion)); } - void updateArbitratorList() { - arbitratorList = FXCollections.observableArrayList(settings.getAcceptedArbitrators()); + public void updateArbitratorList() { + arbitratorList.setAll(settings.getAcceptedArbitrators()); } - void addLanguage(Locale locale) { + public void addLanguage(Locale locale) { if (locale != null && !languageList.contains(locale)) { languageList.add(locale); settings.addAcceptedLanguageLocale(locale); } } - void removeLanguage(Locale locale) { + public void removeLanguage(Locale locale) { languageList.remove(locale); settings.removeAcceptedLanguageLocale(locale); saveSettings(); } - void addCountry(Country country) { + public void addCountry(Country country) { if (!countryList.contains(country) && country != null) { countryList.add(country); settings.addAcceptedCountry(country); @@ -157,22 +155,22 @@ class RestrictionsModel extends UIModel { } } - ObservableList getListWithAllEuroCountries() { + public ObservableList getListWithAllEuroCountries() { // TODO use Set instead of List // In addAcceptedCountry there is a check to no add duplicates, so it works correctly for now CountryUtil.getAllEuroCountries().stream().forEach(settings::addAcceptedCountry); - countryList = FXCollections.observableArrayList(settings.getAcceptedCountries()); + countryList.setAll(settings.getAcceptedCountries()); saveSettings(); return countryList; } - void removeCountry(Country country) { + public void removeCountry(Country country) { countryList.remove(country); settings.removeAcceptedCountry(country); saveSettings(); } - void removeArbitrator(Arbitrator arbitrator) { + public void removeArbitrator(Arbitrator arbitrator) { arbitratorList.remove(arbitrator); settings.removeAcceptedArbitrator(arbitrator); saveSettings(); diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java b/src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java similarity index 91% rename from src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java rename to src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java index ef40dfcf98..f052600592 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java +++ b/src/main/java/io/bitsquare/gui/model/account/content/SeedWordsModel.java @@ -15,7 +15,7 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.seedwords; +package io.bitsquare.gui.model.account.content; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.UIModel; @@ -27,10 +27,10 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class SeedWordsModel extends UIModel { +public class SeedWordsModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(SeedWordsModel.class); - List mnemonicCode; + public List mnemonicCode; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/account/AccountPm.java b/src/main/java/io/bitsquare/gui/pm/AccountPM.java similarity index 92% rename from src/main/java/io/bitsquare/gui/account/AccountPm.java rename to src/main/java/io/bitsquare/gui/pm/AccountPM.java index df59105655..9baf3f381b 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountPm.java +++ b/src/main/java/io/bitsquare/gui/pm/AccountPM.java @@ -15,16 +15,17 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.pm; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.AccountModel; import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class AccountPM extends PresentationModel { +public class AccountPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(AccountPM.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -51,7 +52,7 @@ class AccountPM extends PresentationModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - boolean getNeedRegistration() { + public boolean getNeedRegistration() { return model.getNeedRegistration(); } diff --git a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java b/src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java similarity index 92% rename from src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java rename to src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java index 164f65ac29..8725cf5294 100644 --- a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java +++ b/src/main/java/io/bitsquare/gui/pm/account/AccountSettingsPM.java @@ -15,16 +15,17 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.settings; +package io.bitsquare.gui.pm.account; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.AccountSettingsModel; import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class AccountSettingsPM extends PresentationModel { +public class AccountSettingsPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(AccountSettingsPM.class); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupPm.java b/src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java similarity index 87% rename from src/main/java/io/bitsquare/gui/account/setup/SetupPm.java rename to src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java index 05421af526..0915a504b3 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupPm.java +++ b/src/main/java/io/bitsquare/gui/pm/account/AccountSetupPM.java @@ -15,24 +15,25 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.setup; +package io.bitsquare.gui.pm.account; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.AccountSetupModel; import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class SetupPM extends PresentationModel { - private static final Logger log = LoggerFactory.getLogger(SetupPM.class); +public class AccountSetupPM extends PresentationModel { + private static final Logger log = LoggerFactory.getLogger(AccountSetupPM.class); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private SetupPM(SetupModel model) { + private AccountSetupPM(AccountSetupModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java b/src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java similarity index 64% rename from src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java rename to src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java index 1f79a0af49..167ce80648 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/pm/account/content/ChangePasswordPM.java @@ -15,9 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.addpassword; +package io.bitsquare.gui.pm.account.content; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.content.ChangePasswordModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; @@ -31,22 +32,22 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class PasswordPM extends PresentationModel { - private static final Logger log = LoggerFactory.getLogger(PasswordPM.class); +public class ChangePasswordPM extends PresentationModel { + private static final Logger log = LoggerFactory.getLogger(ChangePasswordPM.class); private final PasswordValidator passwordValidator = new PasswordValidator(); - String errorMessage; - final StringProperty passwordField = new SimpleStringProperty(); - final StringProperty repeatedPasswordField = new SimpleStringProperty(); - final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); + private String errorMessage; + public final StringProperty passwordField = new SimpleStringProperty(); + public final StringProperty repeatedPasswordField = new SimpleStringProperty(); + public final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private PasswordPM(PasswordModel model) { + private ChangePasswordPM(ChangePasswordModel model) { super(model); passwordField.addListener((ov) -> saveButtonDisabled.set(!validate())); @@ -58,12 +59,35 @@ class PasswordPM extends PresentationModel { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("EmptyMethod") @Override public void initialized() { super.initialized(); } - boolean savePassword() { + @Override + public void activate() { + super.activate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void deactivate() { + super.deactivate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void terminate() { + super.terminate(); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Public + /////////////////////////////////////////////////////////////////////////////////////////// + + public boolean savePassword() { if (validate()) { model.savePassword(passwordField.get()); return true; @@ -71,7 +95,16 @@ class PasswordPM extends PresentationModel { return false; } - boolean validate() { + public String getErrorMessage() { + return errorMessage; + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Private + /////////////////////////////////////////////////////////////////////////////////////////// + + private boolean validate() { InputValidator.ValidationResult result = passwordValidator.validate(passwordField.get()); if (result.isValid) { result = passwordValidator.validate(repeatedPasswordField.get()); @@ -90,4 +123,6 @@ class PasswordPM extends PresentationModel { } return false; } + + } diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java b/src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java similarity index 79% rename from src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java rename to src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java index 188659dc8c..092cbabd6d 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java +++ b/src/main/java/io/bitsquare/gui/pm/account/content/FiatAccountPm.java @@ -15,11 +15,12 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.fiataccount; +package io.bitsquare.gui.pm.account.content; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.content.FiatAccountModel; import io.bitsquare.gui.util.validation.BankAccountNumberValidator; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.locale.BSResources; @@ -43,24 +44,24 @@ import javafx.util.StringConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class FiatAccountPm extends PresentationModel { +public class FiatAccountPm extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(FiatAccountPm.class); private final BankAccountNumberValidator validator = new BankAccountNumberValidator(); - final StringProperty title = new SimpleStringProperty(); - final StringProperty holderName = new SimpleStringProperty(); - final StringProperty primaryID = new SimpleStringProperty(); - final StringProperty secondaryID = new SimpleStringProperty(); - final StringProperty primaryIDPrompt = new SimpleStringProperty(); - final StringProperty secondaryIDPrompt = new SimpleStringProperty(); - final StringProperty selectionPrompt = new SimpleStringProperty(); - final BooleanProperty selectionDisable = new SimpleBooleanProperty(); - final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true); + public final StringProperty title = new SimpleStringProperty(); + public final StringProperty holderName = new SimpleStringProperty(); + public final StringProperty primaryID = new SimpleStringProperty(); + public final StringProperty secondaryID = new SimpleStringProperty(); + public final StringProperty primaryIDPrompt = new SimpleStringProperty(); + public final StringProperty secondaryIDPrompt = new SimpleStringProperty(); + public final StringProperty selectionPrompt = new SimpleStringProperty(); + public final BooleanProperty selectionDisable = new SimpleBooleanProperty(); + public final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true); - final ObjectProperty type = new SimpleObjectProperty<>(); - final ObjectProperty country = new SimpleObjectProperty<>(); - final ObjectProperty currency = new SimpleObjectProperty<>(); + public final ObjectProperty type = new SimpleObjectProperty<>(); + public final ObjectProperty country = new SimpleObjectProperty<>(); + public final ObjectProperty currency = new SimpleObjectProperty<>(); /////////////////////////////////////////////////////////////////////////////////////////// @@ -118,11 +119,13 @@ class FiatAccountPm extends PresentationModel { }); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -130,10 +133,10 @@ class FiatAccountPm extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// - // Package scope + // Public /////////////////////////////////////////////////////////////////////////////////////////// - InputValidator.ValidationResult saveBankAccount() { + public InputValidator.ValidationResult saveBankAccount() { InputValidator.ValidationResult result = validateInput(); if (result.isValid) { model.saveBankAccount(); @@ -141,15 +144,15 @@ class FiatAccountPm extends PresentationModel { return result; } - void removeBankAccount() { + public void removeBankAccount() { model.removeBankAccount(); } - void addCountryToAcceptedCountriesList() { + public void addCountryToAcceptedCountriesList() { model.addCountryToAcceptedCountriesList(); } - void selectBankAccount(BankAccount bankAccount) { + public void selectBankAccount(BankAccount bankAccount) { model.selectBankAccount(bankAccount); } @@ -158,7 +161,7 @@ class FiatAccountPm extends PresentationModel { // Converters /////////////////////////////////////////////////////////////////////////////////////////// - StringConverter getTypesConverter() { + public StringConverter getTypesConverter() { return new StringConverter() { @Override public String toString(BankAccountType TypeInfo) { @@ -172,7 +175,7 @@ class FiatAccountPm extends PresentationModel { }; } - StringConverter getSelectionConverter() { + public StringConverter getSelectionConverter() { return new StringConverter() { @Override public String toString(BankAccount bankAccount) { @@ -186,7 +189,7 @@ class FiatAccountPm extends PresentationModel { }; } - StringConverter getCurrencyConverter() { + public StringConverter getCurrencyConverter() { return new StringConverter() { @Override @@ -202,7 +205,7 @@ class FiatAccountPm extends PresentationModel { }; } - StringConverter getRegionConverter() { + public StringConverter getRegionConverter() { return new StringConverter() { @Override public String toString(io.bitsquare.locale.Region region) { @@ -216,7 +219,7 @@ class FiatAccountPm extends PresentationModel { }; } - StringConverter getCountryConverter() { + public StringConverter getCountryConverter() { return new StringConverter() { @Override public String toString(Country country) { @@ -235,31 +238,31 @@ class FiatAccountPm extends PresentationModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - ObservableList getAllTypes() { + public ObservableList getAllTypes() { return model.allTypes; } - ObjectProperty getCurrentBankAccount() { + public ObjectProperty getCurrentBankAccount() { return model.currentBankAccount; } - ObservableList getAllBankAccounts() { + public ObservableList getAllBankAccounts() { return model.allBankAccounts; } - ObservableList getAllCurrencies() { + public ObservableList getAllCurrencies() { return model.allCurrencies; } - ObservableList getAllRegions() { + public ObservableList getAllRegions() { return model.allRegions; } - ObservableList getAllCountriesFor(Region selectedRegion) { + public ObservableList getAllCountriesFor(Region selectedRegion) { return model.getAllCountriesFor(selectedRegion); } - BooleanProperty getCountryNotInAcceptedCountriesList() { + public BooleanProperty getCountryNotInAcceptedCountriesList() { return model.countryNotInAcceptedCountriesList; } @@ -268,26 +271,26 @@ class FiatAccountPm extends PresentationModel { // Setters /////////////////////////////////////////////////////////////////////////////////////////// - void setType(BankAccountType type) { + public void setType(BankAccountType type) { model.setType(type); validateInput(); } - void setCountry(Country country) { + public void setCountry(Country country) { model.setCountry(country); validateInput(); } - void setCurrency(Currency currency) { + public void setCurrency(Currency currency) { model.setCurrency(currency); validateInput(); } + /////////////////////////////////////////////////////////////////////////////////////////// // Private methods /////////////////////////////////////////////////////////////////////////////////////////// - private InputValidator.ValidationResult validateInput() { InputValidator.ValidationResult result = validator.validate(model.title.get()); if (result.isValid) { diff --git a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java b/src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java similarity index 67% rename from src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java rename to src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java index d0c7c145cc..a4a3660ab3 100644 --- a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/pm/account/content/PasswordPM.java @@ -15,9 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.changepassword; +package io.bitsquare.gui.pm.account.content; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.content.PasswordModel; import io.bitsquare.gui.util.validation.InputValidator; import io.bitsquare.gui.util.validation.PasswordValidator; @@ -31,15 +32,15 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class PasswordPM extends PresentationModel { +public class PasswordPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(PasswordPM.class); private final PasswordValidator passwordValidator = new PasswordValidator(); - String errorMessage; - final StringProperty passwordField = new SimpleStringProperty(); - final StringProperty repeatedPasswordField = new SimpleStringProperty(); - final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); + private String errorMessage; + public final StringProperty passwordField = new SimpleStringProperty(); + public final StringProperty repeatedPasswordField = new SimpleStringProperty(); + public final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); /////////////////////////////////////////////////////////////////////////////////////////// // Constructor @@ -58,12 +59,35 @@ class PasswordPM extends PresentationModel { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("EmptyMethod") @Override public void initialized() { super.initialized(); } - boolean savePassword() { + @Override + public void activate() { + super.activate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void deactivate() { + super.deactivate(); + } + + @SuppressWarnings("EmptyMethod") + @Override + public void terminate() { + super.terminate(); + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Public + /////////////////////////////////////////////////////////////////////////////////////////// + + public boolean savePassword() { if (validate()) { model.savePassword(passwordField.get()); return true; @@ -71,7 +95,16 @@ class PasswordPM extends PresentationModel { return false; } - boolean validate() { + public String getErrorMessage() { + return errorMessage; + } + + + /////////////////////////////////////////////////////////////////////////////////////////// + // Private + /////////////////////////////////////////////////////////////////////////////////////////// + + private boolean validate() { InputValidator.ValidationResult result = passwordValidator.validate(passwordField.get()); if (result.isValid) { result = passwordValidator.validate(repeatedPasswordField.get()); diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java b/src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java similarity index 84% rename from src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java rename to src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java index c7e42b4811..9e22dbf081 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java +++ b/src/main/java/io/bitsquare/gui/pm/account/content/RegistrationPM.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.registration; +package io.bitsquare.gui.pm.account.content; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.content.RegistrationModel; import io.bitsquare.locale.BSResources; import com.google.bitcoin.core.Address; @@ -38,14 +39,14 @@ import org.slf4j.LoggerFactory; import static io.bitsquare.gui.util.BSFormatter.formatCoinWithCode; -class RegistrationPM extends PresentationModel { +public class RegistrationPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(RegistrationPM.class); // Those are needed for the addressTextField - final ObjectProperty
address = new SimpleObjectProperty<>(); - final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true); - final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty(); - final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty(); + public final ObjectProperty
address = new SimpleObjectProperty<>(); + public final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true); + public final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty(); + public final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty(); /////////////////////////////////////////////////////////////////////////////////////////// @@ -105,7 +106,7 @@ class RegistrationPM extends PresentationModel { // UI actions (called by CB) /////////////////////////////////////////////////////////////////////////////////////////// - void payFee() { + public void payFee() { model.payFeeErrorMessage.set(null); model.payFeeSuccess.set(false); @@ -119,27 +120,27 @@ class RegistrationPM extends PresentationModel { // Getters (called by CB) /////////////////////////////////////////////////////////////////////////////////////////// - WalletFacade getWalletFacade() { + public WalletFacade getWalletFacade() { return model.getWalletFacade(); } - Coin getFeeAsCoin() { + public Coin getFeeAsCoin() { return model.getFeeAsCoin(); } - String getAddressAsString() { + public String getAddressAsString() { return model.addressEntry != null ? model.addressEntry.getAddress().toString() : ""; } - String getPaymentLabel() { + public String getPaymentLabel() { return BSResources.get("Bitsquare account registration fee"); } - String getFeeAsString() { + public String getFeeAsString() { return formatCoinWithCode(model.getFeeAsCoin()); } - String getTransactionId() { + public String getTransactionId() { return model.getTransactionId(); } diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java b/src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java similarity index 76% rename from src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java rename to src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java index de6b782a38..5fb43e70a9 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java +++ b/src/main/java/io/bitsquare/gui/pm/account/content/RestrictionsPM.java @@ -15,10 +15,11 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.restrictions; +package io.bitsquare.gui.pm.account.content; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.content.RestrictionsModel; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; @@ -33,7 +34,7 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class RestrictionsPM extends PresentationModel { +public class RestrictionsPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(RestrictionsPM.class); @@ -54,6 +55,7 @@ class RestrictionsPM extends PresentationModel { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("EmptyMethod") @Override public void initialized() { super.initialized(); @@ -67,6 +69,7 @@ class RestrictionsPM extends PresentationModel { updateDoneButtonDisabled(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); @@ -74,75 +77,75 @@ class RestrictionsPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// - // Package scope + // Public /////////////////////////////////////////////////////////////////////////////////////////// - void onAddLanguage(Locale locale) { + public void onAddLanguage(Locale locale) { model.addLanguage(locale); updateDoneButtonDisabled(); } - ObservableList getLanguageList() { + public ObservableList getLanguageList() { updateDoneButtonDisabled(); return model.languageList; } - ObservableList getAllLanguages() { + public ObservableList getAllLanguages() { updateDoneButtonDisabled(); return model.allLanguages; } - void removeLanguage(Locale locale) { + public void removeLanguage(Locale locale) { model.removeLanguage(locale); updateDoneButtonDisabled(); } - void onAddCountry(Country country) { + public void onAddCountry(Country country) { model.addCountry(country); updateDoneButtonDisabled(); } - ObservableList getListWithAllEuroCountries() { + public ObservableList getListWithAllEuroCountries() { ObservableList result = model.getListWithAllEuroCountries(); updateDoneButtonDisabled(); return result; } - ObservableList getAllCountriesFor(Region selectedRegion) { + public ObservableList getAllCountriesFor(Region selectedRegion) { return model.getAllCountriesFor(selectedRegion); } - ObservableList getAllRegions() { + public ObservableList getAllRegions() { return model.allRegions; } - ObservableList getCountryList() { + public ObservableList getCountryList() { updateDoneButtonDisabled(); return model.countryList; } - void removeCountry(Country country) { + public void removeCountry(Country country) { model.removeCountry(country); updateDoneButtonDisabled(); } - ObservableList getArbitratorList() { + public ObservableList getArbitratorList() { updateDoneButtonDisabled(); return model.arbitratorList; } - void removeArbitrator(Arbitrator arbitrator) { + public void removeArbitrator(Arbitrator arbitrator) { model.removeArbitrator(arbitrator); updateDoneButtonDisabled(); } - void updateArbitratorList() { + public void updateArbitratorList() { model.updateArbitratorList(); updateDoneButtonDisabled(); } - //TODO Revert -1 to 0(2 later). For mock testing disabled arbitratorList test - void updateDoneButtonDisabled() { + //TODO Revert size() > -1 to 0(2 later). For mock testing disabled arbitratorList test + public void updateDoneButtonDisabled() { boolean isValid = model.languageList != null && model.languageList.size() > 0 && model.countryList != null && model.countryList.size() > 0 && model.arbitratorList != null && model.arbitratorList.size() > -1; diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java b/src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java similarity index 87% rename from src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java rename to src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java index 9da404afcb..7aa9f5e238 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java +++ b/src/main/java/io/bitsquare/gui/pm/account/content/SeedWordsPM.java @@ -15,9 +15,10 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.seedwords; +package io.bitsquare.gui.pm.account.content; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.model.account.content.SeedWordsModel; import io.bitsquare.gui.util.BSFormatter; import com.google.inject.Inject; @@ -28,10 +29,10 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class SeedWordsPM extends PresentationModel { +public class SeedWordsPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(SeedWordsPM.class); - final StringProperty seedWords = new SimpleStringProperty(); + public final StringProperty seedWords = new SimpleStringProperty(); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/account/AccountCB.java b/src/main/java/io/bitsquare/gui/view/AccountCB.java similarity index 95% rename from src/main/java/io/bitsquare/gui/account/AccountCB.java rename to src/main/java/io/bitsquare/gui/view/AccountCB.java index 1c2ae80166..a10000ac36 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountCB.java +++ b/src/main/java/io/bitsquare/gui/view/AccountCB.java @@ -15,12 +15,13 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account; +package io.bitsquare.gui.view; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.MainController; import io.bitsquare.gui.NavigationItem; +import io.bitsquare.gui.pm.AccountPM; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; @@ -58,6 +59,7 @@ public class AccountCB extends CachedCodeBehind { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("EmptyMethod") @Override public void initialize(URL url, ResourceBundle rb) { super.initialize(url, rb); @@ -79,11 +81,13 @@ public class AccountCB extends CachedCodeBehind { } } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); diff --git a/src/main/java/io/bitsquare/gui/account/AccountView.fxml b/src/main/java/io/bitsquare/gui/view/AccountView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/account/AccountView.fxml rename to src/main/java/io/bitsquare/gui/view/AccountView.fxml index 1a7ca6f3be..f425f6af7a 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountView.fxml +++ b/src/main/java/io/bitsquare/gui/view/AccountView.fxml @@ -19,7 +19,7 @@ -. */ -package io.bitsquare.gui.account.settings; +package io.bitsquare.gui.view.account; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.PresentationModel; +import io.bitsquare.gui.pm.account.AccountSettingsPM; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; @@ -87,16 +88,19 @@ public class AccountSettingsCB extends CachedCodeBehind { seedWords.fire(); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); diff --git a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsView.fxml b/src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml similarity index 92% rename from src/main/java/io/bitsquare/gui/account/settings/AccountSettingsView.fxml rename to src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml index 62d6dcd2d4..45f0167e3d 100644 --- a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/AccountSettingsView.fxml @@ -19,7 +19,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupCB.java b/src/main/java/io/bitsquare/gui/view/account/AccountSetupCB.java similarity index 89% rename from src/main/java/io/bitsquare/gui/account/setup/SetupCB.java rename to src/main/java/io/bitsquare/gui/view/account/AccountSetupCB.java index 5fcfcbf380..534035abb6 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupCB.java +++ b/src/main/java/io/bitsquare/gui/view/account/AccountSetupCB.java @@ -15,19 +15,20 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.setup; +package io.bitsquare.gui.view.account; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.CodeBehind; import io.bitsquare.gui.NavigationItem; import io.bitsquare.gui.PresentationModel; -import io.bitsquare.gui.account.AccountCB; -import io.bitsquare.gui.account.addpassword.PasswordCB; -import io.bitsquare.gui.account.fiataccount.FiatAccountCB; -import io.bitsquare.gui.account.registration.RegistrationCB; -import io.bitsquare.gui.account.restrictions.RestrictionsCB; -import io.bitsquare.gui.account.seedwords.SeedWordsCB; +import io.bitsquare.gui.pm.account.AccountSetupPM; import io.bitsquare.gui.util.ImageUtil; +import io.bitsquare.gui.view.AccountCB; +import io.bitsquare.gui.view.account.content.FiatAccountCB; +import io.bitsquare.gui.view.account.content.PasswordCB; +import io.bitsquare.gui.view.account.content.RegistrationCB; +import io.bitsquare.gui.view.account.content.RestrictionsCB; +import io.bitsquare.gui.view.account.content.SeedWordsCB; import io.bitsquare.util.BSFXMLLoader; import java.io.IOException; @@ -47,9 +48,9 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SetupCB extends CachedCodeBehind { +public class AccountSetupCB extends CachedCodeBehind { - private static final Logger log = LoggerFactory.getLogger(SetupCB.class); + private static final Logger log = LoggerFactory.getLogger(AccountSetupCB.class); public VBox leftVBox; public AnchorPane content; private WizardItem seedWords, password, fiatAccount, restrictions, registration; @@ -59,7 +60,7 @@ public class SetupCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private SetupCB(SetupPM presentationModel) { + private AccountSetupCB(AccountSetupPM presentationModel) { super(presentationModel); } @@ -91,16 +92,19 @@ public class SetupCB extends CachedCodeBehind { childController = seedWords.show(); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -159,14 +163,14 @@ class WizardItem extends HBox { private final ImageView imageView; private final Label titleLabel; private final Label subTitleLabel; - private final SetupCB parentCB; + private final AccountSetupCB parentCB; private final Parent content; private final NavigationItem navigationItem; private CodeBehind childController; - WizardItem(SetupCB parentCB, Parent content, String title, String subTitle, NavigationItem navigationItem) { + WizardItem(AccountSetupCB parentCB, Parent content, String title, String subTitle, NavigationItem navigationItem) { this.parentCB = parentCB; this.content = content; this.navigationItem = navigationItem; diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupView.fxml b/src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml similarity index 93% rename from src/main/java/io/bitsquare/gui/account/setup/SetupView.fxml rename to src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml index 0ca4f29e4d..5734ba16a1 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/AccountSetupView.fxml @@ -19,7 +19,7 @@ - . */ -package io.bitsquare.gui.account.changepassword; +package io.bitsquare.gui.view.account.content; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.account.settings.AccountSettingsCB; -import io.bitsquare.gui.account.setup.SetupCB; import io.bitsquare.gui.help.Help; import io.bitsquare.gui.help.HelpId; +import io.bitsquare.gui.pm.account.content.ChangePasswordPM; +import io.bitsquare.gui.view.account.AccountSettingsCB; +import io.bitsquare.gui.view.account.AccountSetupCB; import java.net.URL; @@ -37,9 +38,9 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class PasswordCB extends CachedCodeBehind { +public class ChangePasswordCB extends CachedCodeBehind { - private static final Logger log = LoggerFactory.getLogger(PasswordCB.class); + private static final Logger log = LoggerFactory.getLogger(ChangePasswordCB.class); @FXML private HBox buttonsHBox; @FXML private Button saveButton, skipButton; @@ -51,7 +52,7 @@ class PasswordCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - private PasswordCB(PasswordPM presentationModel) { + private ChangePasswordCB(ChangePasswordPM presentationModel) { super(presentationModel); } @@ -70,21 +71,25 @@ class PasswordCB extends CachedCodeBehind { saveButton.disableProperty().bind(presentationModel.saveButtonDisabled); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); } + /////////////////////////////////////////////////////////////////////////////////////////// // Override from CodeBehind /////////////////////////////////////////////////////////////////////////////////////////// @@ -105,11 +110,11 @@ class PasswordCB extends CachedCodeBehind { private void onSaved() { boolean result = presentationModel.savePassword(); if (result) { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(this); + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(this); } else { - log.debug(presentationModel.errorMessage); // TODO use validating TF + log.debug(presentationModel.getErrorMessage()); // TODO use validating TF } } @@ -118,15 +123,11 @@ class PasswordCB extends CachedCodeBehind { Help.openWindow(HelpId.SETUP_PASSWORD); } - public void onSkipped() { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(this); + @FXML + private void onSkipped() { + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(this); } - /////////////////////////////////////////////////////////////////////////////////////////// - // Private methods - /////////////////////////////////////////////////////////////////////////////////////////// - - } diff --git a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordView.fxml b/src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml similarity index 96% rename from src/main/java/io/bitsquare/gui/account/changepassword/PasswordView.fxml rename to src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml index 511bc1131f..cebe7ecad6 100644 --- a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/content/ChangePasswordView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java b/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountCB.java similarity index 96% rename from src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java rename to src/main/java/io/bitsquare/gui/view/account/content/FiatAccountCB.java index 8d41e6440e..c657bbbeeb 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java +++ b/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountCB.java @@ -15,18 +15,19 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.fiataccount; +package io.bitsquare.gui.view.account.content; import io.bitsquare.bank.BankAccount; import io.bitsquare.bank.BankAccountType; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.account.settings.AccountSettingsCB; -import io.bitsquare.gui.account.setup.SetupCB; import io.bitsquare.gui.components.InputTextField; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.help.Help; import io.bitsquare.gui.help.HelpId; +import io.bitsquare.gui.pm.account.content.FiatAccountPm; import io.bitsquare.gui.util.validation.InputValidator; +import io.bitsquare.gui.view.account.AccountSettingsCB; +import io.bitsquare.gui.view.account.AccountSetupCB; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; @@ -87,6 +88,7 @@ public class FiatAccountCB extends CachedCodeBehind { typesComboBox.setItems(presentationModel.getAllTypes()); typesComboBox.setConverter(presentationModel.getTypesConverter()); + selectionComboBox.setItems(presentationModel.getAllBankAccounts()); selectionComboBox.setConverter(presentationModel.getSelectionConverter()); currencyComboBox.setItems(presentationModel.getAllCurrencies()); currencyComboBox.setConverter(presentationModel.getCurrencyConverter()); @@ -106,15 +108,15 @@ public class FiatAccountCB extends CachedCodeBehind { setupListeners(); setupBindings(); - - selectionComboBox.setItems(presentationModel.getAllBankAccounts()); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -179,7 +181,7 @@ public class FiatAccountCB extends CachedCodeBehind { @FXML private void onCompleted() { if (parentController != null) - ((SetupCB) parentController).onCompleted(this); + ((AccountSetupCB) parentController).onCompleted(this); } @FXML diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountView.fxml b/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountView.fxml rename to src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml index 375a768fb8..73ea682fa9 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/content/FiatAccountView.fxml @@ -23,7 +23,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java b/src/main/java/io/bitsquare/gui/view/account/content/PasswordCB.java similarity index 83% rename from src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java rename to src/main/java/io/bitsquare/gui/view/account/content/PasswordCB.java index 04d58c2cdc..82b0181f0f 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java +++ b/src/main/java/io/bitsquare/gui/view/account/content/PasswordCB.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.addpassword; +package io.bitsquare.gui.view.account.content; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.account.settings.AccountSettingsCB; -import io.bitsquare.gui.account.setup.SetupCB; import io.bitsquare.gui.help.Help; import io.bitsquare.gui.help.HelpId; +import io.bitsquare.gui.pm.account.content.PasswordPM; +import io.bitsquare.gui.view.account.AccountSettingsCB; +import io.bitsquare.gui.view.account.AccountSetupCB; import java.net.URL; @@ -70,21 +71,25 @@ public class PasswordCB extends CachedCodeBehind { saveButton.disableProperty().bind(presentationModel.saveButtonDisabled); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); } + /////////////////////////////////////////////////////////////////////////////////////////// // Override from CodeBehind /////////////////////////////////////////////////////////////////////////////////////////// @@ -106,25 +111,24 @@ public class PasswordCB extends CachedCodeBehind { private void onSaved() { boolean result = presentationModel.savePassword(); if (result) { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(this); + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(this); } else { - log.debug(presentationModel.errorMessage); // TODO use validating TF + // TODO use validating passwordTF + log.debug(presentationModel.getErrorMessage()); } } @FXML private void onSkipped() { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(this); + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(this); } @FXML private void onOpenHelp() { Help.openWindow(HelpId.SETUP_PASSWORD); } - - } diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordView.fxml b/src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml similarity index 96% rename from src/main/java/io/bitsquare/gui/account/addpassword/PasswordView.fxml rename to src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml index e935fbdbbf..a9a99e3099 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/content/PasswordView.fxml @@ -21,7 +21,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java b/src/main/java/io/bitsquare/gui/view/account/content/RegistrationCB.java similarity index 92% rename from src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java rename to src/main/java/io/bitsquare/gui/view/account/content/RegistrationCB.java index ea38dc19a3..f817f41686 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java +++ b/src/main/java/io/bitsquare/gui/view/account/content/RegistrationCB.java @@ -15,17 +15,18 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.registration; +package io.bitsquare.gui.view.account.content; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.MainController; -import io.bitsquare.gui.account.settings.AccountSettingsCB; -import io.bitsquare.gui.account.setup.SetupCB; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.btc.AddressTextField; import io.bitsquare.gui.components.btc.BalanceTextField; import io.bitsquare.gui.help.Help; import io.bitsquare.gui.help.HelpId; +import io.bitsquare.gui.pm.account.content.RegistrationPM; +import io.bitsquare.gui.view.account.AccountSettingsCB; +import io.bitsquare.gui.view.account.AccountSetupCB; import io.bitsquare.locale.BSResources; import java.net.URL; @@ -112,8 +113,8 @@ public class RegistrationCB extends CachedCodeBehind { @Override public void handle(ActionEvent actionEvent) { try { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(RegistrationCB.this); + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(RegistrationCB.this); } catch (Exception e) { e.printStackTrace(); } @@ -131,17 +132,20 @@ public class RegistrationCB extends CachedCodeBehind { }); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationView.fxml b/src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml similarity index 97% rename from src/main/java/io/bitsquare/gui/account/registration/RegistrationView.fxml rename to src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml index 3b43ce6a7d..c220fe549d 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/content/RegistrationView.fxml @@ -23,7 +23,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java b/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsCB.java similarity index 97% rename from src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java rename to src/main/java/io/bitsquare/gui/view/account/content/RestrictionsCB.java index 8d3313e53f..9da23ef713 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java +++ b/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsCB.java @@ -15,17 +15,18 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.restrictions; +package io.bitsquare.gui.view.account.content; import io.bitsquare.BitSquare; import io.bitsquare.arbitrator.Arbitrator; import io.bitsquare.gui.CachedCodeBehind; import io.bitsquare.gui.NavigationItem; -import io.bitsquare.gui.account.settings.AccountSettingsCB; -import io.bitsquare.gui.account.setup.SetupCB; import io.bitsquare.gui.help.Help; import io.bitsquare.gui.help.HelpId; +import io.bitsquare.gui.pm.account.content.RestrictionsPM; import io.bitsquare.gui.util.ImageUtil; +import io.bitsquare.gui.view.account.AccountSettingsCB; +import io.bitsquare.gui.view.account.AccountSetupCB; import io.bitsquare.locale.Country; import io.bitsquare.locale.Region; import io.bitsquare.util.BSFXMLLoader; @@ -98,11 +99,13 @@ public class RestrictionsCB extends CachedCodeBehind { arbitratorsListView.setItems(presentationModel.getArbitratorList()); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -160,8 +163,8 @@ public class RestrictionsCB extends CachedCodeBehind { @FXML private void onCompleted() { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(this); + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(this); } @FXML diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsView.fxml b/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml similarity index 98% rename from src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsView.fxml rename to src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml index cb743b6524..4948822510 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/content/RestrictionsView.fxml @@ -20,7 +20,7 @@ - diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java b/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsCB.java similarity index 87% rename from src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java rename to src/main/java/io/bitsquare/gui/view/account/content/SeedWordsCB.java index 251f28219e..40e842d789 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java +++ b/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsCB.java @@ -15,13 +15,14 @@ * along with Bitsquare. If not, see . */ -package io.bitsquare.gui.account.seedwords; +package io.bitsquare.gui.view.account.content; import io.bitsquare.gui.CachedCodeBehind; -import io.bitsquare.gui.account.settings.AccountSettingsCB; -import io.bitsquare.gui.account.setup.SetupCB; import io.bitsquare.gui.help.Help; import io.bitsquare.gui.help.HelpId; +import io.bitsquare.gui.pm.account.content.SeedWordsPM; +import io.bitsquare.gui.view.account.AccountSettingsCB; +import io.bitsquare.gui.view.account.AccountSetupCB; import java.net.URL; @@ -66,16 +67,19 @@ public class SeedWordsCB extends CachedCodeBehind { seedWordsTextArea.setText(presentationModel.seedWords.get()); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); @@ -101,8 +105,8 @@ public class SeedWordsCB extends CachedCodeBehind { @FXML private void onCompleted() { - if (parentController instanceof SetupCB) - ((SetupCB) parentController).onCompleted(this); + if (parentController instanceof AccountSetupCB) + ((AccountSetupCB) parentController).onCompleted(this); } @FXML diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsView.fxml b/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml similarity index 96% rename from src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsView.fxml rename to src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml index 6f7b5a684c..755c1a823a 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsView.fxml +++ b/src/main/java/io/bitsquare/gui/view/account/content/SeedWordsView.fxml @@ -22,7 +22,7 @@ - diff --git a/src/main/java/io/bitsquare/locale/BSResources.java b/src/main/java/io/bitsquare/locale/BSResources.java index 1b2d3b9d9d..7c1db7cc77 100644 --- a/src/main/java/io/bitsquare/locale/BSResources.java +++ b/src/main/java/io/bitsquare/locale/BSResources.java @@ -49,7 +49,7 @@ public class BSResources { return BSResources.getResourceBundle().getString(key); } catch (MissingResourceException e) { log.error("MissingResourceException for key: " + key); - return "# " + key; + return key; } } diff --git a/src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java b/src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java index d6e72f9bad..5701930954 100644 --- a/src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java @@ -68,7 +68,7 @@ public class AccountSettingsUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/settings/AccountSettingsView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java b/src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java index 31884e2af8..7e23577de7 100644 --- a/src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java @@ -68,7 +68,7 @@ public class AccountUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/AccountView.fxml"), false); + getUrl("/io/bitsquare/gui/view/AccountView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java b/src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java index 620e9939e6..5654aad996 100644 --- a/src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java @@ -68,7 +68,7 @@ public class RegistrationUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/registration/RegistrationView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java b/src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java index 041c586b91..4fa1892642 100644 --- a/src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java @@ -68,7 +68,7 @@ public class FiatAccountUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/fiataccount/FiatAccountView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java b/src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java index 6bfb989553..18121298e0 100644 --- a/src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java @@ -68,7 +68,7 @@ public class PasswordUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/addpassword/PasswordView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/content/PasswordView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java b/src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java index cc601922cd..82aaec664d 100644 --- a/src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java @@ -68,7 +68,7 @@ public class RegistrationUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/registration/RegistrationView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java b/src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java index 0a9be819a8..7787691772 100644 --- a/src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java @@ -68,7 +68,7 @@ public class RestrictionsUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/restrictions/RestrictionsView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view); diff --git a/src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java b/src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java index 06e184eb0e..0947f54831 100644 --- a/src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java +++ b/src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java @@ -68,7 +68,7 @@ public class SeedWordsUITestRunner extends Application { log.debug("re load"); pane.getChildren().removeAll(); BSFXMLLoader loader = new BSFXMLLoader( - getUrl("/io/bitsquare/gui/account/seedwords/SeedWordsView.fxml"), false); + getUrl("/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"), false); try { view = loader.load(); pane.getChildren().setAll(view);