From b285be1a93d1b75c2c9e0b53cc7d333a2885b6ef Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 6 Aug 2016 22:16:43 +0200 Subject: [PATCH] Some fixes: (please cherry-pick) - added missing import for MessageFormat - renamed loginController to userLoginController as this is only for user logins MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AddressbookEmailChangeWebSessionBean.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java index 13bc6bae..ee23ecfc 100644 --- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java @@ -81,7 +81,7 @@ public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookControl * Login bean (controller) */ @Inject - private AddressbookUserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController userLoginController; /** * Default constructor @@ -106,7 +106,7 @@ public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookControl @Override public String doChangeEmailAddress () { // This method shall only be called if the user is logged-in - if (!this.loginController.isUserLoggedIn()) { + if (!this.userLoginController.isUserLoggedIn()) { // Not logged-in throw new IllegalStateException("User is not logged-in"); //NOI18N } else if (!this.isRequiredChangeEmailAddressSet()) { @@ -115,7 +115,7 @@ public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookControl } else if (!Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())) { // Email address 1+2 mismatch throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N - } else if (!this.loginController.ifCurrentPasswordMatches()) { + } else if (!this.userLoginController.ifCurrentPasswordMatches()) { // Password not matching this.showFacesMessage("form_login_change_email_address:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser())); //NOI18N return ""; //NOI18N @@ -125,7 +125,7 @@ public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookControl } // Get user instance - User user = this.loginController.getLoggedInUser(); + User user = this.userLoginController.getLoggedInUser(); // It should be there, so run some tests on it assert (user instanceof User) : "Instance loginController.loggedInUser is null"; //NOI18N -- 2.39.5