updated references

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
index 9eb4a4e0b76420029efbf7f0507f3d3543ef9fea..e1b2841d65e4ca1e1057fcae12e4f81fb3093b6c 100644 (file)
--- 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 2beb8f20a2ec007d8ecb695e127b5241878099a9..f24a8bf0c935f8ded20ba7b5d985dc56f67150c4 100644 (file)
--- 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 757ed77da78df47ec3b0828b8128208a21b487ce..88d606ec12c077ca02adff5b9ec6ca99fb7e7d08 100644 (file)
--- 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 b2c8054832ce724678f4e461fe66df1561c514b9..110dcd2b88378cd27f4070b86b98c47b0ac15d28 100644 (file)
--- 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 7d90754156f64c8647d9ac3e06cbc5e06e0d3cb3..d3af8997d1506a47b58cfc491989832eb57e6b4a 100644 (file)
--- 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 ae2e5ae4be611df3f53919bdc06a003bbc6aaa0d..3641b6e916160879fa67bf2450ba46547d47a39f 100644 (file)
--- 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 ba4940299f0b795e83444dae177b77a7f32b253c..369813562e427170b5c7463c002b089ffe99ce50 100644 (file)
--- 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 5b70ede7d6474b3897d2eb2afdcffcbfa3b0011c..e9fa7b119360eec51238070cd4f9d1201ae22a2c 100644 (file)
--- 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