From 70e6bfdfb2b431bd61dcb17e7463783f2899d2d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 25 Sep 2022 17:32:59 +0200 Subject: [PATCH] Please cherry-pick: - alsways use full-qualified access, means: `this.foo` and not just `foo` MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../beans/user/AddressbookAdminUserWebRequestBean.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java index 7fb17ad3..224fdc01 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java @@ -262,7 +262,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookBean impl // Is the user name or email address used already? // @TODO Add password length check - if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (userListController.isUserNameRegistered(newUser))) { + if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userListController.isUserNameRegistered(newUser))) { // User name is already used throw new FaceletException(new UserNameAlreadyRegisteredException(newUser)); } else if ((this.getContact() == null) && (this.contactController.isEmailAddressRegistered(newUser.getUserContact()))) { @@ -316,7 +316,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookBean impl // Now, that all is set, call EJB if (this.getContact() instanceof Contact) { // Fire event - userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser)); + this.userLinkedEvent.fire(new AdminLinkedUserEvent(updatedUser)); } else { // Fire event this.addedUserEvent.fire(new AdminAddedUserEvent(updatedUser)); @@ -431,9 +431,9 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookBean impl this.setUserPasswordRepeat(null); // Not same password entered - this.showFacesMessage("form_edit_user:userPassword", "ADMIN_USER_PASSWORD_REPEAT_DIFFERENT"); //NOI18N - return ""; //NOI18N - } else if ((!Objects.equals(this.getUser().getUserName(), this.getUserName())) && (this.userBean.ifUserNameExists(this.getUserName()))) { + this.showFacesMessage("form_edit_user:userPassword", "ADMIN_USER_PASSWORD_REPEAT_DIFFERENT", FacesMessage.SEVERITY_INFO); //NOI18N + return; + } else if ((!Objects.equals(user.getUserName(), this.getUserName())) && (this.userBean.ifUserNameExists(this.getUserName()))) { // Clear all fields this.clear(); -- 2.39.5