From 306a3558f41165ad5055d312f2e49e448743d86e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 21:19:05 +0200 Subject: [PATCH] Continued: - renamed exceptions BusinessDataBlaException was to generic, it should be BasicCompanyDataBlaException - renamed BranchOfficeUtils -> BranchOffices as this is more common - fixed imports MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...va => BasicCompanyDataAlreadyAddedException.java} | 6 +++--- ...n.java => BasicCompanyDataNotFoundException.java} | 8 ++++---- .../model/basicdata/BusinessBasicData.java | 4 ++-- .../model/basicdata/CompanyBasicData.java | 8 ++++---- .../model/branchoffice/BranchOffice.java | 6 +++--- .../{BranchOfficeUtils.java => BranchOffices.java} | 4 ++-- .../model/branchoffice/CompanyBranchOffice.java | 12 ++++++------ .../model/employee/CompanyEmployee.java | 8 ++++---- .../jcontactsbusiness/model/employee/Employee.java | 6 +++--- .../model/headquarters/CompanyHeadquartersData.java | 12 ++++++------ .../model/headquarters/HeadquartersData.java | 6 +++--- 11 files changed, 40 insertions(+), 40 deletions(-) rename src/org/mxchange/jcontactsbusiness/exceptions/basicdata/{BusinessDataAlreadyAddedException.java => BasicCompanyDataAlreadyAddedException.java} (87%) rename src/org/mxchange/jcontactsbusiness/exceptions/basicdata/{BusinessDataNotFoundException.java => BasicCompanyDataNotFoundException.java} (85%) rename src/org/mxchange/jcontactsbusiness/model/branchoffice/{BranchOfficeUtils.java => BranchOffices.java} (97%) diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java similarity index 87% rename from src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java index 6b39838..f489c7f 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java @@ -24,7 +24,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; *

* @author Roland Häder */ -public class BusinessDataAlreadyAddedException extends Exception { +public class BasicCompanyDataAlreadyAddedException extends Exception { /** * Serial number @@ -36,14 +36,14 @@ public class BusinessDataAlreadyAddedException extends Exception { *

* @param businessContact Business contact that is already added */ - public BusinessDataAlreadyAddedException (final BusinessBasicData businessContact) { + public BasicCompanyDataAlreadyAddedException (final BusinessBasicData businessContact) { super(MessageFormat.format("Business contact with comanyName={0} already added.", businessContact.getCompanyName())); //NOI18N } /** * Default constructor, may be used if no contact instance is available */ - public BusinessDataAlreadyAddedException () { + public BasicCompanyDataAlreadyAddedException () { super("Business contact already added"); //NOI18N } diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java similarity index 85% rename from src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java index a0f9977..fc7df97 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java @@ -23,7 +23,7 @@ import java.text.MessageFormat; *

* @author Roland Häder */ -public class BusinessDataNotFoundException extends Exception { +public class BasicCompanyDataNotFoundException extends Exception { /** * Serial number @@ -35,7 +35,7 @@ public class BusinessDataNotFoundException extends Exception { *

* @param businessContactId Business contact id */ - public BusinessDataNotFoundException (final Long businessContactId) { + public BasicCompanyDataNotFoundException (final Long businessContactId) { // Call super constructor with message and cause super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId)); //NOI18N } @@ -46,7 +46,7 @@ public class BusinessDataNotFoundException extends Exception { * @param businessContactId Business contact id * @param cause Causing exception */ - public BusinessDataNotFoundException (final Long businessContactId, final Throwable cause) { + public BasicCompanyDataNotFoundException (final Long businessContactId, final Throwable cause) { // Call super constructor with message and cause super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId), cause); //NOI18N } @@ -57,7 +57,7 @@ public class BusinessDataNotFoundException extends Exception { * @param emailAddress Email address * @param cause Causing exception */ - public BusinessDataNotFoundException (final String emailAddress, final Throwable cause) { + public BasicCompanyDataNotFoundException (final String emailAddress, final Throwable cause) { // Call super constructor with message and cause super(MessageFormat.format("Business contact with email address {0} was not found.", emailAddress), cause); //NOI18N } diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java index cad9f09..dafe24b 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java @@ -23,8 +23,8 @@ 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.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java index 479d104..1e7bc64 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java @@ -42,10 +42,10 @@ 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; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java index 24435f7..7d205a5 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java @@ -20,9 +20,9 @@ import java.io.Serializable; import java.util.Calendar; 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; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java similarity index 97% rename from src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java index 9ca468a..3706785 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeUtils.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffices.java @@ -24,7 +24,7 @@ import java.util.Objects; * * @author Roland Häder */ -public class BranchOfficeUtils implements Serializable { +public class BranchOffices implements Serializable { /** * Serial number @@ -89,7 +89,7 @@ public class BranchOfficeUtils implements Serializable { /** * Private default constructor */ - private BranchOfficeUtils () { + private BranchOffices () { // Utilities don't have instances } diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java index 7d001c1..ee57cb5 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java @@ -38,12 +38,12 @@ 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; -import org.mxchange.jphone.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java index d2bd7da..04eba99 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java @@ -33,8 +33,8 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.UserContact; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; @@ -45,8 +45,8 @@ 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.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java index 4f709f4..87c7a05 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java @@ -18,14 +18,14 @@ package org.mxchange.jcontactsbusiness.model.employee; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; 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.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; /** * A POJI for employees diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java index 77b5360..bd44445 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java @@ -31,12 +31,12 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jcountry.data.CountryData; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java index e0e1138..03a9b7f 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java @@ -18,9 +18,9 @@ package org.mxchange.jcontactsbusiness.model.headquarters; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** -- 2.39.5