From 4db16760f0d89a75a1e465bbf163dacee607e157 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 7 Aug 2016 13:54:35 +0200 Subject: [PATCH] Improve auto-naming of accounts --- .../main/java/io/bitsquare/locale/BankUtil.java | 6 +++--- .../gui/components/paymentmethods/AliPayForm.java | 4 ++-- .../gui/components/paymentmethods/BankForm.java | 14 +++++++------- .../paymentmethods/CryptoCurrencyForm.java | 2 +- .../gui/components/paymentmethods/OKPayForm.java | 4 ++-- .../paymentmethods/PerfectMoneyForm.java | 4 ++-- .../gui/components/paymentmethods/SepaForm.java | 6 +++--- .../gui/components/paymentmethods/SwishForm.java | 4 ++-- .../main/offer/createoffer/CreateOfferView.java | 1 + 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/io/bitsquare/locale/BankUtil.java b/core/src/main/java/io/bitsquare/locale/BankUtil.java index fcecabc5e2..bbeef006d5 100644 --- a/core/src/main/java/io/bitsquare/locale/BankUtil.java +++ b/core/src/main/java/io/bitsquare/locale/BankUtil.java @@ -52,7 +52,7 @@ public class BankUtil { case "BR": return "Bank name:"; default: - return "Bank name (optional):"; + return isBankNameRequired(countryCode) ? "Bank name:" : "Bank name (optional):"; } } @@ -83,7 +83,7 @@ public class BankUtil { case "HK": return "Bank code:"; default: - return "Bank ID (e.g. BIC or SWIFT) (optional):"; + return isBankIdRequired(countryCode) ? "Bank ID (e.g. BIC or SWIFT):" : "Bank ID (e.g. BIC or SWIFT) (optional):"; } } @@ -120,7 +120,7 @@ public class BankUtil { case "CA": return "Transit Number:"; default: - return "Branch nr. (optional):"; + return isBranchIdRequired(countryCode) ? "Branch nr.:" : "Branch nr. (optional):"; } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/AliPayForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/AliPayForm.java index f64e56cdc4..ce1e98dafe 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/AliPayForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/AliPayForm.java @@ -73,9 +73,9 @@ public class AliPayForm extends PaymentMethodForm { protected void autoFillNameTextField() { if (useCustomAccountNameCheckBox != null && !useCustomAccountNameCheckBox.isSelected()) { String accountNr = accountNrInputTextField.getText(); - accountNr = StringUtils.abbreviate(accountNr, 5); + accountNr = StringUtils.abbreviate(accountNr, 9); String method = BSResources.get(paymentAccount.getPaymentMethod().getId()); - accountNameTextField.setText(method.concat(", ").concat(accountNr)); + accountNameTextField.setText(method.concat(": ").concat(accountNr)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/BankForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/BankForm.java index 6f6dd5a0dd..dce3aaa6a4 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/BankForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/BankForm.java @@ -470,27 +470,27 @@ abstract class BankForm extends PaymentMethodForm { countryCode = ""; if (BankUtil.isBankIdRequired(countryCode)) { bankId = bankIdInputTextField.getText(); - if (bankId.length() > 6) + if (bankId.length() > 9) bankId = StringUtils.abbreviate(bankId, 9); } else if (BankUtil.isBranchIdRequired(countryCode)) { bankId = branchIdInputTextField.getText(); - if (bankId.length() > 6) + if (bankId.length() > 9) bankId = StringUtils.abbreviate(bankId, 9); } else if (BankUtil.isBankNameRequired(countryCode)) { bankId = bankNameInputTextField.getText(); - if (bankId.length() > 6) + if (bankId.length() > 9) bankId = StringUtils.abbreviate(bankId, 9); } String accountNr = accountNrInputTextField.getText(); - if (accountNr.length() > 6) + if (accountNr.length() > 9) accountNr = StringUtils.abbreviate(accountNr, 9); String method = BSResources.get(paymentAccount.getPaymentMethod().getId()); - if (bankId != null) - accountNameTextField.setText(method.concat(", ").concat(bankId).concat(", ").concat(accountNr)); + if (bankId != null && !bankId.isEmpty()) + accountNameTextField.setText(method.concat(": ").concat(bankId).concat(", ").concat(accountNr)); else - accountNameTextField.setText(method.concat(", ").concat(accountNr)); + accountNameTextField.setText(method.concat(": ").concat(accountNr)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java index a9152c1297..1fc5a3a801 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java @@ -100,7 +100,7 @@ public class CryptoCurrencyForm extends PaymentMethodForm { String address = addressInputTextField.getText(); address = StringUtils.abbreviate(address, 9); String currency = paymentAccount.getSingleTradeCurrency() != null ? paymentAccount.getSingleTradeCurrency().getCode() : "?"; - accountNameTextField.setText(method.concat(", ").concat(currency).concat(", ").concat(address)); + accountNameTextField.setText(currency.concat(": ").concat(address)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java index b58d815bf2..156b2a88b2 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java @@ -117,9 +117,9 @@ public class OKPayForm extends PaymentMethodForm { protected void autoFillNameTextField() { if (useCustomAccountNameCheckBox != null && !useCustomAccountNameCheckBox.isSelected()) { String accountNr = accountNrInputTextField.getText(); - accountNr = StringUtils.abbreviate(accountNr, 5); + accountNr = StringUtils.abbreviate(accountNr, 9); String method = BSResources.get(paymentAccount.getPaymentMethod().getId()); - accountNameTextField.setText(method.concat(", ").concat(accountNr)); + accountNameTextField.setText(method.concat(": ").concat(accountNr)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java index 99a5d73ba2..ea96896fbd 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java @@ -75,9 +75,9 @@ public class PerfectMoneyForm extends PaymentMethodForm { protected void autoFillNameTextField() { if (useCustomAccountNameCheckBox != null && !useCustomAccountNameCheckBox.isSelected()) { String accountNr = accountNrInputTextField.getText(); - accountNr = StringUtils.abbreviate(accountNr, 5); + accountNr = StringUtils.abbreviate(accountNr, 9); String method = BSResources.get(paymentAccount.getPaymentMethod().getId()); - accountNameTextField.setText(method.concat(", ").concat(accountNr)); + accountNameTextField.setText(method.concat(": ").concat(accountNr)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java index 81817122c0..9a286545e6 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java @@ -280,12 +280,12 @@ public class SepaForm extends PaymentMethodForm { protected void autoFillNameTextField() { if (useCustomAccountNameCheckBox != null && !useCustomAccountNameCheckBox.isSelected()) { String iban = ibanInputTextField.getText(); - if (iban.length() > 5) - iban = StringUtils.abbreviate(iban, 5); + if (iban.length() > 9) + iban = StringUtils.abbreviate(iban, 9); String method = BSResources.get(paymentAccount.getPaymentMethod().getId()); String country = ((CountryBasedPaymentAccount) paymentAccount).getCountry() != null ? ((CountryBasedPaymentAccount) paymentAccount).getCountry().code : "?"; String currency = paymentAccount.getSingleTradeCurrency() != null ? paymentAccount.getSingleTradeCurrency().getCode() : "?"; - accountNameTextField.setText(method.concat(", ").concat(currency).concat(", ").concat(country).concat(", ").concat(iban)); + accountNameTextField.setText(method.concat(" (").concat(currency).concat("/").concat(country).concat("): ").concat(iban)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SwishForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SwishForm.java index f868287763..e41b6cba43 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SwishForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SwishForm.java @@ -82,9 +82,9 @@ public class SwishForm extends PaymentMethodForm { protected void autoFillNameTextField() { if (useCustomAccountNameCheckBox != null && !useCustomAccountNameCheckBox.isSelected()) { String mobileNr = mobileNrInputTextField.getText(); - mobileNr = StringUtils.abbreviate(mobileNr, 5); + mobileNr = StringUtils.abbreviate(mobileNr, 9); String method = BSResources.get(paymentAccount.getPaymentMethod().getId()); - accountNameTextField.setText(method.concat(", ").concat(mobileNr)); + accountNameTextField.setText(method.concat(": ").concat(mobileNr)); } } diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java index b7169ab5bb..90b826801b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java @@ -763,6 +763,7 @@ public class CreateOfferView extends ActivatableViewAndModel