From 0e500f18aedcdbd9897d93a020f73302b570e60a Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Apr 2016 20:59:42 +0200 Subject: [PATCH] Fixed getter calls, the new ones are more descriptive. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AddressbookWebSessionBean.java | 4 +-- .../user/AddressbookUserWebSessionBean.java | 33 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java index 5f7d6f01..03cda15f 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java @@ -211,10 +211,10 @@ public class AddressbookWebSessionBean implements AddressbookWebSessionControlle if (null == event) { // Is null throw new NullPointerException("event is null"); //NOI18N - } else if (event.getUser() == null) { + } else if (event.getLoggedInUser()== null) { // user is null throw new NullPointerException("event.user is null"); //NOI18N - } else if (!event.getUser().equals(this.loginController.getLoggedInUser())) { + } else if (!event.getLoggedInUser().equals(this.loginController.getLoggedInUser())) { // Not matching throw new IllegalStateException("event.user and loginController.loggedInUser don't match."); //NOI18N } else if (!this.loginController.isUserLoggedIn()) { diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java index 4c2d87d9..7b6b424e 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java @@ -261,19 +261,19 @@ public class AddressbookUserWebSessionBean implements AddressbookUserWebSessionC if (null == event) { // Throw NPE throw new NullPointerException("event is null"); //NOI18N - } else if (event.getUser() == null) { + } else if (event.getRegisteredUser()== null) { // Throw NPE again throw new NullPointerException("event.user is null"); //NOI18N - } else if (event.getUser().getUserId() == null) { + } else if (event.getRegisteredUser().getUserId() == null) { // userId is null throw new NullPointerException("event.user.userId is null"); //NOI18N - } else if (event.getUser().getUserId() < 1) { + } else if (event.getRegisteredUser().getUserId() < 1) { // Not avalid id - throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getUser(), event.getUser().getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getRegisteredUser(), event.getRegisteredUser().getUserId())); //NOI18N } // Get user instance - User registeredUser = event.getUser(); + User registeredUser = event.getRegisteredUser(); // Debug message System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N @@ -309,22 +309,22 @@ public class AddressbookUserWebSessionBean implements AddressbookUserWebSessionC if (null == event) { // Throw NPE throw new NullPointerException("event is null"); //NOI18N - } else if (event.getUser() == null) { + } else if (event.getLoggedInUser() == null) { // Throw NPE again throw new NullPointerException("event.user is null"); //NOI18N - } else if (event.getUser().getUserId() == null) { + } else if (event.getLoggedInUser().getUserId() == null) { // userId is null throw new NullPointerException("event.user.userId is null"); //NOI18N - } else if (event.getUser().getUserId() < 1) { + } else if (event.getLoggedInUser().getUserId() < 1) { // Not avalid id - throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getUser(), event.getUser().getUserId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N } // Re-initialize list this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); // Copy all data to this bean - this.copyUser(event.getUser()); + this.copyUser(event.getLoggedInUser()); // Trace message System.out.println(MessageFormat.format("UserWebBean:afterUserLogin: this.visibleUserList.size()={0} - EXIT!", this.visibleUserList.size())); //NOI18N @@ -345,9 +345,11 @@ public class AddressbookUserWebSessionBean implements AddressbookUserWebSessionC assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N // Create new user instance - User user = new LoginUser(); - user.setUserName(this.getUserName()); - user.setUserProfileMode(this.getUserProfileMode()); + User localUser = new LoginUser(); + + // Update all data ... + localUser.setUserName(this.getUserName()); + localUser.setUserProfileMode(this.getUserProfileMode()); // Generate phone number DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber()); @@ -427,12 +429,13 @@ public class AddressbookUserWebSessionBean implements AddressbookUserWebSessionC contact.setContactOwnContact(Boolean.TRUE); // Set contact in user - user.setUserContact(contact); + localUser.setUserContact(contact); // Trace message //this.getLogger().logTrace(MessageFormat.format("createUserInstance: user={0} - EXIT!", user)); + // Return it - return user; + return localUser; } @Override -- 2.39.5