From fcd591bb41bb7b8adf8cd13b8f7895b9f4057004 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 18 Apr 2016 20:59:42 +0200
Subject: [PATCH] Fixed getter calls, the new ones are more descriptive.

---
 .../JobsAddressbookWebSessionBean.java        |  4 +--
 .../beans/user/JobsUserWebSessionBean.java    | 31 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
index 6fa921a4..ea674fd9 100644
--- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
@@ -202,10 +202,10 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
 		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/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
index 2b16ef71..b04893e1 100644
--- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
@@ -251,19 +251,19 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController {
 		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
@@ -299,22 +299,22 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController {
 		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
@@ -335,11 +335,11 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController {
 		assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
 
 		// Create new user instance
-		User user = new LoginUser();
+		User localUser = new LoginUser();
 
 		// Update all data ...
-		user.setUserName(this.getUserName());
-		user.setUserProfileMode(this.getUserProfileMode());
+		localUser.setUserName(this.getUserName());
+		localUser.setUserProfileMode(this.getUserProfileMode());
 
 		// Generate phone number
 		DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
@@ -419,12 +419,13 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController {
 		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