From: Roland Häder Date: Thu, 6 Oct 2022 15:01:31 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4b9384e99d24a1c3a05c8726d0eba501f89695b9;p=jfinancials-war.git Please cherry-pick: - updated references to packages/classes --- diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java index 94a2eae5..18f8b5aa 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/action/FinancialsAdminBranchOfficeActionWebRequestBean.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 FinancialsAdminBranchOfficeActionWebRequestBean extends BaseFinanci // 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/jfinancials/beans/business/department/action/FinancialsAdminDepartmentActionWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/department/action/FinancialsAdminDepartmentActionWebRequestBean.java index d52a6869..88b8e962 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/department/action/FinancialsAdminDepartmentActionWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/department/action/FinancialsAdminDepartmentActionWebRequestBean.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.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.business.department.list.FinancialsDepartmentListWebViewController; @@ -366,7 +366,7 @@ public class FinancialsAdminDepartmentActionWebRequestBean extends BaseFinancial // 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/jfinancials/beans/business/department/list/FinancialsDepartmentListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/business/department/list/FinancialsDepartmentListWebViewBean.java index 377530dd..867a7be6 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/department/list/FinancialsDepartmentListWebViewBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/department/list/FinancialsDepartmentListWebViewBean.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.jfinancials.beans.BaseFinancialsBean; /** @@ -252,7 +252,7 @@ public class FinancialsDepartmentListWebViewBean extends BaseFinancialsBean impl // 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/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java index 8f715ae7..3aaa583a 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminEmployeeWebRequestBean.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.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; @@ -438,7 +438,7 @@ public class FinancialsAdminEmployeeWebRequestBean extends BaseFinancialsBean im // 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/jfinancials/beans/business/headquarter/list/FinancialsHeadquarterListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/business/headquarter/list/FinancialsHeadquarterListWebViewBean.java index cb1835fd..d594d97d 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/headquarter/list/FinancialsHeadquarterListWebViewBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/headquarter/list/FinancialsHeadquarterListWebViewBean.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.jfinancials.beans.BaseFinancialsBean; /** @@ -289,7 +289,7 @@ public class FinancialsHeadquarterListWebViewBean extends BaseFinancialsBean imp // 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/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java index 33d63e36..5e12ea7a 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.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; @@ -1206,13 +1206,13 @@ public class FinancialsAdminContactWebRequestBean extends BaseFinancialsBean imp 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/jfinancials/beans/contact/FinancialsContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java index 29316ec5..6ea9a996 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.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 FinancialsContactWebRequestBean extends BaseFinancialsBean implemen 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/jfinancials/beans/contact/list/FinancialsContactListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/contact/list/FinancialsContactListWebViewBean.java index a57c6bfb..f0dba3c9 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/list/FinancialsContactListWebViewBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/list/FinancialsContactListWebViewBean.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.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.model.phonenumbers.DialableNumber; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; @@ -517,7 +517,7 @@ public class FinancialsContactListWebViewBean extends BaseFinancialsBean impleme // 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/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java index 478d4c88..4238e57d 100644 --- a/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/product_category/action/FinancialAdminProductCategoryActionWebRequestBean.java @@ -35,7 +35,7 @@ import org.mxchange.jproduct.events.category.updated.ObservableAdminUpdatedCateg import org.mxchange.jproduct.exceptions.category.CategoryAlreadyAddedException; import org.mxchange.jproduct.exceptions.category.CategoryNotFoundException; import org.mxchange.jproduct.model.category.AdminCategorySessionBeanRemote; -import org.mxchange.jproduct.model.category.Categories; +import org.mxchange.jproduct.model.utils.CategoryUtils; import org.mxchange.jproduct.model.category.Category; import org.mxchange.jproduct.model.category.ProductCategory; @@ -283,7 +283,7 @@ public class FinancialAdminProductCategoryActionWebRequestBean extends BaseFinan } // Copy all fields from it to current - Categories.copyCategoryData(category, this.getCurrentCategory()); + CategoryUtils.copyCategoryData(category, this.getCurrentCategory()); // Declare updated category instance final Category updatedCategory; diff --git a/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java index 209f1b6f..6737ea03 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.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 FinancialsUserRegisterWebRequestBean extends BaseFinancialsBean imp // 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; }