From 2b64ab3e122da359828753bdf6d63f1a40b347ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 19 Aug 2016 16:48:20 +0200 Subject: [PATCH] "Re-scoped" bean helper: (please cherry-pick) - the bean helper needs to be view-scoped (valid until the view has been changed) - this way, the setted instances remain until the view is invalidated - maybe no onPostback="true" is then no more needed? @TODO MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../confirmlink/JobsConfirmationLinkWebRequestBean.java | 4 ++-- .../beans/contact/JobsAdminContactWebRequestBean.java | 4 ++-- .../phone/JobsAdminContactPhoneWebRequestBean.java | 4 ++-- .../contact/phone/JobsContactPhoneWebSessionBean.java | 4 ++-- ...bRequestController.java => JobsWebViewController.java} | 2 +- .../{JobsWebRequestHelper.java => JobsWebViewHelper.java} | 8 ++++---- .../jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java | 4 ++-- .../jjobs/beans/user/JobsAdminUserWebRequestBean.java | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) rename src/java/org/mxchange/jjobs/beans/helper/{JobsWebRequestController.java => JobsWebViewController.java} (98%) rename src/java/org/mxchange/jjobs/beans/helper/{JobsWebRequestHelper.java => JobsWebViewHelper.java} (98%) diff --git a/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java index 52a48605..5cd11863 100644 --- a/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/confirmlink/JobsConfirmationLinkWebRequestBean.java @@ -31,7 +31,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jjobs.beans.helper.JobsWebViewController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; import org.mxchange.jusercore.events.confirmation.ConfirmedUserAccountEvent; import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; @@ -59,7 +59,7 @@ public class JobsConfirmationLinkWebRequestBean extends BaseJobsController imple * Admin helper instance */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewController beanHelper; /** * Confirmation key diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 63d9e053..48a96cca 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -45,7 +45,7 @@ import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcountry.data.Country; import org.mxchange.jjobs.beans.BaseJobsController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jjobs.beans.helper.JobsWebViewController; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; @@ -83,7 +83,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement * Admin helper instance */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewController beanHelper; /** * Birth day diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index 3bca9397..3ae8effe 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -45,7 +45,7 @@ import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEv import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jcountry.data.Country; import org.mxchange.jjobs.beans.BaseJobsController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jjobs.beans.helper.JobsWebViewController; import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; import org.mxchange.jphone.exceptions.PhoneNumberAlreadyLinkedException; import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException; @@ -107,7 +107,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl * Admin helper instance */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewController beanHelper; /** * Event being fired when a fax number has been unlinked diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java index 165bc260..f69d7d95 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java @@ -34,7 +34,7 @@ import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumb import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jjobs.beans.helper.JobsWebViewController; import org.mxchange.jphone.phonenumbers.DialableNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; @@ -59,7 +59,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement * Admin helper instance */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewController beanHelper; /** * General contact controller diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewController.java similarity index 98% rename from src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java rename to src/java/org/mxchange/jjobs/beans/helper/JobsWebViewController.java index 538211a5..1127b736 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewController.java @@ -28,7 +28,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface JobsWebRequestController extends Serializable { +public interface JobsWebViewController extends Serializable { /** * Copies currently set fax number's data to admin phone controller diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelper.java similarity index 98% rename from src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java rename to src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelper.java index 081dc6c7..ef84ae3a 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelper.java @@ -17,7 +17,7 @@ package org.mxchange.jjobs.beans.helper; import java.text.MessageFormat; -import javax.enterprise.context.RequestScoped; +import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.contact.Contact; @@ -36,8 +36,8 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Haeder */ @Named ("adminHelper") -@RequestScoped -public class JobsWebRequestHelper extends BaseJobsController implements JobsWebRequestController { +@ViewScoped +public class JobsWebViewHelper extends BaseJobsController implements JobsWebViewController { /** * Call-stack instance (5 may show BeanELResolver.getValue as caller) @@ -95,7 +95,7 @@ public class JobsWebRequestHelper extends BaseJobsController implements JobsWebR /** * Default constructor */ - public JobsWebRequestHelper () { + public JobsWebViewHelper () { String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName()); System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller)); } diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index ad707af4..3dee6b60 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -30,7 +30,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcountry.data.Country; import org.mxchange.jjobs.beans.BaseJobsController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jjobs.beans.helper.JobsWebViewController; import org.mxchange.jphone.events.fax.removed.AdminFaxNumberRemovedFromListEvent; import org.mxchange.jphone.events.fax.removed.AdminRemoveFaxNumberFromListEvent; import org.mxchange.jphone.events.landline.removed.AdminLandLineNumberRemovedFromListEvent; @@ -75,7 +75,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements * Admin helper instance */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewController beanHelper; /** * Choosen fax number diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 53c412f6..61623c08 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -34,7 +34,7 @@ import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; -import org.mxchange.jjobs.beans.helper.JobsWebRequestController; +import org.mxchange.jjobs.beans.helper.JobsWebViewController; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; @@ -98,7 +98,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J * Admin helper instance */ @Inject - private JobsWebRequestController beanHelper; + private JobsWebViewController beanHelper; /** * Regular contact controller -- 2.39.5