Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-24 23:00:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Removed holder name as not needed/visible at perfectmoney

Browse source
This commit is contained in:
Manfred Karrer 2016-01-31 00:36:39 +01:00
parent 9dd9decb96
commit 65f2aefcc4
3 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/io/bitsquare/payment/PerfectMoneyAccount.java
View file

@ -33,14 +33,6 @@ public class PerfectMoneyAccount extends PaymentAccount implements Serializable
contractData = new PerfectMoneyAccountContractData(paymentMethod.getId(), id, paymentMethod.getMaxTradePeriod()); contractData = new PerfectMoneyAccountContractData(paymentMethod.getId(), id, paymentMethod.getMaxTradePeriod());
} }
public String getHolderName() {
return ((PerfectMoneyAccountContractData) contractData).getHolderName();
}
public void setHolderName(String holderName) {
((PerfectMoneyAccountContractData) contractData).setHolderName(holderName);
}
public void setAccountNr(String accountNr) { public void setAccountNr(String accountNr) {
((PerfectMoneyAccountContractData) contractData).setAccountNr(accountNr); ((PerfectMoneyAccountContractData) contractData).setAccountNr(accountNr);
} }

11
core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java
View file

@ -25,21 +25,12 @@ public class PerfectMoneyAccountContractData extends PaymentAccountContractData
// That object is sent over the wire, so we need to take care of version compatibility. // That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION; private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
private String holderName;
private String accountNr; private String accountNr;
public PerfectMoneyAccountContractData(String paymentMethod, String id, int maxTradePeriod) { public PerfectMoneyAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod); super(paymentMethod, id, maxTradePeriod);
} }
public String getHolderName() {
return holderName;
}
public void setHolderName(String holderName) {
this.holderName = holderName;
}
public void setAccountNr(String accountNr) { public void setAccountNr(String accountNr) {
this.accountNr = accountNr; this.accountNr = accountNr;
} }
@ -50,7 +41,7 @@ public class PerfectMoneyAccountContractData extends PaymentAccountContractData
@Override @Override
public String getPaymentDetails() { public String getPaymentDetails() {
return "PerfectMoney - Holder name: " + holderName + ", account nr.: " + accountNr; return "PerfectMoney - Account nr.: " + accountNr;
} }
} }

10
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java
View file

@ -42,8 +42,6 @@ public class PerfectMoneyForm extends PaymentMethodForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountContractData paymentAccountContractData) { public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountContractData paymentAccountContractData) {
addLabelTextField(gridPane, ++gridRow, "Payment method:", BSResources.get(paymentAccountContractData.getPaymentMethodName())); addLabelTextField(gridPane, ++gridRow, "Payment method:", BSResources.get(paymentAccountContractData.getPaymentMethodName()));
addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Account holder name:", ((PerfectMoneyAccountContractData) paymentAccountContractData)
.getHolderName());
addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Account nr.:", ((PerfectMoneyAccountContractData) paymentAccountContractData).getAccountNr()); addLabelTextFieldWithCopyIcon(gridPane, ++gridRow, "Account nr.:", ((PerfectMoneyAccountContractData) paymentAccountContractData).getAccountNr());
addAllowedPeriod(gridPane, ++gridRow, paymentAccountContractData); addAllowedPeriod(gridPane, ++gridRow, paymentAccountContractData);
return gridRow; return gridRow;
@ -60,13 +58,6 @@ public class PerfectMoneyForm extends PaymentMethodForm {
public void addFormForAddAccount() { public void addFormForAddAccount() {
gridRowFrom = gridRow + 1; gridRowFrom = gridRow + 1;
InputTextField holderNameInputTextField = addLabelInputTextField(gridPane, ++gridRow, "Account holder name:").second;
holderNameInputTextField.setValidator(inputValidator);
holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
perfectMoneyAccount.setHolderName(newValue);
updateFromInputs();
});
accountNrInputTextField = addLabelInputTextField(gridPane, ++gridRow, "Account nr.:").second; accountNrInputTextField = addLabelInputTextField(gridPane, ++gridRow, "Account nr.:").second;
accountNrInputTextField.setValidator(perfectMoneyValidator); accountNrInputTextField.setValidator(perfectMoneyValidator);
accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
@ -95,7 +86,6 @@ public class PerfectMoneyForm extends PaymentMethodForm {
gridRowFrom = gridRow; gridRowFrom = gridRow;
addLabelTextField(gridPane, gridRow, "Account name:", perfectMoneyAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); addLabelTextField(gridPane, gridRow, "Account name:", perfectMoneyAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addLabelTextField(gridPane, ++gridRow, "Payment method:", BSResources.get(perfectMoneyAccount.getPaymentMethod().getId())); addLabelTextField(gridPane, ++gridRow, "Payment method:", BSResources.get(perfectMoneyAccount.getPaymentMethod().getId()));
addLabelTextField(gridPane, ++gridRow, "Account holder name:", perfectMoneyAccount.getHolderName());
TextField field = addLabelTextField(gridPane, ++gridRow, "Account nr.:", perfectMoneyAccount.getAccountNr()).second; TextField field = addLabelTextField(gridPane, ++gridRow, "Account nr.:", perfectMoneyAccount.getAccountNr()).second;
field.setMouseTransparent(false); field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, "Currency:", perfectMoneyAccount.getSingleTradeCurrency().getCodeAndName()); addLabelTextField(gridPane, ++gridRow, "Currency:", perfectMoneyAccount.getSingleTradeCurrency().getCodeAndName());