diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index 4b049646d0..220822bcea 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -327,7 +327,7 @@ public class MainViewCB extends ViewCB { addBankAccountComboBox(rightNavPane); - settingsButton = addNavButton(rightNavPane, "Settings", Navigation.Item.SETTINGS); + settingsButton = addNavButton(rightNavPane, "Preferences", Navigation.Item.SETTINGS); accountButton = addNavButton(rightNavPane, "Account", Navigation.Item.ACCOUNT); onMainNavigationAdded(); diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountModel.java b/src/main/java/io/bitsquare/gui/main/account/AccountModel.java index cacb7d30cd..c8cab13f6f 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountModel.java @@ -25,7 +25,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountModel extends UIModel { +class AccountModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(AccountModel.class); private final User user; @@ -73,7 +73,7 @@ public class AccountModel extends UIModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - public boolean getNeedRegistration() { + boolean getNeedRegistration() { return user.getAccountId() == null; } diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountPM.java b/src/main/java/io/bitsquare/gui/main/account/AccountPM.java index 0c4069da05..cf7338061d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountPM.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountPM extends PresentationModel { +class AccountPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(AccountPM.class); @@ -70,7 +70,7 @@ public class AccountPM extends PresentationModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - public boolean getNeedRegistration() { + boolean getNeedRegistration() { return model.getNeedRegistration(); } diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java index 4b4c210af6..7ae4ce5c1c 100644 --- a/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java @@ -37,11 +37,11 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountViewCB extends CachedViewCB { +class AccountViewCB extends CachedViewCB { private static final Logger log = LoggerFactory.getLogger(AccountViewCB.class); - public Tab tab; + Tab tab; private Navigation navigation; private Navigation.Listener listener; @@ -62,7 +62,6 @@ public class AccountViewCB extends CachedViewCB { // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// - @SuppressWarnings("EmptyMethod") @Override public void initialize(URL url, ResourceBundle rb) { listener = navigationItems -> { diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java index 31592f9bdf..512aa97354 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordModel.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ChangePasswordModel extends UIModel { +class ChangePasswordModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(ChangePasswordModel.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -69,7 +69,7 @@ public class ChangePasswordModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @SuppressWarnings("EmptyMethod") - public void savePassword(String password) { + void savePassword(String password) { //TODO Implement password encryption for wallet } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java index 98e559bb6b..e1c36a460b 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java @@ -31,16 +31,16 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ChangePasswordPM extends PresentationModel { +class ChangePasswordPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(ChangePasswordPM.class); private final PasswordValidator passwordValidator; private String errorMessage; - public final StringProperty passwordField = new SimpleStringProperty(); - public final StringProperty repeatedPasswordField = new SimpleStringProperty(); - public final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); + final StringProperty passwordField = new SimpleStringProperty(); + final StringProperty repeatedPasswordField = new SimpleStringProperty(); + final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); /////////////////////////////////////////////////////////////////////////////////////////// @@ -89,7 +89,7 @@ public class ChangePasswordPM extends PresentationModel { // Public /////////////////////////////////////////////////////////////////////////////////////////// - public boolean requestSavePassword() { + boolean requestSavePassword() { if (validate()) { model.savePassword(passwordField.get()); return true; @@ -97,7 +97,7 @@ public class ChangePasswordPM extends PresentationModel { return false; } - public String getErrorMessage() { + String getErrorMessage() { return errorMessage; } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java index dbdf302b87..ae3316a3fe 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewCB.java @@ -36,7 +36,7 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ChangePasswordViewCB extends CachedViewCB implements ContextAware { +class ChangePasswordViewCB extends CachedViewCB implements ContextAware { private static final Logger log = LoggerFactory.getLogger(ChangePasswordViewCB.class); @@ -89,7 +89,7 @@ public class ChangePasswordViewCB extends CachedViewCB impleme /////////////////////////////////////////////////////////////////////////////////////////// - // Override + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java index 562f967e6d..9e5f6e43ee 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java @@ -44,7 +44,7 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FiatAccountModel extends UIModel { +class FiatAccountModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(FiatAccountModel.class); private final User user; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java index 4aea0fa42d..a7e32f4e65 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java @@ -43,7 +43,7 @@ import javafx.util.StringConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FiatAccountPm extends PresentationModel { +class FiatAccountPm extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(FiatAccountPm.class); private final BankAccountNumberValidator bankAccountNumberValidator; diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java index 48407ebba1..03bcbf2316 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewCB.java @@ -123,7 +123,7 @@ public class FiatAccountViewCB extends CachedViewCB implements Co /////////////////////////////////////////////////////////////////////////////////////////// - // Override + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java index 265d25ca59..fd895246d6 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordModel.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PasswordModel extends UIModel { +class PasswordModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(PasswordModel.class); @@ -70,7 +70,7 @@ public class PasswordModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @SuppressWarnings("EmptyMethod") - public void savePassword(String password) { + void savePassword(String password) { //TODO Implement password encryption for wallet } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java index c07dc42c09..ea75088e83 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java @@ -31,16 +31,16 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PasswordPM extends PresentationModel { +class PasswordPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(PasswordPM.class); private final PasswordValidator passwordValidator; private String errorMessage; - public final StringProperty passwordField = new SimpleStringProperty(); - public final StringProperty repeatedPasswordField = new SimpleStringProperty(); - public final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); + final StringProperty passwordField = new SimpleStringProperty(); + final StringProperty repeatedPasswordField = new SimpleStringProperty(); + final BooleanProperty saveButtonDisabled = new SimpleBooleanProperty(true); /////////////////////////////////////////////////////////////////////////////////////////// @@ -89,7 +89,7 @@ public class PasswordPM extends PresentationModel { // Public /////////////////////////////////////////////////////////////////////////////////////////// - public boolean requestSavePassword() { + boolean requestSavePassword() { if (validate()) { model.savePassword(passwordField.get()); return true; @@ -97,7 +97,7 @@ public class PasswordPM extends PresentationModel { return false; } - public String getErrorMessage() { + String getErrorMessage() { return errorMessage; } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java index 8f3707839b..acde89ae28 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewCB.java @@ -89,7 +89,7 @@ public class PasswordViewCB extends CachedViewCB implements ContextA /////////////////////////////////////////////////////////////////////////////////////////// - // Override + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java index 7aa465660d..66a45359a8 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java @@ -45,7 +45,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RegistrationModel extends UIModel { +class RegistrationModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(RegistrationModel.class); private final WalletFacade walletFacade; @@ -55,9 +55,9 @@ public class RegistrationModel extends UIModel { private String transactionId; private AddressEntry addressEntry; - public final BooleanProperty isWalletFunded = new SimpleBooleanProperty(); - public final BooleanProperty payFeeSuccess = new SimpleBooleanProperty(); - public final StringProperty payFeeErrorMessage = new SimpleStringProperty(); + final BooleanProperty isWalletFunded = new SimpleBooleanProperty(); + final BooleanProperty payFeeSuccess = new SimpleBooleanProperty(); + final StringProperty payFeeErrorMessage = new SimpleStringProperty(); /////////////////////////////////////////////////////////////////////////////////////////// @@ -116,7 +116,7 @@ public class RegistrationModel extends UIModel { // Methods /////////////////////////////////////////////////////////////////////////////////////////// - public void payFee() { + void payFee() { FutureCallback callback = new FutureCallback() { @Override public void onSuccess(@Nullable Transaction transaction) { @@ -151,19 +151,19 @@ public class RegistrationModel extends UIModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - public WalletFacade getWalletFacade() { + WalletFacade getWalletFacade() { return walletFacade; } - public Coin getFeeAsCoin() { + Coin getFeeAsCoin() { return FeePolicy.REGISTRATION_FEE; } - public String getTransactionId() { + String getTransactionId() { return transactionId; } - public AddressEntry getAddressEntry() { + AddressEntry getAddressEntry() { return addressEntry; } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java index a00a21b12e..3bee0ebcb0 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java @@ -38,15 +38,15 @@ import org.slf4j.LoggerFactory; import static io.bitsquare.gui.util.BSFormatter.formatCoinWithCode; -public class RegistrationPM extends PresentationModel { +class RegistrationPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(RegistrationPM.class); - public final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true); - public final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty(); - public final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty(); + final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true); + final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty(); + final BooleanProperty showTransactionPublishedScreen = new SimpleBooleanProperty(); // That is needed for the addressTextField - public final ObjectProperty
address = new SimpleObjectProperty<>(); + final ObjectProperty
address = new SimpleObjectProperty<>(); /////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ public class RegistrationPM extends PresentationModel { // UI actions /////////////////////////////////////////////////////////////////////////////////////////// - public void payFee() { + void payFee() { model.payFeeErrorMessage.set(null); model.payFeeSuccess.set(false); @@ -120,27 +120,27 @@ public class RegistrationPM extends PresentationModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - public WalletFacade getWalletFacade() { + WalletFacade getWalletFacade() { return model.getWalletFacade(); } - public Coin getFeeAsCoin() { + Coin getFeeAsCoin() { return model.getFeeAsCoin(); } - public String getAddressAsString() { + String getAddressAsString() { return model.getAddressEntry() != null ? model.getAddressEntry().getAddress().toString() : ""; } - public String getPaymentLabel() { + String getPaymentLabel() { return BSResources.get("Bitsquare account registration fee"); } - public String getFeeAsString() { + String getFeeAsString() { return formatCoinWithCode(model.getFeeAsCoin()); } - public String getTransactionId() { + String getTransactionId() { return model.getTransactionId(); } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java index 4bf42d94ed..6aa9b038d4 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewCB.java @@ -48,6 +48,7 @@ import org.controlsfx.dialog.Dialog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public class RegistrationViewCB extends CachedViewCB implements ContextAware { private static final Logger log = LoggerFactory.getLogger(RegistrationViewCB.class); @@ -140,7 +141,6 @@ public class RegistrationViewCB extends CachedViewCB implements @Override public void activate() { super.activate(); - } @SuppressWarnings("EmptyMethod") @@ -157,7 +157,7 @@ public class RegistrationViewCB extends CachedViewCB implements /////////////////////////////////////////////////////////////////////////////////////////// - // Override + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java index 90a30545d7..9bc2bfcd5a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java @@ -45,7 +45,7 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RestrictionsModel extends UIModel { +class RestrictionsModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(RestrictionsModel.class); private final User user; @@ -53,12 +53,12 @@ public class RestrictionsModel extends UIModel { private final Persistence persistence; private final MessageFacade messageFacade; - public final ObservableList languageList = FXCollections.observableArrayList(); - public final ObservableList countryList = FXCollections.observableArrayList(); - public final ObservableList arbitratorList = FXCollections.observableArrayList(); - public final ObservableList allLanguages = FXCollections.observableArrayList(LanguageUtil + final ObservableList languageList = FXCollections.observableArrayList(); + final ObservableList countryList = FXCollections.observableArrayList(); + final ObservableList arbitratorList = FXCollections.observableArrayList(); + final ObservableList allLanguages = FXCollections.observableArrayList(LanguageUtil .getAllLanguageLocales()); - public final ObservableList allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); + final ObservableList allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions()); /////////////////////////////////////////////////////////////////////////////////////////// @@ -125,28 +125,28 @@ public class RestrictionsModel extends UIModel { // Public /////////////////////////////////////////////////////////////////////////////////////////// - public ObservableList getAllCountriesFor(Region selectedRegion) { + ObservableList getAllCountriesFor(Region selectedRegion) { return FXCollections.observableArrayList(CountryUtil.getAllCountriesFor(selectedRegion)); } - public void updateArbitratorList() { + void updateArbitratorList() { arbitratorList.setAll(settings.getAcceptedArbitrators()); } - public void addLanguage(Locale locale) { + void addLanguage(Locale locale) { if (locale != null && !languageList.contains(locale)) { languageList.add(locale); settings.addAcceptedLanguageLocale(locale); } } - public void removeLanguage(Locale locale) { + void removeLanguage(Locale locale) { languageList.remove(locale); settings.removeAcceptedLanguageLocale(locale); saveSettings(); } - public void addCountry(Country country) { + void addCountry(Country country) { if (!countryList.contains(country) && country != null) { countryList.add(country); settings.addAcceptedCountry(country); @@ -154,7 +154,7 @@ public class RestrictionsModel extends UIModel { } } - public ObservableList getListWithAllEuroCountries() { + 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); @@ -163,13 +163,13 @@ public class RestrictionsModel extends UIModel { return countryList; } - public void removeCountry(Country country) { + void removeCountry(Country country) { countryList.remove(country); settings.removeAcceptedCountry(country); saveSettings(); } - public void removeArbitrator(Arbitrator arbitrator) { + void removeArbitrator(Arbitrator arbitrator) { arbitratorList.remove(arbitrator); settings.removeAcceptedArbitrator(arbitrator); saveSettings(); diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java index 2e2455e805..f14c750985 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java @@ -33,10 +33,10 @@ import javafx.collections.ObservableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RestrictionsPM extends PresentationModel { +class RestrictionsPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(RestrictionsPM.class); - public final BooleanProperty doneButtonDisable = new SimpleBooleanProperty(true); + final BooleanProperty doneButtonDisable = new SimpleBooleanProperty(true); /////////////////////////////////////////////////////////////////////////////////////////// @@ -78,32 +78,32 @@ public class RestrictionsPM extends PresentationModel { // Public /////////////////////////////////////////////////////////////////////////////////////////// - public void addLanguage(Locale locale) { + void addLanguage(Locale locale) { model.addLanguage(locale); updateDoneButtonDisableState(); } - public void removeLanguage(Locale locale) { + void removeLanguage(Locale locale) { model.removeLanguage(locale); updateDoneButtonDisableState(); } - public void addCountry(Country country) { + void addCountry(Country country) { model.addCountry(country); updateDoneButtonDisableState(); } - public void removeCountry(Country country) { + void removeCountry(Country country) { model.removeCountry(country); updateDoneButtonDisableState(); } - public void removeArbitrator(Arbitrator arbitrator) { + void removeArbitrator(Arbitrator arbitrator) { model.removeArbitrator(arbitrator); updateDoneButtonDisableState(); } - public void updateArbitratorList() { + void updateArbitratorList() { model.updateArbitratorList(); updateDoneButtonDisableState(); } @@ -113,31 +113,31 @@ public class RestrictionsPM extends PresentationModel { // Getters /////////////////////////////////////////////////////////////////////////////////////////// - public ObservableList getListWithAllEuroCountries() { + ObservableList getListWithAllEuroCountries() { return model.getListWithAllEuroCountries(); } - public ObservableList getAllCountriesFor(Region selectedRegion) { + ObservableList getAllCountriesFor(Region selectedRegion) { return model.getAllCountriesFor(selectedRegion); } - public ObservableList getLanguageList() { + ObservableList getLanguageList() { return model.languageList; } - public ObservableList getAllRegions() { + ObservableList getAllRegions() { return model.allRegions; } - public ObservableList getAllLanguages() { + ObservableList getAllLanguages() { return model.allLanguages; } - public ObservableList getCountryList() { + ObservableList getCountryList() { return model.countryList; } - public ObservableList getArbitratorList() { + ObservableList getArbitratorList() { return model.arbitratorList; } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java index aac0dfba21..91ddac2279 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewCB.java @@ -112,7 +112,7 @@ public class RestrictionsViewCB extends CachedViewCB implements /////////////////////////////////////////////////////////////////////////////////////////// - // Override + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java index bf8c4380ff..c57b6b5d2e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsModel.java @@ -27,7 +27,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SeedWordsModel extends UIModel { +class SeedWordsModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(SeedWordsModel.class); private List mnemonicCode; @@ -76,7 +76,7 @@ public class SeedWordsModel extends UIModel { // Getter /////////////////////////////////////////////////////////////////////////////////////////// - public List getMnemonicCode() { + List getMnemonicCode() { return mnemonicCode; } } diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java index 03ac38fe4a..b0af02574c 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java @@ -28,10 +28,10 @@ import javafx.beans.property.StringProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SeedWordsPM extends PresentationModel { +class SeedWordsPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(SeedWordsPM.class); - public final StringProperty seedWords = new SimpleStringProperty(); + final StringProperty seedWords = new SimpleStringProperty(); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java index 1e845ebf4b..5de3273956 100644 --- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewCB.java @@ -85,7 +85,7 @@ public class SeedWordsViewCB extends CachedViewCB implements Contex /////////////////////////////////////////////////////////////////////////////////////////// - // Override + // ContextAware implementation /////////////////////////////////////////////////////////////////////////////////////////// @Override diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java index 8dd43c2e0a..b3f6e74346 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsModel.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSettingsModel extends UIModel { +class AccountSettingsModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(AccountSettingsModel.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java index df27d706e4..23257ef2b8 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsPM.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSettingsPM extends PresentationModel { +class AccountSettingsPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(AccountSettingsPM.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java index 8e64fc12ac..873592331d 100644 --- a/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsViewCB.java @@ -45,7 +45,7 @@ import de.jensd.fx.fontawesome.AwesomeIcon; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSettingsViewCB extends CachedViewCB { +class AccountSettingsViewCB extends CachedViewCB { private static final Logger log = LoggerFactory.getLogger(AccountSettingsViewCB.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java index ced5b3e9f0..3e227f516a 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupModel.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSetupModel extends UIModel { +class AccountSetupModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(AccountSetupModel.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java index 0be3c953d4..b78e9230f4 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupPM.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSetupPM extends PresentationModel { +class AccountSetupPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(AccountSetupPM.class); diff --git a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java index 436e739eb6..f8bab96479 100644 --- a/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupViewCB.java @@ -48,7 +48,7 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AccountSetupViewCB extends CachedViewCB implements MultiStepNavigation { +class AccountSetupViewCB extends CachedViewCB implements MultiStepNavigation { private static final Logger log = LoggerFactory.getLogger(AccountSetupViewCB.class); @@ -130,9 +130,10 @@ public class AccountSetupViewCB extends CachedViewCB implements /////////////////////////////////////////////////////////////////////////////////////////// - // UI handlers + // MultiStepNavigation implementation /////////////////////////////////////////////////////////////////////////////////////////// + @Override public void nextStep(ViewCB childView) { if (childView instanceof SeedWordsViewCB) { seedWords.onCompleted(); diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeController.java b/src/main/java/io/bitsquare/gui/main/home/HomeController.java index 641ee0815e..7d96423d24 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeController.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeController.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.home; import io.bitsquare.BitSquare; -import io.bitsquare.gui.CachedViewController; +import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationController; import io.bitsquare.util.ViewLoader; @@ -36,29 +36,33 @@ import javafx.stage.Modality; import javafx.stage.Stage; // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, -// probably overview, event history, new, charts,... -> low prio -public class HomeController extends CachedViewController { +// probably overview, event history, news, charts,... -> low prio +public class HomeController extends CachedViewCB { private ArbitratorRegistrationController arbitratorRegistrationController; /////////////////////////////////////////////////////////////////////////////////////////// // Lifecycle /////////////////////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("EmptyMethod") @Override public void initialize(URL url, ResourceBundle rb) { super.initialize(url, rb); } + @SuppressWarnings("EmptyMethod") @Override public void terminate() { super.terminate(); } + @SuppressWarnings("EmptyMethod") @Override public void deactivate() { super.deactivate(); } + @SuppressWarnings("EmptyMethod") @Override public void activate() { super.activate(); @@ -70,9 +74,9 @@ public class HomeController extends CachedViewController { /////////////////////////////////////////////////////////////////////////////////////////// @Override - public Initializable loadViewAndGetChildController(Navigation.Item item) { + protected Initializable loadView(Navigation.Item navigationItem) { // don't use caching here, cause exc. -> need to investigate and is rarely called so no caching is better - final ViewLoader loader = new ViewLoader(getClass().getResource(item.getFxmlUrl()), false); + final ViewLoader loader = new ViewLoader(getClass().getResource(navigationItem.getFxmlUrl()), false); try { final Parent view = loader.load(); arbitratorRegistrationController = loader.getController(); @@ -107,12 +111,12 @@ public class HomeController extends CachedViewController { @FXML public void onArbitratorRegistration() { - loadViewAndGetChildController(Navigation.Item.ARBITRATOR_REGISTRATION); + loadView(Navigation.Item.ARBITRATOR_REGISTRATION); } @FXML public void onArbitratorEdit() { - loadViewAndGetChildController(Navigation.Item.ARBITRATOR_REGISTRATION); + loadView(Navigation.Item.ARBITRATOR_REGISTRATION); arbitratorRegistrationController.setEditMode(true); } diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml index 6ef6d8d1b6..a18df0bb86 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml @@ -17,20 +17,20 @@ ~ along with Bitsquare. If not, see . --> + - - - - -