mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-20 13:54:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Apply code inspector suggestions

Browse source
This commit is contained in:
Manfred Karrer 2014-09-08 21:49:40 +02:00
parent d4e52e2acb
commit 15838a7446
29 changed files with 75 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/io/bitsquare/gui/account/AccountCB.java
View file

@ -49,7 +49,7 @@ public class AccountCB extends CachedCodeBehind<AccountPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public AccountCB(AccountPM presentationModel) {
private AccountCB(AccountPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/AccountModel.java
View file

@ -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;
}

4
src/main/java/io/bitsquare/gui/account/AccountPm.java
View file

@ -24,7 +24,7 @@ import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AccountPM extends PresentationModel<AccountModel> {
class AccountPM extends PresentationModel<AccountModel> {
private static final Logger log = LoggerFactory.getLogger(AccountPM.class);
///////////////////////////////////////////////////////////////////////////////////////////
@ -32,7 +32,7 @@ public class AccountPM extends PresentationModel<AccountModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public AccountPM(AccountModel model) {
private AccountPM(AccountModel model) {
super(model);
}

2
src/main/java/io/bitsquare/gui/account/addpassword/PasswordCB.java
View file

@ -51,7 +51,7 @@ public class PasswordCB extends CachedCodeBehind<PasswordPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public PasswordCB(PasswordPM presentationModel) {
private PasswordCB(PasswordPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/addpassword/PasswordModel.java
View file

@ -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() {
}

4
src/main/java/io/bitsquare/gui/account/addpassword/PasswordPM.java
View file

@ -31,7 +31,7 @@ import javafx.beans.property.StringProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PasswordPM extends PresentationModel<PasswordModel> {
class PasswordPM extends PresentationModel<PasswordModel> {
private static final Logger log = LoggerFactory.getLogger(PasswordPM.class);
private final PasswordValidator passwordValidator = new PasswordValidator();
@ -46,7 +46,7 @@ public class PasswordPM extends PresentationModel<PasswordModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public PasswordPM(PasswordModel model) {
private PasswordPM(PasswordModel model) {
super(model);
passwordField.addListener((ov) -> saveButtonDisabled.set(!validate()));

4
src/main/java/io/bitsquare/gui/account/changepassword/PasswordCB.java
View file

@ -37,7 +37,7 @@ import javafx.scene.layout.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PasswordCB extends CachedCodeBehind<PasswordPM> {
class PasswordCB extends CachedCodeBehind<PasswordPM> {
private static final Logger log = LoggerFactory.getLogger(PasswordCB.class);
@ -51,7 +51,7 @@ public class PasswordCB extends CachedCodeBehind<PasswordPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public PasswordCB(PasswordPM presentationModel) {
private PasswordCB(PasswordPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/changepassword/PasswordModel.java
View file

@ -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() {
}

4
src/main/java/io/bitsquare/gui/account/changepassword/PasswordPM.java
View file

@ -31,7 +31,7 @@ import javafx.beans.property.StringProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PasswordPM extends PresentationModel<PasswordModel> {
class PasswordPM extends PresentationModel<PasswordModel> {
private static final Logger log = LoggerFactory.getLogger(PasswordPM.class);
private final PasswordValidator passwordValidator = new PasswordValidator();
@ -46,7 +46,7 @@ public class PasswordPM extends PresentationModel<PasswordModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public PasswordPM(PasswordModel model) {
private PasswordPM(PasswordModel model) {
super(model);
passwordField.addListener((ov) -> saveButtonDisabled.set(!validate()));

2
src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountCB.java
View file

@ -72,7 +72,7 @@ public class FiatAccountCB extends CachedCodeBehind<FiatAccountPm> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public FiatAccountCB(FiatAccountPm presentationModel) {
private FiatAccountCB(FiatAccountPm presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountModel.java
View file

@ -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;

4
src/main/java/io/bitsquare/gui/account/fiataccount/FiatAccountPm.java
View file

@ -43,7 +43,7 @@ import javafx.util.StringConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FiatAccountPm extends PresentationModel<FiatAccountModel> {
class FiatAccountPm extends PresentationModel<FiatAccountModel> {
private static final Logger log = LoggerFactory.getLogger(FiatAccountPm.class);
private final BankAccountNumberValidator validator = new BankAccountNumberValidator();
@ -68,7 +68,7 @@ public class FiatAccountPm extends PresentationModel<FiatAccountModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public FiatAccountPm(FiatAccountModel model) {
private FiatAccountPm(FiatAccountModel model) {
super(model);
}

4
src/main/java/io/bitsquare/gui/account/registration/RegistrationCB.java
View file

@ -65,7 +65,7 @@ public class RegistrationCB extends CachedCodeBehind<RegistrationPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public RegistrationCB(RegistrationPM presentationModel) {
private RegistrationCB(RegistrationPM presentationModel) {
super(presentationModel);
}
@ -160,7 +160,7 @@ public class RegistrationCB extends CachedCodeBehind<RegistrationPM> {
// ((GridPane) root).getChildren().remove(completedButton);
}
}
///////////////////////////////////////////////////////////////////////////////////////////
// UI handlers
///////////////////////////////////////////////////////////////////////////////////////////

6
src/main/java/io/bitsquare/gui/account/registration/RegistrationModel.java
View file

@ -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;

4
src/main/java/io/bitsquare/gui/account/registration/RegistrationPm.java
View file

@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
import static io.bitsquare.gui.util.BSFormatter.formatCoinWithCode;
public class RegistrationPM extends PresentationModel<RegistrationModel> {
class RegistrationPM extends PresentationModel<RegistrationModel> {
private static final Logger log = LoggerFactory.getLogger(RegistrationPM.class);
// Those are needed for the addressTextField
@ -53,7 +53,7 @@ public class RegistrationPM extends PresentationModel<RegistrationModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public RegistrationPM(RegistrationModel model) {
private RegistrationPM(RegistrationModel model) {
super(model);
}

2
src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsCB.java
View file

@ -69,7 +69,7 @@ public class RestrictionsCB extends CachedCodeBehind<RestrictionsPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public RestrictionsCB(RestrictionsPM presentationModel) {
private RestrictionsCB(RestrictionsPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsModel.java
View file

@ -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;

4
src/main/java/io/bitsquare/gui/account/restrictions/RestrictionsPm.java
View file

@ -33,7 +33,7 @@ import javafx.collections.ObservableList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RestrictionsPM extends PresentationModel<RestrictionsModel> {
class RestrictionsPM extends PresentationModel<RestrictionsModel> {
private static final Logger log = LoggerFactory.getLogger(RestrictionsPM.class);
@ -45,7 +45,7 @@ public class RestrictionsPM extends PresentationModel<RestrictionsModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public RestrictionsPM(RestrictionsModel model) {
private RestrictionsPM(RestrictionsModel model) {
super(model);
}

2
src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsCB.java
View file

@ -50,7 +50,7 @@ public class SeedWordsCB extends CachedCodeBehind<SeedWordsPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public SeedWordsCB(SeedWordsPM presentationModel) {
private SeedWordsCB(SeedWordsPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsModel.java
View file

@ -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<String> 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();
}

4
src/main/java/io/bitsquare/gui/account/seedwords/SeedWordsPm.java
View file

@ -28,7 +28,7 @@ import javafx.beans.property.StringProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SeedWordsPM extends PresentationModel<SeedWordsModel> {
class SeedWordsPM extends PresentationModel<SeedWordsModel> {
private static final Logger log = LoggerFactory.getLogger(SeedWordsPM.class);
final StringProperty seedWords = new SimpleStringProperty();
@ -39,7 +39,7 @@ public class SeedWordsPM extends PresentationModel<SeedWordsModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public SeedWordsPM(SeedWordsModel model) {
private SeedWordsPM(SeedWordsModel model) {
super(model);
}

2
src/main/java/io/bitsquare/gui/account/settings/AccountSettingsCB.java
View file

@ -54,7 +54,7 @@ public class AccountSettingsCB extends CachedCodeBehind<AccountSettingsPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public AccountSettingsCB(AccountSettingsPM presentationModel) {
private AccountSettingsCB(AccountSettingsPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/settings/AccountSettingsModel.java
View file

@ -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() {
}

4
src/main/java/io/bitsquare/gui/account/settings/AccountSettingsPM.java
View file

@ -24,7 +24,7 @@ import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AccountSettingsPM extends PresentationModel<AccountSettingsModel> {
class AccountSettingsPM extends PresentationModel<AccountSettingsModel> {
private static final Logger log = LoggerFactory.getLogger(AccountSettingsPM.class);
///////////////////////////////////////////////////////////////////////////////////////////
@ -32,7 +32,7 @@ public class AccountSettingsPM extends PresentationModel<AccountSettingsModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public AccountSettingsPM(AccountSettingsModel model) {
private AccountSettingsPM(AccountSettingsModel model) {
super(model);
}

2
src/main/java/io/bitsquare/gui/account/setup/SetupCB.java
View file

@ -59,7 +59,7 @@ public class SetupCB extends CachedCodeBehind<SetupPM> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public SetupCB(SetupPM presentationModel) {
private SetupCB(SetupPM presentationModel) {
super(presentationModel);
}

4
src/main/java/io/bitsquare/gui/account/setup/SetupModel.java
View file

@ -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() {
}

4
src/main/java/io/bitsquare/gui/account/setup/SetupPm.java
View file

@ -24,7 +24,7 @@ import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SetupPM extends PresentationModel<SetupModel> {
class SetupPM extends PresentationModel<SetupModel> {
private static final Logger log = LoggerFactory.getLogger(SetupPM.class);
///////////////////////////////////////////////////////////////////////////////////////////
@ -32,7 +32,7 @@ public class SetupPM extends PresentationModel<SetupModel> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public SetupPM(SetupModel model) {
private SetupPM(SetupModel model) {
super(model);
}

2
src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferModel.java
View file

@ -200,7 +200,7 @@ class CreateOfferModel extends UIModel {
transactionId.set(transaction.getHashAsString());
requestPlaceOfferSuccess.set(true);
},
(errorMessage) -> requestPlaceOfferErrorMessage.set(errorMessage)
requestPlaceOfferErrorMessage::set
);
}

68
src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml
View file

@ -63,9 +63,7 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="20.0"/>
</GridPane.margin>
<ImageView fitHeight="54.0" fitWidth="62.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@/images/buy_62_54.png"/>
</image>
<Image url="@/images/buy_62_54.png"/>
</ImageView>
<Label fx:id="buyLabel" id="direction-icon-label" text="%createOffer.amountPriceBox.subTitle"
alignment="CENTER">
@ -80,18 +78,14 @@
<Insets right="10.0" top="20.0"/>
</GridPane.margin>
<VBox spacing="4">
<children>
<Label id="input-description-label" text="%createOffer.amountPriceBox.amountDescr"
prefWidth="170"/>
<HBox>
<children>
<InputTextField fx:id="amountTextField" id="text-input-with-currency-text-field"
promptText="%createOffer.amount.prompt" prefWidth="170"
alignment="CENTER_RIGHT"/>
<Label fx:id="amountBtcLabel" id="currency-info-label"/>
</children>
</HBox>
</children>
<Label id="input-description-label" text="%createOffer.amountPriceBox.amountDescr"
prefWidth="170"/>
<HBox>
<InputTextField fx:id="amountTextField" id="text-input-with-currency-text-field"
promptText="%createOffer.amount.prompt" prefWidth="170"
alignment="CENTER_RIGHT"/>
<Label fx:id="amountBtcLabel" id="currency-info-label"/>
</HBox>
</VBox>
<Label text="x">
<font>
@ -103,17 +97,13 @@
</Label>
<VBox spacing="4">
<children>
<Label fx:id="priceDescriptionLabel" id="input-description-label" prefWidth="170"/>
<HBox>
<children>
<InputTextField fx:id="priceTextField" id="text-input-with-currency-text-field"
promptText="%createOffer.price.prompt" prefWidth="170"
alignment="CENTER_RIGHT"/>
<Label fx:id="priceFiatLabel" id="currency-info-label" alignment="CENTER"/>
</children>
</HBox>
</children>
<Label fx:id="priceDescriptionLabel" id="input-description-label" prefWidth="170"/>
<HBox>
<InputTextField fx:id="priceTextField" id="text-input-with-currency-text-field"
promptText="%createOffer.price.prompt" prefWidth="170"
alignment="CENTER_RIGHT"/>
<Label fx:id="priceFiatLabel" id="currency-info-label" alignment="CENTER"/>
</HBox>
</VBox>
<Label text="=">
@ -126,16 +116,12 @@
</Label>
<VBox spacing="4">
<children>
<Label fx:id="volumeDescriptionLabel" id="input-description-label" prefWidth="170"/>
<HBox>
<children>
<InputTextField fx:id="volumeTextField" id="text-input-with-currency-text-field"
prefWidth="170" alignment="CENTER_RIGHT"/>
<Label fx:id="volumeFiatLabel" id="currency-info-label"/>
</children>
</HBox>
</children>
<Label fx:id="volumeDescriptionLabel" id="input-description-label" prefWidth="170"/>
<HBox>
<InputTextField fx:id="volumeTextField" id="text-input-with-currency-text-field"
prefWidth="170" alignment="CENTER_RIGHT"/>
<Label fx:id="volumeFiatLabel" id="currency-info-label"/>
</HBox>
</VBox>
</HBox>
@ -146,12 +132,10 @@
<Label id="input-description-label" text="%createOffer.amountPriceBox.minAmountDescr"
prefWidth="170.0"/>
<HBox>
<children>
<InputTextField fx:id="minAmountTextField" id="text-input-with-currency-text-field"
promptText="%createOffer.minAmount.prompt" alignment="CENTER_RIGHT"
prefWidth="170.0"/>
<Label fx:id="minAmountBtcLabel" id="currency-info-label"/>
</children>
<InputTextField fx:id="minAmountTextField" id="text-input-with-currency-text-field"
promptText="%createOffer.minAmount.prompt" alignment="CENTER_RIGHT"
prefWidth="170.0"/>
<Label fx:id="minAmountBtcLabel" id="currency-info-label"/>
</HBox>
</VBox>