Please cherry-pick:

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

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
index 1a915770c4abe0795a59024f4ee0b715d1b99045..36f826ca5ec8af7ecc23a2f15330f3e1768c415c 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
@@ -39,8 +39,10 @@ import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController;
 import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController;
 import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.clear.password.ObservableClearUserPasswordEvent;
+import org.mxchange.jusercore.events.user.clear.username.ObservableClearUserNameEvent;
+import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
 import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent;
-import org.mxchange.jusercore.events.user.helper.created.ObservableHelperCreatedUserEvent;
 import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
 import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent;
 import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent;
@@ -336,7 +338,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs
         * <p>
         * @param event User created event
         */
-       public void afterHelperCreatedUserEvent (@Observes final ObservableHelperCreatedUserEvent event) {
+       public void afterCreatedUserEvent (@Observes final ObservableCreatedUserEvent event) {
                // Is the instance valid?
                if (null == event) {
                        // Throw NPE
@@ -552,17 +554,36 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs
                return this.visibleUserList;
        }
 
-       @Override
-       public void clearUserName () {
+       /**
+        * Event observer for when a user name should be cleared
+        * <p>
+        * @param event Event being fired
+        */
+       public void clearUserNameEvent (@Observes final ObservableClearUserNameEvent event) {
+               // Is it valid?
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null");
+               }
+
                // Clear it
-               this.setUserName(null);
+               this.clearUserName();
        }
 
-       @Override
-       public void clearUserPasswords () {
-               // Clear both
-               this.setUserPassword(null);
-               this.setUserPasswordRepeat(null);
+       /**
+        * Event observer for when both user passwords should be cleared
+        * <p>
+        * @param event Event being fired
+        */
+       public void clearUserPasswordEvent (@Observes final ObservableClearUserPasswordEvent event) {
+               // Is it valid?
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null");
+               }
+
+               // Clear it
+               this.clearUserPasswords();
        }
 
        @Override
@@ -1035,6 +1056,23 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs
                this.clearUserPasswords();
        }
 
+       /**
+        * Clears user name
+        */
+       private void clearUserName () {
+               // Clear it
+               this.setUserName(null);
+       }
+
+       /**
+        * Clears both user passwords
+        */
+       private void clearUserPasswords () {
+               // Clear both
+               this.setUserPassword(null);
+               this.setUserPasswordRepeat(null);
+       }
+
        /**
         * Copies given user into the controller
         * <p>