From 5e064cff676110a6bce3b63eed8356b0d105636f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 22 Apr 2020 16:49:38 +0200 Subject: [PATCH] Don't cherry-pick: - renamed backing beans and their interfaces to JJobs - fixed JNDI name - fixed converters/validators because of JFinancials -> JJobs cherry-picking, otherwise you have to write that all from scratch ... MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...ava => JobsAdminMobileWebRequestBean.java} | 8 +++---- ... JobsAdminMobileWebRequestController.java} | 2 +- ...an.java => JobsMobileListWebViewBean.java} | 4 ++-- ...a => JobsMobileListWebViewController.java} | 2 +- ...JobsAdminMobileProviderWebRequestBean.java | 4 ++-- ...=> JobsMobileProviderListWebViewBean.java} | 4 ++-- ...sMobileProviderListWebViewController.java} | 2 +- .../phone/JobsAdminPhoneWebRequestBean.java | 4 ++-- ...ean.java => JobsPhoneListWebViewBean.java} | 4 ++-- ...va => JobsPhoneListWebViewController.java} | 2 +- .../JobsUserProfileWebRequestBean.java | 4 ++-- .../JobsResendLinkWebRequestBean.java | 4 ++-- .../employee/JobsEmployeeConverter.java | 21 ++++++++----------- .../converter/fax/JobsFaxNumberConverter.java | 2 ++ .../landline/JobsLandLineNumberConverter.java | 2 ++ .../mobile/JobsMobileNumberConverter.java | 3 +++ .../JobsMobileProviderConverter.java | 2 ++ .../converter/user/JobsUserConverter.java | 8 +++---- .../JobsEmployeeEmailAddressValidator.java | 8 +++---- .../validator/user/JobsUserIdValidator.java | 8 +++---- 20 files changed, 52 insertions(+), 46 deletions(-) rename src/java/org/mxchange/jjobs/beans/mobile/{FinancialsAdminMobileWebRequestBean.java => JobsAdminMobileWebRequestBean.java} (97%) rename src/java/org/mxchange/jjobs/beans/mobile/{FinancialsAdminMobileWebRequestController.java => JobsAdminMobileWebRequestController.java} (92%) rename src/java/org/mxchange/jjobs/beans/mobile/list/{FinancialsMobileListWebViewBean.java => JobsMobileListWebViewBean.java} (98%) rename src/java/org/mxchange/jjobs/beans/mobile/list/{FinancialsMobileListWebViewController.java => JobsMobileListWebViewController.java} (95%) rename src/java/org/mxchange/jjobs/beans/mobileprovider/list/{FinancialsMobileProviderListWebViewBean.java => JobsMobileProviderListWebViewBean.java} (97%) rename src/java/org/mxchange/jjobs/beans/mobileprovider/list/{FinancialsMobileProviderListWebViewController.java => JobsMobileProviderListWebViewController.java} (95%) rename src/java/org/mxchange/jjobs/beans/phone/list/{FinancialsPhoneListWebViewBean.java => JobsPhoneListWebViewBean.java} (99%) rename src/java/org/mxchange/jjobs/beans/phone/list/{FinancialsPhoneListWebViewController.java => JobsPhoneListWebViewController.java} (97%) diff --git a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java rename to src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java index e6cbd863..bb15e54a 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestBean.java @@ -29,7 +29,6 @@ import javax.faces.application.FacesMessage; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jjobs.beans.mobile.list.FinancialsMobileListWebViewController; import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent; import org.mxchange.jphone.events.mobile.deleted.AdminDeletedMobileNumberEvent; import org.mxchange.jphone.events.mobile.deleted.AdminMobileNumberDeletedEvent; @@ -41,6 +40,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.AdminMobileSessionBeanRemot import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jjobs.beans.mobile.list.JobsMobileListWebViewController; /** * Administrative bean (controller) for mobile numbers @@ -49,7 +49,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminMobileController") @RequestScoped -public class FinancialsAdminMobileWebRequestBean extends BaseJobsBean implements FinancialsAdminMobileWebRequestController { +public class JobsAdminMobileWebRequestBean extends BaseJobsBean implements JobsAdminMobileWebRequestController { /** * Serial number @@ -81,7 +81,7 @@ public class FinancialsAdminMobileWebRequestBean extends BaseJobsBean implements * Generic hone controller */ @Inject - private FinancialsMobileListWebViewController mobileListController; + private JobsMobileListWebViewController mobileListController; /** * Mobile number @@ -123,7 +123,7 @@ public class FinancialsAdminMobileWebRequestBean extends BaseJobsBean implements /** * Default constructor */ - public FinancialsAdminMobileWebRequestBean () { + public JobsAdminMobileWebRequestBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java b/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestController.java similarity index 92% rename from src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java rename to src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestController.java index 269629df..db181a8e 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/JobsAdminMobileWebRequestController.java @@ -24,6 +24,6 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface FinancialsAdminMobileWebRequestController extends Serializable { +public interface JobsAdminMobileWebRequestController extends Serializable { } diff --git a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.java similarity index 98% rename from src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java rename to src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.java index fdc286b3..3fe9c493 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewBean.java @@ -48,7 +48,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("mobileListController") @ViewScoped -public class FinancialsMobileListWebViewBean extends BaseJobsBean implements FinancialsMobileListWebViewController { +public class JobsMobileListWebViewBean extends BaseJobsBean implements JobsMobileListWebViewController { /** * Serial number @@ -81,7 +81,7 @@ public class FinancialsMobileListWebViewBean extends BaseJobsBean implements Fin /** * Default constructor */ - public FinancialsMobileListWebViewBean () { + public JobsMobileListWebViewBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java b/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewController.java similarity index 95% rename from src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java rename to src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewController.java index 1b45c3ab..12c0ab12 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/list/JobsMobileListWebViewController.java @@ -27,7 +27,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; *

