From 15838a7446bc2aac2f41b1def64e4bca4bb2f206 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 8 Sep 2014 21:49:40 +0200 Subject: [PATCH] Apply code inspector suggestions --- .../io/bitsquare/gui/account/AccountCB.java | 2 +- .../bitsquare/gui/account/AccountModel.java | 4 +- .../io/bitsquare/gui/account/AccountPm.java | 4 +- .../gui/account/addpassword/PasswordCB.java | 2 +- .../account/addpassword/PasswordModel.java | 4 +- .../gui/account/addpassword/PasswordPM.java | 4 +- .../account/changepassword/PasswordCB.java | 4 +- .../account/changepassword/PasswordModel.java | 4 +- .../account/changepassword/PasswordPM.java | 4 +- .../account/fiataccount/FiatAccountCB.java | 2 +- .../account/fiataccount/FiatAccountModel.java | 4 +- .../account/fiataccount/FiatAccountPm.java | 4 +- .../account/registration/RegistrationCB.java | 4 +- .../registration/RegistrationModel.java | 6 +- .../account/registration/RegistrationPm.java | 4 +- .../account/restrictions/RestrictionsCB.java | 2 +- .../restrictions/RestrictionsModel.java | 4 +- .../account/restrictions/RestrictionsPm.java | 4 +- .../gui/account/seedwords/SeedWordsCB.java | 2 +- .../gui/account/seedwords/SeedWordsModel.java | 4 +- .../gui/account/seedwords/SeedWordsPm.java | 4 +- .../account/settings/AccountSettingsCB.java | 2 +- .../settings/AccountSettingsModel.java | 4 +- .../account/settings/AccountSettingsPM.java | 4 +- .../bitsquare/gui/account/setup/SetupCB.java | 2 +- .../gui/account/setup/SetupModel.java | 4 +- .../bitsquare/gui/account/setup/SetupPm.java | 4 +- .../trade/createoffer/CreateOfferModel.java | 2 +- .../trade/createoffer/CreateOfferView.fxml | 68 +++++++------------ 29 files changed, 75 insertions(+), 91 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/account/AccountCB.java b/src/main/java/io/bitsquare/gui/account/AccountCB.java index 15ffd6e30e..1c2ae80166 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountCB.java +++ b/src/main/java/io/bitsquare/gui/account/AccountCB.java @@ -49,7 +49,7 @@ public class AccountCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public AccountCB(AccountPM presentationModel) { + private AccountCB(AccountPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/AccountModel.java b/src/main/java/io/bitsquare/gui/account/AccountModel.java index e98fc784c6..cd59dd5f4e 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountModel.java +++ b/src/main/java/io/bitsquare/gui/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; @@ -34,7 +34,7 @@ public class AccountModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public AccountModel(User user) { + private AccountModel(User user) { this.user = user; } diff --git a/src/main/java/io/bitsquare/gui/account/AccountPm.java b/src/main/java/io/bitsquare/gui/account/AccountPm.java index 68c8320f16..df59105655 100644 --- a/src/main/java/io/bitsquare/gui/account/AccountPm.java +++ b/src/main/java/io/bitsquare/gui/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); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class AccountPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public AccountPM(AccountModel model) { + private AccountPM(AccountModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java b/src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java index 195e55ddd7..04d58c2cdc 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java +++ b/src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java @@ -51,7 +51,7 @@ public class PasswordCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public PasswordCB(PasswordPM presentationModel) { + private PasswordCB(PasswordPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java b/src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java index 1afa10a259..18da311b8f 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/account/addpassword/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); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class PasswordModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public PasswordModel() { + private PasswordModel() { } diff --git a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java b/src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java index 21a37116d9..1f79a0af49 100644 --- a/src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java @@ -31,7 +31,7 @@ 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 = new PasswordValidator(); @@ -46,7 +46,7 @@ public class PasswordPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public PasswordPM(PasswordModel model) { + private PasswordPM(PasswordModel model) { super(model); passwordField.addListener((ov) -> saveButtonDisabled.set(!validate())); diff --git a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordCB.java b/src/main/java/io/bitsquare/gui/account/changepassword/PasswordCB.java index 1c502a064b..d96089e998 100644 --- a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordCB.java +++ b/src/main/java/io/bitsquare/gui/account/changepassword/PasswordCB.java @@ -37,7 +37,7 @@ import javafx.scene.layout.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PasswordCB extends CachedCodeBehind { +class PasswordCB extends CachedCodeBehind { private static final Logger log = LoggerFactory.getLogger(PasswordCB.class); @@ -51,7 +51,7 @@ public class PasswordCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public PasswordCB(PasswordPM presentationModel) { + private PasswordCB(PasswordPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java b/src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java index 830d823b15..649c8ef9bf 100644 --- a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java +++ b/src/main/java/io/bitsquare/gui/account/changepassword/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); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class PasswordModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public PasswordModel() { + private PasswordModel() { } diff --git a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java b/src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java index 95d0cac532..d0c7c145cc 100644 --- a/src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java +++ b/src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java @@ -31,7 +31,7 @@ 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 = new PasswordValidator(); @@ -46,7 +46,7 @@ public class PasswordPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public PasswordPM(PasswordModel model) { + private PasswordPM(PasswordModel model) { super(model); passwordField.addListener((ov) -> saveButtonDisabled.set(!validate())); diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java b/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java index d84c140bd7..8d41e6440e 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java +++ b/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java @@ -72,7 +72,7 @@ public class FiatAccountCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public FiatAccountCB(FiatAccountPm presentationModel) { + private FiatAccountCB(FiatAccountPm presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java b/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java index 1419e5505e..fcdecc0454 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java +++ b/src/main/java/io/bitsquare/gui/account/fiataccount/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; @@ -74,7 +74,7 @@ public class FiatAccountModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public FiatAccountModel(User user, Persistence persistence, Settings settings) { + private FiatAccountModel(User user, Persistence persistence, Settings settings) { this.persistence = persistence; this.user = user; this.settings = settings; diff --git a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java b/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java index 4e9dc0a058..188659dc8c 100644 --- a/src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java +++ b/src/main/java/io/bitsquare/gui/account/fiataccount/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 validator = new BankAccountNumberValidator(); @@ -68,7 +68,7 @@ public class FiatAccountPm extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public FiatAccountPm(FiatAccountModel model) { + private FiatAccountPm(FiatAccountModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java b/src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java index 4b231ffb5b..ea38dc19a3 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java +++ b/src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java @@ -65,7 +65,7 @@ public class RegistrationCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public RegistrationCB(RegistrationPM presentationModel) { + private RegistrationCB(RegistrationPM presentationModel) { super(presentationModel); } @@ -160,7 +160,7 @@ public class RegistrationCB extends CachedCodeBehind { // ((GridPane) root).getChildren().remove(completedButton); } } - + /////////////////////////////////////////////////////////////////////////////////////////// // UI handlers /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java b/src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java index 061c528976..07692b4b2c 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java +++ b/src/main/java/io/bitsquare/gui/account/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; @@ -54,7 +54,7 @@ public class RegistrationModel extends UIModel { AddressEntry addressEntry; final BooleanProperty isWalletFunded = new SimpleBooleanProperty(); final BooleanProperty payFeeSuccess = new SimpleBooleanProperty(); - String transactionId; + private String transactionId; final StringProperty payFeeErrorMessage = new SimpleStringProperty(); /////////////////////////////////////////////////////////////////////////////////////////// @@ -62,7 +62,7 @@ public class RegistrationModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public RegistrationModel(WalletFacade walletFacade, User user, Persistence persistence) { + private RegistrationModel(WalletFacade walletFacade, User user, Persistence persistence) { this.walletFacade = walletFacade; this.user = user; diff --git a/src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java b/src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java index 7ae583c283..c7e42b4811 100644 --- a/src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java +++ b/src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java @@ -38,7 +38,7 @@ 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); // Those are needed for the addressTextField @@ -53,7 +53,7 @@ public class RegistrationPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public RegistrationPM(RegistrationModel model) { + private RegistrationPM(RegistrationModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java b/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java index e32b9cee3f..8d3313e53f 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java +++ b/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java @@ -69,7 +69,7 @@ public class RestrictionsCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public RestrictionsCB(RestrictionsPM presentationModel) { + private RestrictionsCB(RestrictionsPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java b/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java index 4a849de668..dfc5b751dd 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java +++ b/src/main/java/io/bitsquare/gui/account/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; @@ -66,7 +66,7 @@ public class RestrictionsModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public RestrictionsModel(User user, Settings settings, Persistence persistence, MessageFacade messageFacade) { + private RestrictionsModel(User user, Settings settings, Persistence persistence, MessageFacade messageFacade) { this.user = user; this.settings = settings; this.persistence = persistence; diff --git a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java b/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java index 82996d1958..de6b782a38 100644 --- a/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java +++ b/src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java @@ -33,7 +33,7 @@ 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); @@ -45,7 +45,7 @@ public class RestrictionsPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public RestrictionsPM(RestrictionsModel model) { + private RestrictionsPM(RestrictionsModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java b/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java index b13cc62109..251f28219e 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java +++ b/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java @@ -50,7 +50,7 @@ public class SeedWordsCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public SeedWordsCB(SeedWordsPM presentationModel) { + private SeedWordsCB(SeedWordsPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java b/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java index 9d9eea61ab..ef40dfcf98 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java +++ b/src/main/java/io/bitsquare/gui/account/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); List mnemonicCode; @@ -38,7 +38,7 @@ public class SeedWordsModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public SeedWordsModel(WalletFacade walletFacade) { + private SeedWordsModel(WalletFacade walletFacade) { if (walletFacade != null && walletFacade.getWallet() != null) mnemonicCode = walletFacade.getWallet().getKeyChainSeed().getMnemonicCode(); } diff --git a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java b/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java index dd10f1722a..9da404afcb 100644 --- a/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java +++ b/src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java @@ -28,7 +28,7 @@ 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); final StringProperty seedWords = new SimpleStringProperty(); @@ -39,7 +39,7 @@ public class SeedWordsPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public SeedWordsPM(SeedWordsModel model) { + private SeedWordsPM(SeedWordsModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsCB.java b/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsCB.java index 96ee13623e..bb8bf7bfe4 100644 --- a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsCB.java +++ b/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsCB.java @@ -54,7 +54,7 @@ public class AccountSettingsCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public AccountSettingsCB(AccountSettingsPM presentationModel) { + private AccountSettingsCB(AccountSettingsPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java b/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java index a26e5c0f67..72a708a69e 100644 --- a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java +++ b/src/main/java/io/bitsquare/gui/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); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class AccountSettingsModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public AccountSettingsModel() { + private AccountSettingsModel() { } diff --git a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java b/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java index ffd969bda6..164f65ac29 100644 --- a/src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java +++ b/src/main/java/io/bitsquare/gui/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); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class AccountSettingsPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public AccountSettingsPM(AccountSettingsModel model) { + private AccountSettingsPM(AccountSettingsModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupCB.java b/src/main/java/io/bitsquare/gui/account/setup/SetupCB.java index 25adc19374..5fcfcbf380 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupCB.java +++ b/src/main/java/io/bitsquare/gui/account/setup/SetupCB.java @@ -59,7 +59,7 @@ public class SetupCB extends CachedCodeBehind { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public SetupCB(SetupPM presentationModel) { + private SetupCB(SetupPM presentationModel) { super(presentationModel); } diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupModel.java b/src/main/java/io/bitsquare/gui/account/setup/SetupModel.java index aa487dc70e..9d89b6a839 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupModel.java +++ b/src/main/java/io/bitsquare/gui/account/setup/SetupModel.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SetupModel extends UIModel { +class SetupModel extends UIModel { private static final Logger log = LoggerFactory.getLogger(SetupModel.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class SetupModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public SetupModel() { + private SetupModel() { } diff --git a/src/main/java/io/bitsquare/gui/account/setup/SetupPm.java b/src/main/java/io/bitsquare/gui/account/setup/SetupPm.java index 225c0ec59b..05421af526 100644 --- a/src/main/java/io/bitsquare/gui/account/setup/SetupPm.java +++ b/src/main/java/io/bitsquare/gui/account/setup/SetupPm.java @@ -24,7 +24,7 @@ import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SetupPM extends PresentationModel { +class SetupPM extends PresentationModel { private static final Logger log = LoggerFactory.getLogger(SetupPM.class); /////////////////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public class SetupPM extends PresentationModel { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public SetupPM(SetupModel model) { + private SetupPM(SetupModel model) { super(model); } diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java index 4eb17ee9a5..cb08cd58f3 100644 --- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java +++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java @@ -200,7 +200,7 @@ class CreateOfferModel extends UIModel { transactionId.set(transaction.getHashAsString()); requestPlaceOfferSuccess.set(true); }, - (errorMessage) -> requestPlaceOfferErrorMessage.set(errorMessage) + requestPlaceOfferErrorMessage::set ); } diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml index d9bfd77078..e303b25a36 100644 --- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml +++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml @@ -63,9 +63,7 @@ - - - +