Use public constructors in gui model classes

This commit is contained in:
Chris Beams 2014-11-22 10:25:22 +01:00
parent dd4851440b
commit 1551d09cf0
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
25 changed files with 30 additions and 37 deletions

View file

@ -27,7 +27,7 @@ class AccountModel extends UIModel {
private final User user; private final User user;
@Inject @Inject
private AccountModel(User user) { public AccountModel(User user) {
this.user = user; this.user = user;
} }

View file

@ -24,7 +24,7 @@ import com.google.inject.Inject;
class AccountPM extends PresentationModel<AccountModel> { class AccountPM extends PresentationModel<AccountModel> {
@Inject @Inject
private AccountPM(AccountModel model) { public AccountPM(AccountModel model) {
super(model); super(model);
} }

View file

@ -24,7 +24,7 @@ import com.google.inject.Inject;
class ChangePasswordModel extends UIModel { class ChangePasswordModel extends UIModel {
@Inject @Inject
private ChangePasswordModel() { public ChangePasswordModel() {
} }
@SuppressWarnings("EmptyMethod") @SuppressWarnings("EmptyMethod")

View file

@ -40,7 +40,7 @@ class ChangePasswordPM extends PresentationModel<ChangePasswordModel> {
@Inject @Inject
private ChangePasswordPM(ChangePasswordModel model, PasswordValidator passwordValidator) { public ChangePasswordPM(ChangePasswordModel model, PasswordValidator passwordValidator) {
super(model); super(model);
this.passwordValidator = passwordValidator; this.passwordValidator = passwordValidator;

View file

@ -67,7 +67,7 @@ class FiatAccountModel extends UIModel {
@Inject @Inject
FiatAccountModel(User user, Persistence persistence, AccountSettings accountSettings) { public FiatAccountModel(User user, Persistence persistence, AccountSettings accountSettings) {
this.persistence = persistence; this.persistence = persistence;
this.user = user; this.user = user;
this.accountSettings = accountSettings; this.accountSettings = accountSettings;

View file

@ -59,7 +59,7 @@ class FiatAccountPm extends PresentationModel<FiatAccountModel> {
@Inject @Inject
FiatAccountPm(FiatAccountModel model, BankAccountNumberValidator bankAccountNumberValidator) { public FiatAccountPm(FiatAccountModel model, BankAccountNumberValidator bankAccountNumberValidator) {
super(model); super(model);
this.bankAccountNumberValidator = bankAccountNumberValidator; this.bankAccountNumberValidator = bankAccountNumberValidator;
} }

View file

@ -69,7 +69,7 @@ class IrcAccountModel extends UIModel {
@Inject @Inject
IrcAccountModel(User user, Persistence persistence, AccountSettings accountSettings, public IrcAccountModel(User user, Persistence persistence, AccountSettings accountSettings,
MessageService messageService) { MessageService messageService) {
this.persistence = persistence; this.persistence = persistence;
this.user = user; this.user = user;

View file

@ -48,7 +48,7 @@ class IrcAccountPm extends PresentationModel<IrcAccountModel> {
@Inject @Inject
IrcAccountPm(IrcAccountModel model, BankAccountNumberValidator nickNameValidator) { public IrcAccountPm(IrcAccountModel model, BankAccountNumberValidator nickNameValidator) {
super(model); super(model);
this.nickNameValidator = nickNameValidator; this.nickNameValidator = nickNameValidator;
} }

View file

@ -25,7 +25,7 @@ class PasswordModel extends UIModel {
@Inject @Inject
private PasswordModel() { public PasswordModel() {
} }

View file

@ -40,7 +40,7 @@ class PasswordPM extends PresentationModel<PasswordModel> {
@Inject @Inject
private PasswordPM(PasswordModel model, PasswordValidator passwordValidator) { public PasswordPM(PasswordModel model, PasswordValidator passwordValidator) {
super(model); super(model);
this.passwordValidator = passwordValidator; this.passwordValidator = passwordValidator;

View file

@ -61,7 +61,7 @@ class RegistrationModel extends UIModel {
@Inject @Inject
private RegistrationModel(WalletService walletService, User user, Persistence persistence) { public RegistrationModel(WalletService walletService, User user, Persistence persistence) {
this.walletService = walletService; this.walletService = walletService;
this.user = user; this.user = user;

View file

@ -48,7 +48,7 @@ class RegistrationPM extends PresentationModel<RegistrationModel> {
@Inject @Inject
private RegistrationPM(RegistrationModel model, BSFormatter formatter) { public RegistrationPM(RegistrationModel model, BSFormatter formatter) {
super(model); super(model);
this.formatter = formatter; this.formatter = formatter;
} }

View file

@ -59,7 +59,7 @@ class RestrictionsModel extends UIModel {
@Inject @Inject
private RestrictionsModel(User user, AccountSettings accountSettings, Persistence persistence, public RestrictionsModel(User user, AccountSettings accountSettings, Persistence persistence,
MessageService messageService) { MessageService messageService) {
this.user = user; this.user = user;
this.accountSettings = accountSettings; this.accountSettings = accountSettings;

View file

@ -36,7 +36,7 @@ class RestrictionsPM extends PresentationModel<RestrictionsModel> {
@Inject @Inject
private RestrictionsPM(RestrictionsModel model) { public RestrictionsPM(RestrictionsModel model) {
super(model); super(model);
} }

View file

@ -30,7 +30,7 @@ class SeedWordsModel extends UIModel {
@Inject @Inject
private SeedWordsModel(WalletService walletService) { public SeedWordsModel(WalletService walletService) {
if (walletService != null && walletService.getWallet() != null) if (walletService != null && walletService.getWallet() != null)
mnemonicCode = walletService.getWallet().getKeyChainSeed().getMnemonicCode(); mnemonicCode = walletService.getWallet().getKeyChainSeed().getMnemonicCode();
} }

View file

@ -32,7 +32,7 @@ class SeedWordsPM extends PresentationModel<SeedWordsModel> {
@Inject @Inject
private SeedWordsPM(SeedWordsModel model, BSFormatter formatter) { public SeedWordsPM(SeedWordsModel model, BSFormatter formatter) {
super(model); super(model);
this.formatter = formatter; this.formatter = formatter;
} }

View file

@ -78,7 +78,7 @@ class PendingTradesModel extends UIModel {
@Inject @Inject
PendingTradesModel(TradeManager tradeManager, WalletService walletService, User user) { public PendingTradesModel(TradeManager tradeManager, WalletService walletService, User user) {
this.tradeManager = tradeManager; this.tradeManager = tradeManager;
this.walletService = walletService; this.walletService = walletService;
this.user = user; this.user = user;

View file

@ -69,7 +69,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
@Inject @Inject
PendingTradesPM(PendingTradesModel model, BSFormatter formatter, public PendingTradesPM(PendingTradesModel model, BSFormatter formatter,
BtcAddressValidator btcAddressValidator) { BtcAddressValidator btcAddressValidator) {
super(model); super(model);

View file

@ -46,7 +46,7 @@ class PreferencesModel extends UIModel {
@Inject @Inject
PreferencesModel(Preferences preferences) { public PreferencesModel(Preferences preferences) {
this.preferences = preferences; this.preferences = preferences;
btcDenominations = FXCollections.observableArrayList(preferences.getBtcDenominations()); btcDenominations = FXCollections.observableArrayList(preferences.getBtcDenominations());

View file

@ -28,7 +28,7 @@ import javafx.collections.ObservableList;
public class PreferencesPM extends PresentationModel<PreferencesModel> { public class PreferencesPM extends PresentationModel<PreferencesModel> {
@Inject @Inject
PreferencesPM(PreferencesModel model) { public PreferencesPM(PreferencesModel model) {
super(model); super(model);
} }

View file

@ -91,9 +91,8 @@ class CreateOfferPM extends PresentationModel<CreateOfferModel> {
final ObjectProperty<Address> address = new SimpleObjectProperty<>(); final ObjectProperty<Address> address = new SimpleObjectProperty<>();
// non private for testing
@Inject @Inject
CreateOfferPM(CreateOfferModel model, FiatValidator fiatValidator, BtcValidator btcValidator, public CreateOfferPM(CreateOfferModel model, FiatValidator fiatValidator, BtcValidator btcValidator,
BSFormatter formatter) { BSFormatter formatter) {
super(model); super(model);

View file

@ -78,10 +78,7 @@ class OfferBookModel extends UIModel {
@Inject @Inject
OfferBookModel(User user, public OfferBookModel(User user, TradeManager tradeManager, OfferBook offerBook, Preferences preferences,
TradeManager tradeManager,
OfferBook offerBook,
Preferences preferences,
BSFormatter formatter) { BSFormatter formatter) {
this.tradeManager = tradeManager; this.tradeManager = tradeManager;
this.user = user; this.user = user;

View file

@ -50,10 +50,8 @@ class OfferBookPM extends PresentationModel<OfferBookModel> {
@Inject @Inject
OfferBookPM(OfferBookModel model, public OfferBookPM(OfferBookModel model, OptionalFiatValidator optionalFiatValidator,
OptionalFiatValidator optionalFiatValidator, OptionalBtcValidator optionalBtcValidator, BSFormatter formatter) {
OptionalBtcValidator optionalBtcValidator,
BSFormatter formatter) {
super(model); super(model);
this.optionalFiatValidator = optionalFiatValidator; this.optionalFiatValidator = optionalFiatValidator;

View file

@ -79,8 +79,8 @@ class TakeOfferModel extends UIModel {
@Inject @Inject
TakeOfferModel(TradeManager tradeManager, WalletService walletService, public TakeOfferModel(TradeManager tradeManager, WalletService walletService, Preferences preferences,
Preferences preferences, Persistence persistence) { Persistence persistence) {
this.tradeManager = tradeManager; this.tradeManager = tradeManager;
this.walletService = walletService; this.walletService = walletService;
this.preferences = preferences; this.preferences = preferences;

View file

@ -85,9 +85,8 @@ class TakeOfferPM extends PresentationModel<TakeOfferModel> {
final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>(); final ObjectProperty<Coin> totalToPayAsCoin = new SimpleObjectProperty<>();
// non private for testing
@Inject @Inject
TakeOfferPM(TakeOfferModel model, BtcValidator btcValidator, BSFormatter formatter) { public TakeOfferPM(TakeOfferModel model, BtcValidator btcValidator, BSFormatter formatter) {
super(model); super(model);
this.btcValidator = btcValidator; this.btcValidator = btcValidator;