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 eb78c032afee0465c24532d706ec65f27dc8d3c9..39db1e8dd492ce4250700231b42d071f6ff37549 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
@@ -29,12 +29,11 @@ import javax.faces.context.FacesContext;
 import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
-import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jcoreee.utils.FacesUtils;
-import org.mxchange.jjobs.beans.BaseJobsController;
+import org.mxchange.jjobs.beans.BaseJobsBean;
 import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController;
 import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController;
-import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
@@ -72,7 +71,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils;
  */
 @Named ("adminUserController")
 @RequestScoped
-public class JobsAdminUserWebRequestBean extends BaseJobsController implements JobsAdminUserWebRequestController {
+public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdminUserWebRequestController {
 
        /**
         * Serial number
@@ -227,7 +226,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Create new user instance
-               User newUser = new LoginUser();
+               final User newUser = new LoginUser();
 
                // Set user name, CONFIRMED and INVISIBLE
                newUser.setUserName(this.getUserName());
@@ -236,7 +235,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                newUser.setUserProfileMode(ProfileMode.INVISIBLE);
 
                // Get locale from view-root
-               Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
+               final Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
 
                // Copy user locale
                newUser.setUserLocale(locale);
@@ -296,13 +295,13 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                        // Now, that all is set, call EJB
                        if (this.getContact() instanceof Contact) {
                                // Link contact with this user
-                               User updatedUser = this.adminUserBean.linkUser(newUser);
+                               final User updatedUser = this.adminUserBean.linkUser(newUser);
 
                                // Fire event
                                this.userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser));
                        } else {
                                // Add new contact
-                               User updatedUser = this.adminUserBean.addUser(newUser);
+                               final User updatedUser = this.adminUserBean.addUser(newUser);
 
                                // Fire event
                                this.addedUserEvent.fire(new AdminAddedUserEvent(updatedUser));
@@ -371,7 +370,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Get user instance
-               User registeredUser = event.getRegisteredUser();
+               final User registeredUser = event.getRegisteredUser();
 
                // @TODO Nothing to do with the user here?
                // Clear all data
@@ -478,7 +477,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Call EJB for updating user data
-               User updatedUser = this.userBean.updateUserData(this.getUser());
+               final User updatedUser = this.userBean.updateUserData(this.getUser());
 
                // Fire event
                this.updatedUserDataEvent.fire(new AdminUpdatedUserDataEvent(updatedUser));
@@ -663,11 +662,11 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Init updated user instance
-               User updatedUser;
+               final User updatedUser;
 
                try {
                        // Get base URL
-                       String baseUrl = FacesUtils.generateBaseUrl();
+                       final String baseUrl = FacesUtils.generateBaseUrl();
 
                        // Call EJB to lock account
                        updatedUser = this.adminUserBean.lockUserAccount(this.getUser(), this.getUserLockReason(), baseUrl);
@@ -712,11 +711,11 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                }
 
                // Init updated user instance
-               User updatedUser;
+               final User updatedUser;
 
                try {
                        // Get base URL
-                       String baseUrl = FacesUtils.generateBaseUrl();
+                       final String baseUrl = FacesUtils.generateBaseUrl();
 
                        // Call EJB to unlock account
                        updatedUser = this.adminUserBean.unlockUserAccount(this.getUser(), baseUrl);