From f2ebd0c6b63f67abd6a92bdd1b6a8d055ebb562f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 7 Oct 2022 20:05:24 +0200 Subject: [PATCH] updated references MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/basicdata/BusinessBasicData.java | 2 +- .../model/branchoffice/BusinessBranchOffice.java | 9 +++++---- .../model/department/BusinessDepartment.java | 7 ++++--- .../model/employee/BusinessEmployee.java | 2 +- .../model/headquarter/BusinessHeadquarter.java | 4 ++-- .../model/jobposition/EmployeePosition.java | 6 +++--- .../jcontactsbusiness/model/logo/BusinessLogo.java | 7 ++++--- .../model/opening_time/BusinessOpeningTime.java | 2 +- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java index 9eb4a4e..e1b2841 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java @@ -44,7 +44,7 @@ import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; import org.mxchange.jcontactsbusiness.model.logo.Logo; import org.mxchange.jcontactsbusiness.model.utils.HeadquarterUtils; -import org.mxchange.jcoreutils.Comparables; +import org.mxchange.jcoreutils.comparable.Comparables; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java index 2beb8f2..f24a8bf 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java @@ -46,8 +46,8 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jcoreutils.Comparables; -import org.mxchange.jcoreutils.SafeNumberUtils; +import org.mxchange.jcoreutils.comparable.Comparables; +import org.mxchange.jcoreutils.number.SafeNumberUtils; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jcountry.model.utils.CountryUtils; @@ -57,7 +57,7 @@ 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; -import org.mxchange.jusercore.model.user.Users; +import org.mxchange.jusercore.model.utils.UserUtils; /** * A POJO for company branch offices @@ -325,6 +325,7 @@ public class BusinessBranchOffice implements BranchOffice { // Init comparisons final int[] comparators = { + // First compare basic data // First compare basic data this.getBranchCompany().compareTo(branchOffice.getBranchCompany()), // ... branch office number @@ -352,7 +353,7 @@ public class BusinessBranchOffice implements BranchOffice { // ... suite number ... SafeNumberUtils.compare(this.getBranchSuiteNumber(), branchOffice.getBranchSuiteNumber()), // ... owning user - Users.compare(this.getBranchUserOwner(), branchOffice.getBranchUserOwner()) +UserUtils.compare(this.getBranchUserOwner(), branchOffice.getBranchUserOwner()) }; // Check all values diff --git a/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java index 757ed77..88d606e 100644 --- a/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java @@ -47,10 +47,10 @@ import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jcontactsbusiness.model.utils.BasicDataUtils; import org.mxchange.jcontactsbusiness.model.utils.BranchOfficeUtils; import org.mxchange.jcontactsbusiness.model.utils.HeadquarterUtils; -import org.mxchange.jcoreutils.Comparables; +import org.mxchange.jcoreutils.comparable.Comparables; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jusercore.model.user.Users; +import org.mxchange.jusercore.model.utils.UserUtils; /** * A POJO for company departments @@ -184,6 +184,7 @@ public class BusinessDepartment implements Department { // Init comparisons final int[] comparators = { + // First department's company (BasicData) ... // First department's company (BasicData) ... BasicDataUtils.compare(this.getDepartmentCompany(), department.getDepartmentCompany()), // ... then headquarters @@ -195,7 +196,7 @@ public class BusinessDepartment implements Department { // ... lead contact ContactUtils.compare(this.getDepartmentLead(), department.getDepartmentLead()), // ... user owner - Users.compare(this.getDepartmentUserOwner(), department.getDepartmentUserOwner()) +UserUtils.compare(this.getDepartmentUserOwner(), department.getDepartmentUserOwner()) }; // Check all values diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java index b2c8054..110dcd2 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java @@ -52,7 +52,7 @@ import org.mxchange.jcontactsbusiness.model.utils.BasicDataUtils; import org.mxchange.jcontactsbusiness.model.utils.BranchOfficeUtils; import org.mxchange.jcontactsbusiness.model.utils.DepartmentUtils; import org.mxchange.jcontactsbusiness.model.utils.HeadquarterUtils; -import org.mxchange.jcoreutils.Comparables; +import org.mxchange.jcoreutils.comparable.Comparables; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarter/BusinessHeadquarter.java b/src/org/mxchange/jcontactsbusiness/model/headquarter/BusinessHeadquarter.java index 7d90754..d3af899 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarter/BusinessHeadquarter.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarter/BusinessHeadquarter.java @@ -42,8 +42,8 @@ import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jcoreutils.Comparables; -import org.mxchange.jcoreutils.SafeNumberUtils; +import org.mxchange.jcoreutils.comparable.Comparables; +import org.mxchange.jcoreutils.number.SafeNumberUtils; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jcountry.model.utils.CountryUtils; diff --git a/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java index ae2e5ae..3641b6e 100644 --- a/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java +++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java @@ -35,10 +35,10 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.apache.commons.lang3.StringUtils; import org.mxchange.jcontactsbusiness.model.jobposition.status.JobPositionStatus; -import org.mxchange.jcoreutils.Comparables; +import org.mxchange.jcoreutils.comparable.Comparables; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jusercore.model.user.Users; +import org.mxchange.jusercore.model.utils.UserUtils; /** * A POJO for job positions @@ -146,7 +146,7 @@ public class EmployeePosition implements HireableJobPosition { // Init comparisons final int[] comparators = { // First added by which user ... - Users.compare(this.getJobPositionAddedUser(), jobPosition.getJobPositionAddedUser()), + UserUtils.compare(this.getJobPositionAddedUser(), jobPosition.getJobPositionAddedUser()), // ... next name StringUtils.compareIgnoreCase(this.getJobPositionName(), jobPosition.getJobPositionName()) }; diff --git a/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java index ba49402..3698135 100644 --- a/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java +++ b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java @@ -32,10 +32,10 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; import org.apache.commons.lang3.StringUtils; -import org.mxchange.jcoreutils.Comparables; +import org.mxchange.jcoreutils.comparable.Comparables; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jusercore.model.user.Users; +import org.mxchange.jusercore.model.utils.UserUtils; /** * A POJO for company logos @@ -103,10 +103,11 @@ public class BusinessLogo implements Logo { // Init comparisons final int[] comparators = { + // First file name ... // First file name ... StringUtils.compareIgnoreCase(this.getLogoFileName(), logo.getLogoFileName()), // ... then uploader instance - Users.compare(this.getLogoUploaderUser(), logo.getLogoUploaderUser()) +UserUtils.compare(this.getLogoUploaderUser(), logo.getLogoUploaderUser()) }; // Check all values diff --git a/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java b/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java index 5b70ede..e9fa7b1 100644 --- a/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java +++ b/src/org/mxchange/jcontactsbusiness/model/opening_time/BusinessOpeningTime.java @@ -33,7 +33,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcoreee.dates.DayOfTheWeek; -import org.mxchange.jcoreutils.Comparables; +import org.mxchange.jcoreutils.comparable.Comparables; /** * A POJO for business opening hours -- 2.39.5