From: Roland Haeder <roland@mxchange.org> Date: Tue, 12 Apr 2016 17:27:59 +0000 (+0200) Subject: Fixed interface name X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef505a6a563cdfdab2649f73a78d3c69053aa0c8;p=jjobs-war.git Fixed interface name --- diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index fde2036a..4fbac893 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,42 +2,41 @@ <Scene Scope="Project" version="2"> <Scope Scope="Faces Configuration Only"/> <Scope Scope="Project"> - <Node id="admin/admin_country_list.xhtml" x="1400" y="300" zoom="true"/> - <Node id="admin/admin_user_delete.xhtml" x="400" y="450" zoom="true"/> - <Node id="login/login_change_password.xhtml" x="1650" y="150" zoom="true"/> - <Node id="privacy.xhtml" x="1150" y="450" zoom="true"/> - <Node id="admin/index.xhtml" x="150" y="300" zoom="true"/> - <Node id="login/login_data_saved.xhtml" x="650" y="150" zoom="true"/> - <Node id="exception.xhtml" x="1400" y="450" zoom="true"/> - <Node id="admin/admin_country_delete.xhtml" x="1150" y="600" zoom="true"/> - <Node id="user/register.xhtml" x="900" y="450" zoom="true"/> - <Node id="login/login_all_applications.xhtml" x="150" y="150" zoom="true"/> - <Node id="admin/admin_country_edit.xhtml" x="1150" y="150" zoom="true"/> - <Node id="user/resend_link.xhtml" x="150" y="450" zoom="true"/> - <Node id="login/login_index.xhtml" x="150" y="600" zoom="true"/> - <Node id="login/login_add_addressbook.xhtml" x="150" y="1050" zoom="true"/> - <Node id="login/login_own_addressbooks.xhtml" x="1650" y="300" zoom="true"/> - <Node id="admin/admin_user_list.xhtml" x="400" y="900" zoom="true"/> - <Node id="admin/admin_logout.xhtml" x="1150" y="300" zoom="true"/> - <Node id="terms.xhtml" x="650" y="750" zoom="true"/> - <Node id="admin/admin_user_edit.xhtml" x="1400" y="150" zoom="true"/> - <Node id="admin/admin_user_add.xhtml" x="650" y="900" zoom="true"/> - <Node id="user/user_list.xhtml" x="900" y="600" zoom="true"/> - <Node id="index.xhtml" x="1900" y="150" zoom="true"/> - <Node id="logout.xhtml" x="400" y="300" zoom="true"/> + <Node id="admin/admin_country_list.xhtml" x="1900" y="150" zoom="true"/> + <Node id="admin/admin_user_delete.xhtml" x="900" y="450" zoom="true"/> + <Node id="login/login_change_password.xhtml" x="900" y="150" zoom="true"/> + <Node id="privacy.xhtml" x="400" y="300" zoom="true"/> + <Node id="admin/index.xhtml" x="900" y="750" zoom="true"/> + <Node id="login/login_data_saved.xhtml" x="150" y="150" zoom="true"/> + <Node id="exception.xhtml" x="400" y="1050" zoom="true"/> + <Node id="admin/admin_country_delete.xhtml" x="900" y="600" zoom="true"/> + <Node id="user/register.xhtml" x="1400" y="450" zoom="true"/> + <Node id="admin/admin_country_edit.xhtml" x="1400" y="300" zoom="true"/> + <Node id="login/login_index.xhtml" x="1150" y="600" zoom="true"/> + <Node id="login/login_add_addressbook.xhtml" x="650" y="300" zoom="true"/> + <Node id="user/resend_link.xhtml" x="650" y="900" zoom="true"/> + <Node id="login/login_own_addressbooks.xhtml" x="1150" y="450" zoom="true"/> + <Node id="admin/admin_user_list.xhtml" x="650" y="600" zoom="true"/> + <Node id="admin/admin_logout.xhtml" x="150" y="750" zoom="true"/> + <Node id="terms.xhtml" x="400" y="750" zoom="true"/> + <Node id="admin/admin_user_edit.xhtml" x="150" y="900" zoom="true"/> + <Node id="admin/admin_user_add.xhtml" x="400" y="900" zoom="true"/> + <Node id="user/user_list.xhtml" x="1150" y="300" zoom="true"/> + <Node id="index.xhtml" x="1650" y="150" zoom="true"/> + <Node id="logout.xhtml" x="400" y="450" zoom="true"/> <Node id="user/register_done.xhtml" x="400" y="600" zoom="true"/> - <Node id="login/login_change_personal_data.xhtml" x="650" y="300" zoom="true"/> - <Node id="user/user_profile.xhtml" x="150" y="1200" zoom="true"/> - <Node id="admin/admin_user_unlock.xhtml" x="650" y="600" zoom="true"/> - <Node id="imprint.xhtml" x="150" y="750" zoom="true"/> - <Node id="user/show_addressbook.xhtml" x="400" y="750" zoom="true"/> - <Node id="*" x="900" y="750" zoom="true"/> - <Node id="user/login_error.xhtml" x="400" y="1050" zoom="true"/> - <Node id="user/show_addressbook_entries.xhtml" x="150" y="900" zoom="true"/> - <Node id="login/login_change_email_address.xhtml" x="900" y="150" zoom="true"/> - <Node id="user/lost_passwd.xhtml" x="650" y="450" zoom="true"/> - <Node id="user/login.xhtml" x="400" y="150" zoom="true"/> - <Node id="login/login_edit_user_data.xhtml" x="900" y="300" zoom="true"/> + <Node id="user/user_profile.xhtml" x="150" y="600" zoom="true"/> + <Node id="login/login_change_personal_data.xhtml" x="1150" y="150" zoom="true"/> + <Node id="admin/admin_user_unlock.xhtml" x="150" y="450" zoom="true"/> + <Node id="imprint.xhtml" x="400" y="150" zoom="true"/> + <Node id="*" x="1650" y="300" zoom="true"/> + <Node id="user/show_addressbook.xhtml" x="650" y="150" zoom="true"/> + <Node id="user/login_error.xhtml" x="150" y="300" zoom="true"/> + <Node id="user/show_addressbook_entries.xhtml" x="150" y="1050" zoom="true"/> + <Node id="login/login_change_email_address.xhtml" x="900" y="300" zoom="true"/> + <Node id="user/lost_passwd.xhtml" x="650" y="750" zoom="true"/> + <Node id="user/login.xhtml" x="650" y="450" zoom="true"/> + <Node id="login/login_edit_user_data.xhtml" x="1400" y="150" zoom="true"/> </Scope> <Scope Scope="All Faces Configurations"/> </Scene> diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java index d78b32d1..5286755d 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java @@ -199,7 +199,7 @@ public class JobsAdminUserWebSessionBean implements JobsAdminUserWebSessionContr * Regular user controller */ @Inject - private PizzaUserWebSessionController userController; + private JobsUserWebSessionController userController; /** * Default constructor @@ -318,7 +318,7 @@ public class JobsAdminUserWebSessionBean implements JobsAdminUserWebSessionContr throw new FaceletException(new EmailAddressAlreadyRegisteredException(user)); } else if ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty())) { // Empty password entered, then generate one - password = UserUtils.createRandomPassword(PizzaUserWebSessionController.MINIMUM_PASSWORD_LENGTH); + password = UserUtils.createRandomPassword(JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH); } else if (!this.isSamePasswordEntered()) { // Both passwords don't match throw new FaceletException(new UserPasswordMismatchException(user)); @@ -329,7 +329,7 @@ public class JobsAdminUserWebSessionBean implements JobsAdminUserWebSessionContr // The password should not be null and at least 5 characters long assert (password != null) : "password is null"; - assert (password.length() >= PizzaUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; + assert (password.length() >= JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; // Encrypt password and set it user.setUserEncryptedPassword(UserUtils.encryptPassword(password));