From 37cacfdda472801ad4961fbf9f5bec580e4753d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 6 Oct 2022 17:01:31 +0200 Subject: [PATCH] Please cherry-pick: - updated references to packages/classes --- .../action/JobsAdminDepartmentActionWebRequestBean.java | 4 ++-- .../action/JobsAdminBranchOfficeActionWebRequestBean.java | 4 ++-- .../department/list/JobsDepartmentListWebViewBean.java | 4 ++-- .../employee/JobsAdminEmployeeWebRequestBean.java | 4 ++-- .../headquarter/list/JobsHeadquarterListWebViewBean.java | 4 ++-- .../beans/contact/JobsAdminContactWebRequestBean.java | 8 ++++---- .../jjobs/beans/contact/JobsContactWebRequestBean.java | 8 ++++---- .../beans/contact/list/JobsContactListWebViewBean.java | 4 ++-- .../user/register/JobsUserRegisterWebRequestBean.java | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/business/branchoffice/action/JobsAdminDepartmentActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/action/JobsAdminDepartmentActionWebRequestBean.java index ebddc599..00904f3b 100644 --- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/action/JobsAdminDepartmentActionWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/action/JobsAdminDepartmentActionWebRequestBean.java @@ -38,7 +38,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.department.AdminDepartmentSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.department.BusinessDepartment; import org.mxchange.jcontactsbusiness.model.department.Department; -import org.mxchange.jcontactsbusiness.model.department.Departments; +import org.mxchange.jcontactsbusiness.model.utils.DepartmentUtils; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.business.department.list.JobsDepartmentListWebViewController; @@ -366,7 +366,7 @@ public class JobsAdminDepartmentActionWebRequestBean extends BaseJobsBean implem // Copy all fields System.out.println("departmentLead=" + this.getCurrentDepartment().getDepartmentLead() + " - BEFORE!"); - Departments.copyDepartmentData(department, this.getCurrentDepartment()); + DepartmentUtils.copyDepartmentData(department, this.getCurrentDepartment()); System.out.println("departmentLead=" + this.getCurrentDepartment().getDepartmentLead() + " - AFTER!"); // Initialize updated instance diff --git a/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java index aad9c0a1..09480148 100644 --- a/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/department/action/JobsAdminBranchOfficeActionWebRequestBean.java @@ -39,7 +39,7 @@ import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFou import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.AdminBranchOfficeSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffices; +import org.mxchange.jcontactsbusiness.model.utils.BranchOfficeUtils; import org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; @@ -1101,7 +1101,7 @@ public class JobsAdminBranchOfficeActionWebRequestBean extends BaseJobsBean impl // Now check each entry for (final BranchOffice bo : this.branchOfficeListController.getAllBranchOffices()) { // Is same address? - if (BranchOffices.isSameAddress(bo, branchOffice)) { + if (BranchOfficeUtils.isSameAddress(bo, branchOffice)) { // Found one isFound = true; break; diff --git a/src/java/org/mxchange/jjobs/beans/business/department/list/JobsDepartmentListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/business/department/list/JobsDepartmentListWebViewBean.java index fe058840..d2e11751 100644 --- a/src/java/org/mxchange/jjobs/beans/business/department/list/JobsDepartmentListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/department/list/JobsDepartmentListWebViewBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.events.department.updated.ObservableAdminD import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentNotFoundException; import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jcontactsbusiness.model.department.DepartmentSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.department.Departments; +import org.mxchange.jcontactsbusiness.model.utils.DepartmentUtils; import org.mxchange.jjobs.beans.BaseJobsBean; /** @@ -252,7 +252,7 @@ public class JobsDepartmentListWebViewBean extends BaseJobsBean implements JobsD // Now check each entry for (final Department currentDepartment : this.getAllDepartments()) { // Is same address? - if (Departments.isSameDepartment(currentDepartment, department)) { + if (DepartmentUtils.isSameDepartment(currentDepartment, department)) { // Found one isFound = true; break; diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java index 2a1b048a..306da6aa 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jcontactsbusiness.model.employee.AdminEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; import org.mxchange.jcontactsbusiness.model.employee.Employable; -import org.mxchange.jcontactsbusiness.model.employee.Employees; +import org.mxchange.jcontactsbusiness.model.utils.EmployeeUtils; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; @@ -442,7 +442,7 @@ public class JobsAdminEmployeeWebRequestBean extends BaseJobsBean implements Job // Check all employees for (final Employable otherEmployee : this.adminEmployeeListController.getAllEmployees()) { // Is same found? - if (Employees.isSameEmployeeFound(employee, otherEmployee)) { + if (EmployeeUtils.isSameEmployeeFound(employee, otherEmployee)) { // Okay, found it isFound = true; break; diff --git a/src/java/org/mxchange/jjobs/beans/business/headquarter/list/JobsHeadquarterListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/business/headquarter/list/JobsHeadquarterListWebViewBean.java index 348b8a60..b8c307d4 100644 --- a/src/java/org/mxchange/jjobs/beans/business/headquarter/list/JobsHeadquarterListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/headquarter/list/JobsHeadquarterListWebViewBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.events.headquarter.added.ObservableHeadqua import org.mxchange.jcontactsbusiness.exceptions.headquarter.HeadquarterNotFoundException; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jcontactsbusiness.model.headquarter.HeadquarterSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.headquarter.Headquarters; +import org.mxchange.jcontactsbusiness.model.utils.HeadquarterUtils; import org.mxchange.jjobs.beans.BaseJobsBean; /** @@ -289,7 +289,7 @@ public class JobsHeadquarterListWebViewBean extends BaseJobsBean implements Jobs // Now check each entry for (final Headquarter hq : this.getAllHeadquarters()) { // Is same address? - if (Headquarters.isSameAddress(hq, headquarter)) { + if (HeadquarterUtils.isSameAddress(hq, headquarter)) { // Found one isFound = true; break; diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 6d06039f..ab6f1db2 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -38,7 +38,7 @@ import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcontacts.model.contact.AdminContactSessionBeanRemote; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; -import org.mxchange.jcontacts.model.contact.Contacts; +import org.mxchange.jcontacts.model.utils.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; @@ -1212,13 +1212,13 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs contact.setContactCountry(this.getContactCountry()); // Update contact's cmobile number - this.isMobileNumberUnlinked = Contacts.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber()); + this.isMobileNumberUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber()); // Update contact's land-line number - this.isLandLineUnlinked = Contacts.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber()); + this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber()); // Update contact's fax number - this.isFaxUnlinked = Contacts.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); + this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); } } diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java index 59a93d4d..867e93e7 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontacts.events.contact.update.UpdatedContactEvent; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; -import org.mxchange.jcontacts.model.contact.Contacts; +import org.mxchange.jcontacts.model.utils.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; @@ -372,13 +372,13 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta contact.setContactCountry(this.getCountry()); // Update contact's mobile number - final boolean isMobileUnlinked = Contacts.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber()); + final boolean isMobileUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber()); // Update contact's land-line number - final boolean isLandLineUnlinked = Contacts.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber()); + final boolean isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber()); // Update contact's fax number - final boolean isFaxUnlinked = Contacts.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); + final boolean isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber()); // Init updated contact instance final Contact updatedContact; diff --git a/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java index a5d65ee1..76db636a 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java @@ -39,7 +39,7 @@ import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobi import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; -import org.mxchange.jcontacts.model.contact.Contacts; +import org.mxchange.jcontacts.model.utils.ContactUtils; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.model.phonenumbers.DialableNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; @@ -517,7 +517,7 @@ public class JobsContactListWebViewBean extends BaseJobsBean implements JobsCont // Loop through all for (final Contact currentContact : this.getAllContacts()) { // Is the same? - if (Contacts.isSameContact(contact, currentContact)) { + if (ContactUtils.isSameContact(contact, currentContact)) { // Yes, then abort loop IsFound = false; break; diff --git a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java index 67aec391..747a1fcd 100644 --- a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java @@ -40,7 +40,7 @@ import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; 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; import org.mxchange.jusercore.model.user.password_history.PasswordHistory; import org.mxchange.jusercore.model.user.password_history.UserPasswordHistory; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; @@ -477,7 +477,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs // Loop until a user name is found while ((randomName == null) || (randomName.equals(user.getUserName()))) { // Generate random name - randomName = Users.generateRandomUserName(); + randomName = UserUtils.generateRandomUserName(); isUsernameFree = true; } -- 2.39.5