From 8fa3f2e1e8b1603824a7bf5cfcb10211a7372421 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 10 Aug 2017 22:46:12 +0200 Subject: [PATCH] Moved *BasicData POJO/I into deeper package --- .../{ => basicdata}/BusinessBasicData.java | 16 +------------- .../{ => basicdata}/CompanyBasicData.java | 21 +------------------ .../branch/BranchOffice.java | 2 +- .../branch/CompanyBranchOffice.java | 4 ++-- .../department/CompanyDepartment.java | 4 ++-- .../department/Department.java | 2 +- .../employee/CompanyEmployee.java | 4 ++-- .../jcontactsbusiness/employee/Employee.java | 2 +- .../BusinessDataAlreadyAddedException.java | 2 +- 9 files changed, 12 insertions(+), 45 deletions(-) rename src/org/mxchange/jcontactsbusiness/{ => basicdata}/BusinessBasicData.java (94%) rename src/org/mxchange/jcontactsbusiness/{ => basicdata}/CompanyBasicData.java (94%) diff --git a/src/org/mxchange/jcontactsbusiness/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java similarity index 94% rename from src/org/mxchange/jcontactsbusiness/BusinessBasicData.java rename to src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java index 49f0d87..0485562 100644 --- a/src/org/mxchange/jcontactsbusiness/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness; +package org.mxchange.jcontactsbusiness.basicdata; import java.io.Serializable; import java.util.Calendar; @@ -174,20 +174,6 @@ public interface BusinessBasicData extends Serializable { */ void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber); - /** - * Getter for legal status - *

- * @return Legal status - */ - String getCompanyLegalStatus (); - - /** - * Setter for legal status - *

- * @param companyLegalStatus Legal status - */ - void setCompanyLegalStatus (final String companyLegalStatus); - /** * Getter for company logo *

diff --git a/src/org/mxchange/jcontactsbusiness/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java similarity index 94% rename from src/org/mxchange/jcontactsbusiness/CompanyBasicData.java rename to src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java index 5386d72..d821571 100644 --- a/src/org/mxchange/jcontactsbusiness/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness; +package org.mxchange.jcontactsbusiness.basicdata; import java.util.Calendar; import java.util.List; @@ -119,12 +119,6 @@ public class CompanyBasicData implements BusinessBasicData { @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL) private Employee companyFounder; - /** - * Legal status of company (example: "Inc.", "GmbH") - */ - @Column (name = "company_legal_status") - private String companyLegalStatus; - /** * Id number of company logo */ @@ -194,8 +188,6 @@ public class CompanyBasicData implements BusinessBasicData { return false; } else if (!Objects.equals(this.getCompanyName(), other.getCompanyName())) { return false; - } else if (!Objects.equals(this.getCompanyLegalStatus(), other.getCompanyLegalStatus())) { - return false; } else if (!Objects.equals(this.getHeadQuartersData(), other.getHeadQuartersData())) { return false; } else if (!Objects.equals(this.getCompanyContactEmployee(), other.getCompanyContactEmployee())) { @@ -279,16 +271,6 @@ public class CompanyBasicData implements BusinessBasicData { this.companyFounder = companyFounder; } - @Override - public String getCompanyLegalStatus () { - return this.companyLegalStatus; - } - - @Override - public void setCompanyLegalStatus (final String companyLegalStatus) { - this.companyLegalStatus = companyLegalStatus; - } - @Override public BusinessLogo getCompanyLogo () { return this.companyLogo; @@ -377,7 +359,6 @@ public class CompanyBasicData implements BusinessBasicData { hash = 37 * hash + Objects.hashCode(this.getBusinessDataId()); hash = 37 * hash + Objects.hashCode(this.getCompanyName()); - hash = 37 * hash + Objects.hashCode(this.getCompanyLegalStatus()); hash = 37 * hash + Objects.hashCode(this.getHeadQuartersData()); hash = 37 * hash + Objects.hashCode(this.getCompanyContactEmployee()); hash = 37 * hash + Objects.hashCode(this.getCompanyFounder()); diff --git a/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java index 3616fc2..be2c01f 100644 --- a/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/branch/BranchOffice.java @@ -22,7 +22,7 @@ import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * A POJI for branch offices diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java index b52338f..4446eb2 100644 --- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java @@ -31,8 +31,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.BusinessBasicData; -import org.mxchange.jcontactsbusiness.CompanyBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountryData; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; diff --git a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java index 6e56705..3e74a6e 100644 --- a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java +++ b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java @@ -32,7 +32,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.CompanyBasicData; +import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.branch.CompanyBranchOffice; import org.mxchange.jcontactsbusiness.employee.CompanyEmployee; @@ -41,7 +41,7 @@ import org.mxchange.jcontactsbusiness.headquarters.CompanyHeadQuartersData; import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * A POJO for company departments diff --git a/src/org/mxchange/jcontactsbusiness/department/Department.java b/src/org/mxchange/jcontactsbusiness/department/Department.java index 08de410..1615f98 100644 --- a/src/org/mxchange/jcontactsbusiness/department/Department.java +++ b/src/org/mxchange/jcontactsbusiness/department/Department.java @@ -22,7 +22,7 @@ import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.employee.Employee; import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * A POJI for company departments diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index c16ab48..8901552 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -33,7 +33,7 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; -import org.mxchange.jcontactsbusiness.CompanyBasicData; +import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.branch.CompanyBranchOffice; import org.mxchange.jcontactsbusiness.department.CompanyDepartment; @@ -46,7 +46,7 @@ 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; -import org.mxchange.jcontactsbusiness.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * A POJO for company employees (including CEO) diff --git a/src/org/mxchange/jcontactsbusiness/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/employee/Employee.java index a7e9b0b..071f599 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/Employee.java @@ -25,7 +25,7 @@ import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData; import org.mxchange.jcontactsbusiness.jobposition.JobPosition; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * A POJI for employees diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java index 2d99dd4..50b2aaa 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.exceptions; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.BusinessBasicData; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * Thrown if the given BusinessBasicData instance is already added -- 2.39.5