From 1db0b108975a5a6a499c3282b170f1ec9b0888bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 25 Mar 2018 03:26:40 +0200 Subject: [PATCH] Please cherry-pick: - ops, didn't rename getter/setter for employeeBasicData MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../employee/FinancialsAdminEmployeeWebRequestBean.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java index a463c3b9..07bc852c 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java @@ -200,7 +200,7 @@ public class FinancialsAdminEmployeeWebRequestBean extends BaseFinancialsBean im *

* @return Employee's assigned basic company data */ - public BasicData getEmployeeCompany () { + public BasicData getEmployeeBasicData () { return this.employeeBasicData; } @@ -209,7 +209,7 @@ public class FinancialsAdminEmployeeWebRequestBean extends BaseFinancialsBean im *

* @param employeeBasicData Employee's assigned basic company data */ - public void setEmployeeCompany (final BasicData employeeBasicData) { + public void setEmployeeBasicData (final BasicData employeeBasicData) { this.employeeBasicData = employeeBasicData; } @@ -381,7 +381,7 @@ public class FinancialsAdminEmployeeWebRequestBean extends BaseFinancialsBean im private void clear () { // Clear all fields this.setEmployeeBranchOffice(null); - this.setEmployeeCompany(null); + this.setEmployeeBasicData(null); this.setEmployeeDepartment(null); this.setEmployeeEmailAddress(null); this.setEmployeeHeadquarter(null); @@ -398,7 +398,7 @@ public class FinancialsAdminEmployeeWebRequestBean extends BaseFinancialsBean im */ private Employable createEmployee () { // Init instance - final Employable employee = new BusinessEmployee(this.getEmployeeCompany(), this.getEmployeeNumber(), this.getEmployeePersonalData()); + final Employable employee = new BusinessEmployee(this.getEmployeeBasicData(), this.getEmployeeNumber(), this.getEmployeePersonalData()); // Set all othewr data employee.setEmployeeBranchOffice(this.getEmployeeBranchOffice()); -- 2.39.5