From f90176e582c1e0d3f35d0a211de3d5ba899e921d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Aug 2016 10:05:12 +0200 Subject: [PATCH] Renaming season has started: - renamed cellphone to mobile (all occurences) - let's don't discrimite other mobile phones, right? --- .../jcontactsbusiness/employee/CompanyEmployee.java | 12 ++++++------ .../jcontactsbusiness/employee/Employee.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index 6168d3f..50bc15b 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -43,8 +43,8 @@ import org.mxchange.jcontactsbusiness.headquarters.CompanyHeadQuartersData; import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; import org.mxchange.jcontactsbusiness.jobposition.EmployeePosition; import org.mxchange.jcontactsbusiness.jobposition.JobPosition; -import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; @@ -118,8 +118,8 @@ public class CompanyEmployee implements Employee { * Employee's business mobile number */ @JoinColumn (name = "employee_mobile_number_id") - @OneToOne (targetEntity = CellphoneNumber.class, cascade = CascadeType.ALL) - private DialableCellphoneNumber employeeMobileNumber; + @OneToOne (targetEntity = MobileNumber.class, cascade = CascadeType.ALL) + private DialableMobileNumber employeeMobileNumber; /** * Employee's number @@ -257,12 +257,12 @@ public class CompanyEmployee implements Employee { } @Override - public DialableCellphoneNumber getEmployeeMobileNumber () { + public DialableMobileNumber getEmployeeMobileNumber () { return this.employeeMobileNumber; } @Override - public void setEmployeeMobileNumber (final DialableCellphoneNumber employeeMobileNumber) { + public void setEmployeeMobileNumber (final DialableMobileNumber employeeMobileNumber) { this.employeeMobileNumber = employeeMobileNumber; } diff --git a/src/org/mxchange/jcontactsbusiness/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/employee/Employee.java index 6e51937..57e5b75 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/Employee.java @@ -24,7 +24,7 @@ import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.department.Department; import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; import org.mxchange.jcontactsbusiness.jobposition.JobPosition; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.model.user.User; /** @@ -123,14 +123,14 @@ public interface Employee extends Serializable { *

* @return Employee's mobile number */ - DialableCellphoneNumber getEmployeeMobileNumber (); + DialableMobileNumber getEmployeeMobileNumber (); /** * Setter for employee's mobile number *

* @param employeeMobileNumber Employee's mobile number */ - void setEmployeeMobileNumber (final DialableCellphoneNumber employeeMobileNumber); + void setEmployeeMobileNumber (final DialableMobileNumber employeeMobileNumber); /** * Getter for employee's number -- 2.39.5