From 9b4b67dc878ff4b121a17826d2a149f71cc9c7af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 9 Sep 2017 14:25:38 +0200 Subject: [PATCH] Continued: - moved all model (entity) related classes/interfaces to own 'model' package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AdminAddedBusinessBasicDataEvent.java | 2 +- ...vableAdminAddedBusinessBasicDataEvent.java | 2 +- .../added/BranchOfficeAddedEvent.java | 2 +- .../ObservableBranchOfficeAddedEvent.java | 2 +- .../BusinessDataAlreadyAddedException.java | 2 +- .../BranchOfficeAlreadyAddedException.java | 2 +- .../basicdata/BusinessBasicData.java | 10 ++++----- .../basicdata/CompanyBasicData.java | 16 +++++++------- .../branchoffice/BranchOffice.java | 6 ++--- .../branchoffice/BranchOfficeUtils.java | 2 +- .../branchoffice/CompanyBranchOffice.java | 10 ++++----- .../department/CompanyDepartment.java | 18 +++++++-------- .../{ => model}/department/Department.java | 10 ++++----- .../{ => model}/employee/CompanyEmployee.java | 22 +++++++++---------- .../{ => model}/employee/Employee.java | 12 +++++----- .../headquarters/CompanyHeadquartersData.java | 2 +- .../headquarters/HeadquartersData.java | 2 +- .../jobposition/EmployeePosition.java | 2 +- .../{ => model}/jobposition/JobPosition.java | 2 +- .../{ => model}/logo/BusinessLogo.java | 2 +- .../{ => model}/logo/CompanyLogo.java | 2 +- .../opening_times/BusinessOpeningTimes.java | 4 ++-- .../opening_times/OpeningTimes.java | 4 ++-- .../opening_times/dayofweek/DayOfTheWeek.java | 2 +- 24 files changed, 70 insertions(+), 70 deletions(-) rename src/org/mxchange/jcontactsbusiness/{ => model}/basicdata/BusinessBasicData.java (94%) rename src/org/mxchange/jcontactsbusiness/{ => model}/basicdata/CompanyBasicData.java (95%) rename src/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/BranchOffice.java (96%) rename src/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/BranchOfficeUtils.java (98%) rename src/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/CompanyBranchOffice.java (97%) rename src/org/mxchange/jcontactsbusiness/{ => model}/department/CompanyDepartment.java (90%) rename src/org/mxchange/jcontactsbusiness/{ => model}/department/Department.java (91%) rename src/org/mxchange/jcontactsbusiness/{ => model}/employee/CompanyEmployee.java (92%) rename src/org/mxchange/jcontactsbusiness/{ => model}/employee/Employee.java (92%) rename src/org/mxchange/jcontactsbusiness/{ => model}/headquarters/CompanyHeadquartersData.java (99%) rename src/org/mxchange/jcontactsbusiness/{ => model}/headquarters/HeadquartersData.java (98%) rename src/org/mxchange/jcontactsbusiness/{ => model}/jobposition/EmployeePosition.java (98%) rename src/org/mxchange/jcontactsbusiness/{ => model}/jobposition/JobPosition.java (97%) rename src/org/mxchange/jcontactsbusiness/{ => model}/logo/BusinessLogo.java (97%) rename src/org/mxchange/jcontactsbusiness/{ => model}/logo/CompanyLogo.java (98%) rename src/org/mxchange/jcontactsbusiness/{ => model}/opening_times/BusinessOpeningTimes.java (97%) rename src/org/mxchange/jcontactsbusiness/{ => model}/opening_times/OpeningTimes.java (93%) rename src/org/mxchange/jcontactsbusiness/{ => model}/opening_times/dayofweek/DayOfTheWeek.java (97%) diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java index 47cb704..44debeb 100644 --- a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.basicdata.added; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; /** * An event being thrown when new basic business data has been added. diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java index 9bec912..b8051d6 100644 --- a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.basicdata.added; import java.io.Serializable; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; /** * An interface for events being fired when new basic business data has been diff --git a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java index c007de3..703bf3e 100644 --- a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/BranchOfficeAddedEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.branchoffice.added; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; /** * An event being fired when a branch office has been added diff --git a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java index 23ec400..b6575fd 100644 --- a/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/branchoffice/added/ObservableBranchOfficeAddedEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.branchoffice.added; import java.io.Serializable; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; /** * An interface for events being triggered when a branch office has been added. diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java index dec174d..6b39838 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.exceptions.basicdata; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; /** * Thrown if the given BusinessBasicData instance is already added diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java index bfcd2b1..fcbd471 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/branchoffice/BranchOfficeAlreadyAddedException.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.exceptions.branchoffice; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; /** * Thrown if the given BusinessBasicData instance is already added diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java similarity index 94% rename from src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java rename to src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java index 3d6afe5..cad9f09 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; import java.io.Serializable; import java.util.Calendar; import java.util.List; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.employee.Employee; -import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; -import org.mxchange.jcontactsbusiness.logo.BusinessLogo; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java similarity index 95% rename from src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java rename to src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java index 7d260e0..479d104 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/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.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; import java.util.Calendar; import java.util.List; @@ -35,13 +35,13 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.employee.Employee; -import org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersData; -import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; -import org.mxchange.jcontactsbusiness.logo.BusinessLogo; -import org.mxchange.jcontactsbusiness.logo.CompanyLogo; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; +import org.mxchange.jcontactsbusiness.model.logo.CompanyLogo; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; diff --git a/src/org/mxchange/jcontactsbusiness/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java similarity index 96% rename from src/org/mxchange/jcontactsbusiness/branchoffice/BranchOffice.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java index 915847a..24435f7 100644 --- a/src/org/mxchange/jcontactsbusiness/branchoffice/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; diff --git a/src/org/mxchange/jcontactsbusiness/branchoffice/BranchOfficeUtils.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java similarity index 98% rename from src/org/mxchange/jcontactsbusiness/branchoffice/BranchOfficeUtils.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java index 428ae3e..9ca468a 100644 --- a/src/org/mxchange/jcontactsbusiness/branchoffice/BranchOfficeUtils.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.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.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; import java.io.Serializable; import java.util.Objects; diff --git a/src/org/mxchange/jcontactsbusiness/branchoffice/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java similarity index 97% rename from src/org/mxchange/jcontactsbusiness/branchoffice/CompanyBranchOffice.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java index 93663af..7d001c1 100644 --- a/src/org/mxchange/jcontactsbusiness/branchoffice/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.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.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; import java.text.MessageFormat; import java.util.Calendar; @@ -34,10 +34,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; -import org.mxchange.jcontactsbusiness.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; +import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; 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/model/department/CompanyDepartment.java similarity index 90% rename from src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java rename to src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java index e49a2ce..c5fe6e8 100644 --- a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.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.department; +package org.mxchange.jcontactsbusiness.model.department; import java.util.Calendar; import java.util.Objects; @@ -32,16 +32,16 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.branchoffice.CompanyBranchOffice; -import org.mxchange.jcontactsbusiness.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.employee.Employee; -import org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersData; +import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; /** * A POJO for company departments diff --git a/src/org/mxchange/jcontactsbusiness/department/Department.java b/src/org/mxchange/jcontactsbusiness/model/department/Department.java similarity index 91% rename from src/org/mxchange/jcontactsbusiness/department/Department.java rename to src/org/mxchange/jcontactsbusiness/model/department/Department.java index 433b1f4..9ca6f9b 100644 --- a/src/org/mxchange/jcontactsbusiness/department/Department.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/Department.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.department; +package org.mxchange.jcontactsbusiness.model.department; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; /** * A POJI for company departments diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java similarity index 92% rename from src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java rename to src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java index 0e8fe24..d2bd7da 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.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.employee; +package org.mxchange.jcontactsbusiness.model.employee; import java.util.Calendar; import java.util.Objects; @@ -35,16 +35,16 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.branchoffice.CompanyBranchOffice; -import org.mxchange.jcontactsbusiness.department.CompanyDepartment; -import org.mxchange.jcontactsbusiness.department.Department; -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.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice; +import org.mxchange.jcontactsbusiness.model.department.CompanyDepartment; +import org.mxchange.jcontactsbusiness.model.department.Department; +import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.jobposition.EmployeePosition; +import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; diff --git a/src/org/mxchange/jcontactsbusiness/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java similarity index 92% rename from src/org/mxchange/jcontactsbusiness/employee/Employee.java rename to src/org/mxchange/jcontactsbusiness/model/employee/Employee.java index 5da72e1..4f709f4 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; import java.io.Serializable; import java.util.Calendar; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.department.Department; -import org.mxchange.jcontactsbusiness.jobposition.JobPosition; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.department.Department; +import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; /** * A POJI for employees diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java similarity index 99% rename from src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadquartersData.java rename to src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java index 0bafa1f..77b5360 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.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.headquarters; +package org.mxchange.jcontactsbusiness.model.headquarters; import java.util.Calendar; import java.util.Objects; diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/HeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java similarity index 98% rename from src/org/mxchange/jcontactsbusiness/headquarters/HeadquartersData.java rename to src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java index 598fe3d..e0e1138 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/HeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.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.headquarters; +package org.mxchange.jcontactsbusiness.model.headquarters; import java.io.Serializable; import java.util.Calendar; diff --git a/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java similarity index 98% rename from src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java rename to src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java index ce7d391..76733c3 100644 --- a/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java +++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.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.jobposition; +package org.mxchange.jcontactsbusiness.model.jobposition; import java.util.Calendar; import java.util.Objects; diff --git a/src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java similarity index 97% rename from src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java rename to src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java index cc62d92..3048c8f 100644 --- a/src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java +++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.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.jobposition; +package org.mxchange.jcontactsbusiness.model.jobposition; import java.io.Serializable; import java.util.Calendar; diff --git a/src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java similarity index 97% rename from src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java rename to src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java index bb2b350..f899901 100644 --- a/src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java +++ b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.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.logo; +package org.mxchange.jcontactsbusiness.model.logo; import java.io.Serializable; import java.util.Calendar; diff --git a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java b/src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.java similarity index 98% rename from src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java rename to src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.java index 4ce99b5..0549435 100644 --- a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java +++ b/src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.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.logo; +package org.mxchange.jcontactsbusiness.model.logo; import java.util.Calendar; import java.util.Objects; diff --git a/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java b/src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.java similarity index 97% rename from src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java rename to src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.java index 1262030..dbb950d 100644 --- a/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.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.opening_times; +package org.mxchange.jcontactsbusiness.model.opening_times; import java.util.Calendar; import java.util.Objects; @@ -30,7 +30,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.opening_times.dayofweek.DayOfTheWeek; +import org.mxchange.jcontactsbusiness.model.opening_times.dayofweek.DayOfTheWeek; /** * A POJO for business opening hours diff --git a/src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java b/src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java similarity index 93% rename from src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java rename to src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java index e5ae213..f5111e8 100644 --- a/src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.opening_times; +package org.mxchange.jcontactsbusiness.model.opening_times; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcontactsbusiness.opening_times.dayofweek.DayOfTheWeek; +import org.mxchange.jcontactsbusiness.model.opening_times.dayofweek.DayOfTheWeek; /** * A POJI for opening times diff --git a/src/org/mxchange/jcontactsbusiness/opening_times/dayofweek/DayOfTheWeek.java b/src/org/mxchange/jcontactsbusiness/model/opening_times/dayofweek/DayOfTheWeek.java similarity index 97% rename from src/org/mxchange/jcontactsbusiness/opening_times/dayofweek/DayOfTheWeek.java rename to src/org/mxchange/jcontactsbusiness/model/opening_times/dayofweek/DayOfTheWeek.java index cfb9b15..74f45b9 100644 --- a/src/org/mxchange/jcontactsbusiness/opening_times/dayofweek/DayOfTheWeek.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_times/dayofweek/DayOfTheWeek.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.opening_times.dayofweek; +package org.mxchange.jcontactsbusiness.model.opening_times.dayofweek; import java.text.SimpleDateFormat; import java.util.Calendar; -- 2.39.5