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;
@Inject
private AccountModel(User user) {
public AccountModel(User user) {
this.user = user;
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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