* @author Roland Häder */ -public interface FinancialsMobileListWebViewController extends Serializable { +public interface JobsMobileListWebViewController extends Serializable { /** * Returns a list of all mobile numbers. For performance reasons, the diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java index f8e4b262..73310ac1 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java @@ -27,13 +27,13 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jjobs.beans.mobileprovider.list.FinancialsMobileProviderListWebViewController; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.events.mobileprovider.added.AdminMobileProviderAddedEvent; import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderAlreadyAddedException; import org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote; import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jjobs.beans.mobileprovider.list.JobsMobileProviderListWebViewController; /** * Administrative controller (bean) for mobile provider @@ -59,7 +59,7 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsBean implemen * Mobile provider list view */ @Inject - private FinancialsMobileProviderListWebViewController mobileProviderListController; + private JobsMobileProviderListWebViewController mobileProviderListController; /** * Event being fired when the mobile provider was added diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java rename to src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java index ab20ff88..d1e56e21 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewBean.java @@ -41,7 +41,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingl */ @Named ("mobileProviderListController") @ViewScoped -public class FinancialsMobileProviderListWebViewBean extends BaseJobsBean implements FinancialsMobileProviderListWebViewController { +public class JobsMobileProviderListWebViewBean extends BaseJobsBean implements JobsMobileProviderListWebViewController { /** * Serial number @@ -79,7 +79,7 @@ public class FinancialsMobileProviderListWebViewBean extends BaseJobsBean implem /** * Default constructor */ - public FinancialsMobileProviderListWebViewBean () { + public JobsMobileProviderListWebViewBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewController.java similarity index 95% rename from src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java rename to src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewController.java index f1e4568e..17567c4f 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/JobsMobileProviderListWebViewController.java @@ -26,7 +26,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; *

* @author Roland Häder */ -public interface FinancialsMobileProviderListWebViewController extends Serializable { +public interface JobsMobileProviderListWebViewController extends Serializable { /** * Returns a mobile provider instance by given primary key. If not found, a diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 07edf159..64d04d32 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -30,7 +30,6 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jjobs.beans.phone.list.FinancialsPhoneListWebViewController; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminFaxNumberDeletedEvent; @@ -51,6 +50,7 @@ import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; +import org.mxchange.jjobs.beans.phone.list.JobsPhoneListWebViewController; /** * Administrative controller (bean) for phone numbers @@ -139,7 +139,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsBean implements JobsAd * Generic hone controller */ @Inject - private FinancialsPhoneListWebViewController phoneListController; + private JobsPhoneListWebViewController phoneListController; /** * Phone number diff --git a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.java similarity index 99% rename from src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java rename to src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.java index 8c68bcdb..398fbdb5 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewBean.java @@ -51,7 +51,7 @@ import org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote; */ @Named ("phoneListController") @ViewScoped -public class FinancialsPhoneListWebViewBean extends BaseJobsBean implements FinancialsPhoneListWebViewController { +public class JobsPhoneListWebViewBean extends BaseJobsBean implements JobsPhoneListWebViewController { /** * Serial number @@ -101,7 +101,7 @@ public class FinancialsPhoneListWebViewBean extends BaseJobsBean implements Fina /** * Default constructor */ - public FinancialsPhoneListWebViewBean () { + public JobsPhoneListWebViewBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java b/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewController.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java rename to src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewController.java index 421c5723..0ad5190f 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/list/JobsPhoneListWebViewController.java @@ -28,7 +28,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; *

* @author Roland Häder */ -public interface FinancialsPhoneListWebViewController extends Serializable { +public interface JobsPhoneListWebViewController extends Serializable { /** * Returns a list of all fax numbers. For performance reasons, the diff --git a/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java index a943ba2c..322a0055 100644 --- a/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java @@ -22,7 +22,7 @@ import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; @@ -46,7 +46,7 @@ public class JobsUserProfileWebRequestBean extends BaseJobsBean implements JobsU * User list controller */ @Inject - private JobsUserWebRequestController userListController; + private JobsUserListWebViewController userListController; /** * Login controller diff --git a/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java index 0d8a6707..18f64575 100644 --- a/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java @@ -26,7 +26,7 @@ import javax.inject.Named; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; @@ -72,7 +72,7 @@ public class JobsResendLinkWebRequestBean extends BaseJobsBean implements JobsRe * Regular user controller */ @Inject - private JobsUserWebRequestController userListController; + private JobsUserListWebViewController userListController; /** * Event being fired after confirmation link is being sent diff --git a/src/java/org/mxchange/jjobs/converter/business/employee/JobsEmployeeConverter.java b/src/java/org/mxchange/jjobs/converter/business/employee/JobsEmployeeConverter.java index 2c895c62..b0fbf809 100644 --- a/src/java/org/mxchange/jjobs/converter/business/employee/JobsEmployeeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/employee/JobsEmployeeConverter.java @@ -24,8 +24,8 @@ import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeNotFoundException; import org.mxchange.jcontactsbusiness.model.employee.Employable; -import org.mxchange.jjobs.beans.business.employee.JobsEmployeeWebRequestBean; -import org.mxchange.jjobs.beans.business.employee.JobsEmployeeWebRequestController; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewBean; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewController; /** * Converter for converting company employee to and from id number @@ -38,21 +38,12 @@ public class JobsEmployeeConverter implements Converter { /** * Employable EJB */ - private static JobsEmployeeWebRequestController EMPLOYEE_LIST_CONTROLLER; + private static JobsEmployeeListWebViewController EMPLOYEE_LIST_CONTROLLER; @Override public Employable getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { - // Is the instance there? - if (null == EMPLOYEE_LIST_CONTROLLER) { - // Get bean from CDI directly - EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobsEmployeeWebRequestBean.class).get(); - } - // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { - // Warning message - // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N - // Return null return null; } @@ -64,6 +55,12 @@ public class JobsEmployeeConverter implements Converter { // Try to parse the value as long final Long employeeId = Long.valueOf(submittedValue); + // Is the instance there? + if (null == EMPLOYEE_LIST_CONTROLLER) { + // Get bean from CDI directly + EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobsEmployeeListWebViewBean.class).get(); + } + // Try to get user instance from it companyEmployee = EMPLOYEE_LIST_CONTROLLER.findEmployeeById(employeeId); } catch (final NumberFormatException ex) { diff --git a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java index c5f3f1b9..51387181 100644 --- a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java @@ -22,6 +22,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; +import org.mxchange.jjobs.beans.phone.list.JobsPhoneListWebViewBean; +import org.mxchange.jjobs.beans.phone.list.JobsPhoneListWebViewController; import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; diff --git a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java index 2a64a37a..5c808704 100644 --- a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java @@ -22,6 +22,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; +import org.mxchange.jjobs.beans.phone.list.JobsPhoneListWebViewBean; +import org.mxchange.jjobs.beans.phone.list.JobsPhoneListWebViewController; import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; diff --git a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java index 69472ec4..60b3ee62 100644 --- a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java @@ -22,6 +22,9 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; +import org.mxchange.jjobs.beans.mobile.list.JobsMobileListWebViewBean; +import org.mxchange.jjobs.beans.mobile.list.JobsMobileListWebViewController; +import org.mxchange.jphone.exceptions.mobile.MobileEntityNotFoundException; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** diff --git a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java index c70f9059..b26acae5 100644 --- a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java +++ b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java @@ -22,6 +22,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; +import org.mxchange.jjobs.beans.mobileprovider.list.JobsMobileProviderListWebViewBean; +import org.mxchange.jjobs.beans.mobileprovider.list.JobsMobileProviderListWebViewController; import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderNotFoundException; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; diff --git a/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java index 5050ed42..241e1c28 100644 --- a/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java +++ b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java @@ -22,8 +22,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestBean; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewBean; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; @@ -38,14 +38,14 @@ public class JobsUserConverter implements Converter { /** * User backing bean */ - private static JobsUserWebRequestController USER_LIST_CONTROLLER; + private static JobsUserListWebViewController USER_LIST_CONTROLLER; @Override public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { // Is the instance there? if (null == USER_LIST_CONTROLLER) { // Get bean from CDI directly - USER_LIST_CONTROLLER = CDI.current().select(JobsUserWebRequestBean.class).get(); + USER_LIST_CONTROLLER = CDI.current().select(JobsUserListWebViewBean.class).get(); } // Is the value null or empty? diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java index 55d2c37f..e1525642 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java @@ -25,8 +25,8 @@ import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; import javax.faces.validator.ValidatorException; import org.mxchange.jcoreee.validator.string.BaseStringValidator; -import org.mxchange.jjobs.beans.business.employee.JobsEmployeeWebRequestBean; -import org.mxchange.jjobs.beans.business.employee.JobsEmployeeWebRequestController; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewBean; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewController; /** * A validator for employee email address validation @@ -44,7 +44,7 @@ public class JobsEmployeeEmailAddressValidator extends BaseStringValidator { /** * Employee backing bean */ - private static JobsEmployeeWebRequestController EMPLOYEE_LIST_CONTROLLER; + private static JobsEmployeeListWebViewController EMPLOYEE_LIST_CONTROLLER; /** * Pattern matcher @@ -117,7 +117,7 @@ public class JobsEmployeeEmailAddressValidator extends BaseStringValidator { // Is the instance there? if (null == EMPLOYEE_LIST_CONTROLLER) { // Get bean from CDI directly - EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobsEmployeeWebRequestBean.class).get(); + EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobsEmployeeListWebViewBean.class).get(); } // Is it registered? diff --git a/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java b/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java index 2e0a6692..f11b3684 100644 --- a/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java +++ b/src/java/org/mxchange/jjobs/validator/user/JobsUserIdValidator.java @@ -24,8 +24,8 @@ import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; import javax.faces.validator.ValidatorException; import org.mxchange.jcoreee.validator.number.BaseNumberValidator; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestBean; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewBean; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; /** * A validator for user ids @@ -38,7 +38,7 @@ public class JobsUserIdValidator extends BaseNumberValidator { /** * User backing bean */ - private static JobsUserWebRequestController USER_LIST_CONTROLLER; + private static JobsUserListWebViewController USER_LIST_CONTROLLER; /** * Serial number @@ -56,7 +56,7 @@ public class JobsUserIdValidator extends BaseNumberValidator { // Is the instance there? if (null == USER_LIST_CONTROLLER) { // Get bean from CDI directly - USER_LIST_CONTROLLER = CDI.current().select(JobsUserWebRequestBean.class).get(); + USER_LIST_CONTROLLER = CDI.current().select(JobsUserListWebViewBean.class).get(); } // Cast value -- 2.39.5