Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / user / JobsAdminUserWebRequestBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
index 09d3c631bb6302a8fa653ce3738b387d8c430bd6..f8158ea5452fa9381bb880fa1c89dd9989064212 100644 (file)
--- 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.JobsWebViewHelperController;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
@@ -95,10 +95,10 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        private final AdminUserSessionBeanRemote adminUserBean;
 
        /**
-        * Admin helper instance
+        * Bean helper
         */
        @Inject
-       private JobsWebRequestController beanHelper;
+       private JobsWebViewHelperController beanHelper;
 
        /**
         * Regular contact controller
@@ -205,8 +205,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                                throw new NullPointerException("contactController.gender is null"); //NOI18N
                        } else if (this.contactController.getFirstName() == null) {
                                // ... and again
-                               throw new NullPointerException("contactController.firstName is null"); //NOI18N //NOI18N
-                       } else if (this.contactController.getFirstName().isEmpty()) {
+                               throw new NullPointerException("contactController.firstName is null"); //NOI18N
+                       } else if (this.adminContactController.getFirstName().isEmpty()) {
                                // ... and again
                                throw new IllegalArgumentException("contactController.firstName is empty"); //NOI18N
                        } else if (this.adminContactController.getFamilyName() == null) {
@@ -214,22 +214,13 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                                throw new NullPointerException("contactController.familyName is null"); //NOI18N
                        } else if (this.contactController.getFamilyName().isEmpty()) {
                                // ... and again
-                               throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N //NOI18N
-                       } else if (this.contactController.getEmailAddress() == null) {
+                               throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N
+                       } else if (this.adminContactController.getEmailAddress() == null) {
                                // ... and again
                                throw new NullPointerException("contactController.emailAddress is null"); //NOI18N
                        } else if (this.adminContactController.getEmailAddress().isEmpty()) {
                                // ... and again
-                               throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N //NOI18N
-                       } else if (this.contactController.getEmailAddressRepeat() == null) {
-                               // ... and again
-                               throw new NullPointerException("contactController.emailAddressRepeat is null");
-                       } else if (this.contactController.getEmailAddressRepeat().isEmpty()) {
-                               // ... and again
-                               throw new IllegalArgumentException("contactController.emailAddressRepeat is empty"); //NOI18N //NOI18N
-                       } else if (!Objects.equals(this.contactController.getEmailAddress(), this.contactController.getEmailAddressRepeat())) {
-                               // Is not same email address
-                               throw new IllegalArgumentException("Both entered email addresses don't match.");
+                               throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N
                        }
                }
 
@@ -319,10 +310,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        }
 
        @Override
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
-               // Trace message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
-
+       public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -364,7 +352,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                        throw new NullPointerException("beanHelper.user is null"); //NOI18N
                } else if (user.getUserId() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N //NOI18N
+                       throw new NullPointerException("beanHelper.user.userId is null"); //NOI18N
                } else if (user.getUserId() < 1) {
                        // Invalid id
                        throw new IllegalStateException(MessageFormat.format("beanHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N
@@ -512,7 +500,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                this.clear();
 
                // Should go fine at this point, redirect to user profile
-               return "admin_show_user?faces-redirect=true&includeViewParams=true"; //NOI18N
+               return "admin_show_user"; //NOI18N
        }
 
        @Override
@@ -556,7 +544,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                this.clear();
 
                // Should go fine at this point, redirect to user profile
-               return "admin_show_user?faces-redirect=true&includeViewParams=true"; //NOI18N
+               return "admin_show_user"; //NOI18N
        }
 
        /**