From 65f2aefcc44ea015839ac7eb38cf643a44db4186 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sun, 31 Jan 2016 00:36:39 +0100
Subject: [PATCH] Removed holder name as not needed/visible at perfectmoney

---
 .../io/bitsquare/payment/PerfectMoneyAccount.java     |  8 --------
 .../payment/PerfectMoneyAccountContractData.java      | 11 +----------
 .../components/paymentmethods/PerfectMoneyForm.java   | 10 ----------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccount.java b/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccount.java
index 46b2521cd8..8f028004fa 100644
--- a/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccount.java
+++ b/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccount.java
@@ -33,14 +33,6 @@ public class PerfectMoneyAccount extends PaymentAccount implements Serializable
         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) {
         ((PerfectMoneyAccountContractData) contractData).setAccountNr(accountNr);
     }
diff --git a/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java b/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java
index 4161e79e62..b849e92244 100644
--- a/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java
+++ b/core/src/main/java/io/bitsquare/payment/PerfectMoneyAccountContractData.java
@@ -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.
     private static final long serialVersionUID = Version.NETWORK_PROTOCOL_VERSION;
 
-    private String holderName;
     private String accountNr;
 
     public PerfectMoneyAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
         super(paymentMethod, id, maxTradePeriod);
     }
 
-    public String getHolderName() {
-        return holderName;
-    }
-
-    public void setHolderName(String holderName) {
-        this.holderName = holderName;
-    }
-
     public void setAccountNr(String accountNr) {
         this.accountNr = accountNr;
     }
@@ -50,7 +41,7 @@ public class PerfectMoneyAccountContractData extends PaymentAccountContractData
 
     @Override
     public String getPaymentDetails() {
-        return "PerfectMoney - Holder name: " + holderName + ", account nr.: " + accountNr;
+        return "PerfectMoney - Account nr.: " + 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 053b8f2c0f..86eb338629 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
@@ -42,8 +42,6 @@ public class PerfectMoneyForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountContractData paymentAccountContractData) {
         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());
         addAllowedPeriod(gridPane, ++gridRow, paymentAccountContractData);
         return gridRow;
@@ -60,13 +58,6 @@ public class PerfectMoneyForm extends PaymentMethodForm {
     public void addFormForAddAccount() {
         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.setValidator(perfectMoneyValidator);
         accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
@@ -95,7 +86,6 @@ public class PerfectMoneyForm extends PaymentMethodForm {
         gridRowFrom = gridRow;
         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, "Account holder name:", perfectMoneyAccount.getHolderName());
         TextField field = addLabelTextField(gridPane, ++gridRow, "Account nr.:", perfectMoneyAccount.getAccountNr()).second;
         field.setMouseTransparent(false);
         addLabelTextField(gridPane, ++gridRow, "Currency:", perfectMoneyAccount.getSingleTradeCurrency().getCodeAndName());