From f6c0d02bc3b53860f492f72c85d5cb72d11417ad Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 16 Oct 2017 17:01:00 -0500 Subject: [PATCH] Refactor: Rename addAllowedPeriod to addLimitations --- .../io/bisq/gui/components/paymentmethods/AliPayForm.java | 4 ++-- .../io/bisq/gui/components/paymentmethods/BankForm.java | 4 ++-- .../gui/components/paymentmethods/CashDepositForm.java | 4 ++-- .../gui/components/paymentmethods/ChaseQuickPayForm.java | 4 ++-- .../gui/components/paymentmethods/ClearXchangeForm.java | 4 ++-- .../gui/components/paymentmethods/CryptoCurrencyForm.java | 4 ++-- .../gui/components/paymentmethods/FasterPaymentsForm.java | 4 ++-- .../components/paymentmethods/InteracETransferForm.java | 4 ++-- .../io/bisq/gui/components/paymentmethods/OKPayForm.java | 4 ++-- .../gui/components/paymentmethods/PaymentMethodForm.java | 8 ++++---- .../gui/components/paymentmethods/PerfectMoneyForm.java | 4 ++-- .../io/bisq/gui/components/paymentmethods/SepaForm.java | 4 ++-- .../io/bisq/gui/components/paymentmethods/SwishForm.java | 4 ++-- .../components/paymentmethods/USPostalMoneyOrderForm.java | 4 ++-- .../main/portfolio/pendingtrades/steps/TradeStepView.java | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java index 38633e2e68..ae382653a3 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java @@ -68,7 +68,7 @@ public class AliPayForm extends PaymentMethodForm { final TradeCurrency singleTradeCurrency = aliPayAccount.getSingleTradeCurrency(); final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -92,7 +92,7 @@ public class AliPayForm extends PaymentMethodForm { final TradeCurrency singleTradeCurrency = aliPayAccount.getSingleTradeCurrency(); final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java index da03dbd20f..4a9c2d8de4 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java @@ -246,7 +246,7 @@ abstract class BankForm extends PaymentMethodForm { addLabelTextField(gridPane, ++gridRow, BankUtil.getAccountTypeLabel(countryCode), bankAccountPayload.getAccountType()).second.setMouseTransparent(false); - addAllowedPeriod(); + addLimitations(); } @Override @@ -492,7 +492,7 @@ abstract class BankForm extends PaymentMethodForm { } }); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); updateFromInputs(); diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java index a595cce3bb..0a221906ae 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java @@ -269,7 +269,7 @@ public class CashDepositForm extends PaymentMethodForm { textArea.setText(requirements); } - addAllowedPeriod(); + addLimitations(); } @Override @@ -516,7 +516,7 @@ public class CashDepositForm extends PaymentMethodForm { updateFromInputs(); }); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); updateFromInputs(); diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java index 561c6bc381..a7abc706e8 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java @@ -79,7 +79,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm { TradeCurrency singleTradeCurrency = chaseQuickPayAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -108,7 +108,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm { TradeCurrency singleTradeCurrency = chaseQuickPayAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java index 7933efdc09..8534d9be2e 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java @@ -75,7 +75,7 @@ public class ClearXchangeForm extends PaymentMethodForm { final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -105,7 +105,7 @@ public class ClearXchangeForm extends PaymentMethodForm { final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java index 42da9186ed..2a2e135a9d 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java @@ -86,7 +86,7 @@ public class CryptoCurrencyForm extends PaymentMethodForm { updateFromInputs(); }); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -126,7 +126,7 @@ public class CryptoCurrencyForm extends PaymentMethodForm { final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; addLabelTextField(gridPane, ++gridRow, Res.get("payment.altcoin"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java index 9be4e8358b..2f0d5e542c 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java @@ -85,7 +85,7 @@ public class FasterPaymentsForm extends PaymentMethodForm { String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -114,7 +114,7 @@ public class FasterPaymentsForm extends PaymentMethodForm { TradeCurrency singleTradeCurrency = fasterPaymentsAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java index d53e7c674b..a4a407867e 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java @@ -97,7 +97,7 @@ public class InteracETransferForm extends PaymentMethodForm { String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -130,7 +130,7 @@ public class InteracETransferForm extends PaymentMethodForm { String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; FormBuilder.addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java index ee029d0a9c..0e925e9ebd 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java @@ -75,7 +75,7 @@ public class OKPayForm extends PaymentMethodForm { }); addCurrenciesGrid(true); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -136,7 +136,7 @@ public class OKPayForm extends PaymentMethodForm { TextField field = addLabelTextField(gridPane, ++gridRow, Res.get("payment.wallet"), okPayAccount.getAccountNr()).second; field.setMouseTransparent(false); - addAllowedPeriod(); + addLimitations(); addCurrenciesGrid(false); } diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java index 298abc5d78..48036b79e1 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java @@ -104,9 +104,9 @@ public abstract class PaymentMethodForm { }); } - public static void addAllowedPeriod(GridPane gridPane, int gridRow, - @Nullable PaymentAccountPayload paymentAccountPayload, - String dateFromBlocks) { + public static void addLimitations(GridPane gridPane, int gridRow, + @Nullable PaymentAccountPayload paymentAccountPayload, + String dateFromBlocks) { if (paymentAccountPayload != null) { long hours = paymentAccountPayload.getMaxTradePeriod() / 3600_000; addLabelTextField(gridPane, gridRow, Res.get("payment.maxPeriod"), @@ -126,7 +126,7 @@ public abstract class PaymentMethodForm { return time; } - protected void addAllowedPeriod() { + protected void addLimitations() { long hours = paymentAccount.getPaymentMethod().getMaxTradePeriod() / 3600_000; final TradeCurrency tradeCurrency; diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java index 488b5ba12a..a757bc3317 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java @@ -72,7 +72,7 @@ public class PerfectMoneyForm extends PaymentMethodForm { currencyComboBox.setItems(FXCollections.observableArrayList(new FiatCurrency("USD"), new FiatCurrency("EUR"))); currencyComboBox.getSelectionModel().select(0); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -98,7 +98,7 @@ public class PerfectMoneyForm extends PaymentMethodForm { final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java index 2fe80a1654..0d142c409f 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java @@ -158,7 +158,7 @@ public class SepaForm extends PaymentMethodForm { addEuroCountriesGrid(true); addNonEuroCountriesGrid(true); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); countryComboBox.setItems(FXCollections.observableArrayList(CountryUtil.getAllSepaCountries())); @@ -350,6 +350,6 @@ public class SepaForm extends PaymentMethodForm { acceptedCountries.setMouseTransparent(false); acceptedCountries.setTooltip(tooltip); } - addAllowedPeriod(); + addLimitations(); } } diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java index fa6b177495..db6098c73a 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java @@ -83,7 +83,7 @@ public class SwishForm extends PaymentMethodForm { TradeCurrency singleTradeCurrency = swishAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -112,7 +112,7 @@ public class SwishForm extends PaymentMethodForm { TradeCurrency singleTradeCurrency = swishAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java b/gui/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java index 9459cd3065..0009e91978 100644 --- a/gui/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java +++ b/gui/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java @@ -89,7 +89,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm { String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); addAccountNameTextFieldWithAutoFillCheckBox(); } @@ -119,7 +119,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm { TradeCurrency singleTradeCurrency = usPostalMoneyOrderAccount.getSingleTradeCurrency(); String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null"; addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), nameAndCode); - addAllowedPeriod(); + addLimitations(); } @Override diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java index d8987ae85e..1b853261a7 100644 --- a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java +++ b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java @@ -175,7 +175,7 @@ public abstract class TradeStepView extends AnchorPane { else txIdTextField.cleanup(); - PaymentMethodForm.addAllowedPeriod(gridPane, ++gridRow, model.dataModel.getSellersPaymentAccountPayload(), + PaymentMethodForm.addLimitations(gridPane, ++gridRow, model.dataModel.getSellersPaymentAccountPayload(), model.getDateForOpenDispute()); timeLeftTextField = addLabelTextField(gridPane, ++gridRow, Res.getWithCol("portfolio.pending.remainingTime")).second;