Please cherry-pick:

- updated references to packages and classes

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
index 32e1c0876dd7653b1b8aa624e84c9d61d1b52dee..c826612bf78577e2c84cb55441be391ce1170dca 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
@@ -27,6 +27,7 @@ import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlread
 import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
+import org.mxchange.jcontactsbusiness.model.utils.BranchOfficeUtils;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
 import org.mxchange.jusercore.model.user.User;
@@ -203,7 +204,7 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsEnterpriseBean imp
                // Check all single addresses
                for (final BranchOffice bo : branchOffices) {
                        // Is the same address found?
-                       if (Objects.equals(bo.getBranchId(), branchOffice.getBranchId()) || BranchOffices.isSameAddress(bo, branchOffice)) {
+                       if (Objects.equals(bo.getBranchId(), branchOffice.getBranchId()) || BranchOfficeUtils.isSameAddress(bo, branchOffice)) {
                                // Found one
                                isFound = true;
                                break;

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
index d1bd154e68f45b8cb52559e3ada9368049905f6c..77c3ee1832cc6c4dca93c76823f32c2fd64b7189 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/department/JobsAdminDepartmentSessionBean.java
@@ -27,6 +27,7 @@ import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentNotFoundEx
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
+import org.mxchange.jcontactsbusiness.model.utils.DepartmentUtils;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
 import org.mxchange.jusercore.model.user.User;
 
@@ -208,7 +209,7 @@ public class JobsAdminDepartmentSessionBean extends BaseJobsEnterpriseBean imple
                // Check all single addresses
                for (final Department dep : departments) {
                        // Is the same address found?
-                       if (Departments.isSameDepartment(dep, department)) {
+                       if (DepartmentUtils.isSameDepartment(dep, department)) {
                                // Found one
                                isFound = true;
                                break;

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
index ce16f5437bbcd043445e9802ecc4c0e3dbe7ee6f..e243269aee69fd8a9c0e7dcc0d6a29c64d354cf6 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java
@@ -26,6 +26,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.department.Department;
 import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
 import org.mxchange.jcontactsbusiness.model.jobposition.HireableJobPosition;
+import org.mxchange.jcontactsbusiness.model.utils.EmployeeUtils;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
@@ -233,7 +234,7 @@ public class JobsAdminCompanyEmployeeSessionBean extends BaseJobsEnterpriseBean
                // Check all entries
                for (final Employable otherEmployee : this.employeeBean.fetchAllEmployees()) {
                        // Is same found?
-                       if (Employees.isSameEmployeeFound(employee, otherEmployee)) {
+                       if (EmployeeUtils.isSameEmployeeFound(employee, otherEmployee)) {
                                // Found it
                                isFound = true;
                                break;

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquarterSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquarterSessionBean.java
index c7c63494f9e28bec82d4b805803b33cdde8a23f0..c72c9d7f09090f07b589d093e6817f366345f00c 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquarterSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/JobsAdminHeadquarterSessionBean.java
@@ -24,6 +24,7 @@ import javax.ejb.Stateless;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jcontactsbusiness.exceptions.headquarter.HeadquarterAlreadyAddedException;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
+import org.mxchange.jcontactsbusiness.model.utils.HeadquarterUtils;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
 import org.mxchange.jusercore.model.user.User;
@@ -149,7 +150,7 @@ public class JobsAdminHeadquarterSessionBean extends BaseJobsEnterpriseBean impl
                // Check all single addresses
                for (final Headquarter hq : headquarters) {
                        // Is the same address found?
-                       if (Headquarters.isSameAddress(hq, headquarter)) {
+                       if (HeadquarterUtils.isSameAddress(hq, headquarter)) {
                                // Found one
                                isFound = true;
                                break;

diff --git a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java
index 9caed1dd7ef5ab3cc8bfeda46c970230679176cc..e0198c9537b2c978032f99e1a45b41fc0e526033 100644 (file)
--- a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java
+++ b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java
@@ -28,29 +28,29 @@ import javax.mail.Address;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 import org.mxchange.jcontacts.model.contact.Contact;
-import org.mxchange.jcontacts.model.contact.Contacts;
+import org.mxchange.jcontacts.model.utils.ContactUtils;
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffices;
 import org.mxchange.jcontactsbusiness.model.department.Department;
-import org.mxchange.jcontactsbusiness.model.department.Departments;
 import org.mxchange.jcontactsbusiness.model.employee.Employable;
 import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
 import org.mxchange.jcontactsbusiness.model.jobposition.HireableJobPosition;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
+import org.mxchange.jcontactsbusiness.model.utils.BranchOfficeUtils;
+import org.mxchange.jcontactsbusiness.model.utils.DepartmentUtils;
 import org.mxchange.jcoreee.bean.ejb.BaseEnterpriseBean;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jmailee.model.delivery.wrapper.EmailDeliveryWrapper;
 import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
-import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
-import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
+import org.mxchange.jphone.model.utils.FaxNumberUtils;
+import org.mxchange.jphone.model.utils.LandLineNumberUtils;
+import org.mxchange.jphone.model.utils.MobileNumberUtils;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jusercore.model.user.Users;
+import org.mxchange.jusercore.model.utils.UserUtils;
 
 /**
  * A helper class for beans that access the database.
@@ -803,7 +803,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeBranchOfficeData: foundContact.contactId={0}", foundBranchOffice.getBranchId())); //NOI18N
 
                // Copy all
-               BranchOffices.copyBranchOfficeData(detachedBranchOffice, foundBranchOffice);
+               BranchOfficeUtils.copyBranchOfficeData(detachedBranchOffice, foundBranchOffice);
 
                // Merge contact instance
                final BranchOffice managedBranchOffice = this.getEntityManager().merge(foundBranchOffice);
@@ -845,7 +845,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeContactData: foundContact.contactId={0}", foundContact.getContactId())); //NOI18N
 
                // Copy all
-               Contacts.copyContactData(detachedContact, foundContact);
+               ContactUtils.copyContactData(detachedContact, foundContact);
 
                // Merge contact instance
                final Contact managedContact = this.getEntityManager().merge(foundContact);
@@ -898,7 +898,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
 
                        // Copy all
-                       MobileNumbers.copyMobileNumberData(detachedContact.getContactMobileNumber(), foundMobile);
+                       MobileNumberUtils.copyMobileNumberData(detachedContact.getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
@@ -922,7 +922,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
                        // Copy all
-                       FaxNumbers.copyFaxNumberData(detachedContact.getContactFaxNumber(), foundFax);
+                       FaxNumberUtils.copyFaxNumberData(detachedContact.getContactFaxNumber(), foundFax);
 
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -946,7 +946,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
                        // Copy all
-                       LandLineNumbers.copyLandLineNumberData(detachedContact.getContactLandLineNumber(), foundLandLine);
+                       LandLineNumberUtils.copyLandLineNumberData(detachedContact.getContactLandLineNumber(), foundLandLine);
 
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
@@ -992,7 +992,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeDepartmentData: foundContact.contactId={0}", foundDepartment.getDepartmentId())); //NOI18N
 
                // Copy all
-               Departments.copyDepartmentData(detachedDepartment, foundDepartment);
+               DepartmentUtils.copyDepartmentData(detachedDepartment, foundDepartment);
 
                // Merge contact instance
                final Department managedDepartment = this.getEntityManager().merge(foundDepartment);
@@ -1041,7 +1041,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                DialableFaxNumber detachedNumber = null;
 
                // Is there a difference?
-               if (!FaxNumbers.isSameFaxNumber(faxNumber, fetchedNumber)) {
+               if (!FaxNumberUtils.isSameFaxNumber(faxNumber, fetchedNumber)) {
                        // @TODO Copy all to foundNumber, then merge
 
                        // Merge this entry
@@ -1090,7 +1090,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                DialableLandLineNumber detachedNumber = null;
 
                // Is there a difference?
-               if (!LandLineNumbers.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
+               if (!LandLineNumberUtils.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
                        // @TODO Copy all to foundNumber, then merge
 
                        // Merge this entry
@@ -1139,7 +1139,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                DialableMobileNumber detachedNumber = null;
 
                // Is there a difference?
-               if (!MobileNumbers.isSameMobileNumber(mobileNumber, fetchedNumber)) {
+               if (!MobileNumberUtils.isSameMobileNumber(mobileNumber, fetchedNumber)) {
                        // @TODO Copy all to foundNumber, then merge
 
                        // Merge this entry
@@ -1220,7 +1220,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Set all values
-               final Properties variables = Users.getAllUserFields(user);
+               final Properties variables = UserUtils.getAllUserFields(user);
 
                // Set base URL and random password
                variables.put("baseUrl", baseUrl); //NOI18N
@@ -1289,7 +1289,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("setAllContactPhoneEntries: other.contactMobileNumber={0}", other.getContactMobileNumber())); //NOI18N
 
                // Is other mobile not set?
-               if ((other.getContactMobileNumber() == null) || (MobileNumbers.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
+               if ((other.getContactMobileNumber() == null) || (MobileNumberUtils.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntries: Copying mobile entry ..."); //NOI18N
 
@@ -1307,7 +1307,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("setAllContactPhoneEntries: other.contactLandLineNumber={0}", other.getContactLandLineNumber())); //NOI18N
 
                // Is other mobile not set?
-               if ((other.getContactLandLineNumber() == null) || (LandLineNumbers.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
+               if ((other.getContactLandLineNumber() == null) || (LandLineNumberUtils.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntries: Copying land-line entry ..."); //NOI18N
 
@@ -1325,7 +1325,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("setAllContactPhoneEntries: other.contactFaxNumber={0}", other.getContactFaxNumber())); //NOI18N
 
                // Is other mobile not set?
-               if ((other.getContactFaxNumber() == null) || (FaxNumbers.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
+               if ((other.getContactFaxNumber() == null) || (FaxNumberUtils.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntries: Copying fax entry ..."); //NOI18N
 

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java
index 9ba2fba0214597ca20fcd42951e58c9bb06faa11..03b685f7ce4d369f3355db067de0b2dd59fe4ecf 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobile/JobsAdminMobileSessionBean.java
@@ -20,6 +20,7 @@ import java.text.MessageFormat;
 import java.util.Date;
 import javax.ejb.Stateless;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
+import org.mxchange.jphone.model.utils.MobileNumberUtils;
 
 /**
  * An EJB for administrative mobile number purposes
@@ -126,7 +127,7 @@ public class JobsAdminMobileSessionBean extends BaseJobsEnterpriseBean implement
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getMobileId())); //NOI18N
 
                // Set updated timestamp
-               MobileNumbers.copyMobileNumberData(mobileNumber, managedNumber);
+               MobileNumberUtils.copyMobileNumberData(mobileNumber, managedNumber);
                managedNumber.setMobileEntryUpdated(new Date());
 
                // Trace message

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
index 1c21588e832d26f52aff80e79425aea74ab702b4..c60437bb5d63d49359868053c745d38bf23c7770 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java
@@ -21,9 +21,9 @@ import java.util.Date;
 import javax.ejb.Stateless;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
-import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers;
+import org.mxchange.jphone.model.utils.FaxNumberUtils;
+import org.mxchange.jphone.model.utils.LandLineNumberUtils;
 
 /**
  * An EJB for administrative phone purposes
@@ -190,7 +190,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsEnterpriseBean implements
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               FaxNumbers.copyFaxNumberData(faxNumber, managedNumber);
+               FaxNumberUtils.copyFaxNumberData(faxNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message
@@ -248,7 +248,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsEnterpriseBean implements
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               LandLineNumbers.copyLandLineNumberData(landLineNumber, managedNumber);
+               LandLineNumberUtils.copyLandLineNumberData(landLineNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message

diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
index da2ff87e57d496c532e15d0f4e88983ae0d8e74b..d459c7e829e1fd3220d540184317fd87ce21309e 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java
@@ -26,11 +26,11 @@ import javax.persistence.Query;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jjobs.enterprise.BaseJobsEnterpriseBean;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
-import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
-import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers;
+import org.mxchange.jphone.model.utils.FaxNumberUtils;
+import org.mxchange.jphone.model.utils.LandLineNumberUtils;
+import org.mxchange.jphone.model.utils.MobileNumberUtils;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.exceptions.UserStatusConfirmedException;
 import org.mxchange.jusercore.exceptions.UserStatusLockedException;
@@ -38,6 +38,7 @@ import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException;
 import org.mxchange.jusercore.model.user.password_history.PasswordHistory;
 import org.mxchange.jusercore.model.user.password_history.UserPasswordHistory;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
+import org.mxchange.jusercore.model.utils.UserUtils;
 
 /**
  * A user EJB
@@ -289,7 +290,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               Users.copyUserData(user, foundUser);
+               UserUtils.copyUserData(detachedUser, foundUser);
 
                // Merge user
                final User managedUser = this.getEntityManager().merge(foundUser);
@@ -413,7 +414,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               Users.copyUserData(user, managedUser);
+               UserUtils.copyUserData(user, managedUser);
 
                // Set as updated
                managedUser.setUserEntryUpdated(new Date());
@@ -442,7 +443,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                        assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
 
                        // Copy all
-                       MobileNumbers.copyMobileNumberData(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
+                       MobileNumberUtils.copyMobileNumberData(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
@@ -469,7 +470,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
                        // Copy all
-                       FaxNumbers.copyFaxNumberData(managedUser.getUserContact().getContactFaxNumber(), foundFax);
+                       FaxNumberUtils.copyFaxNumberData(managedUser.getUserContact().getContactFaxNumber(), foundFax);
 
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -496,7 +497,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
                        // Copy all
-                       LandLineNumbers.copyLandLineNumberData(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
+                       LandLineNumberUtils.copyLandLineNumberData(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
 
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);