From: Roland Haeder <roland@mxchange.org>
Date: Mon, 18 Apr 2016 19:50:49 +0000 (+0200)
Subject: better store the user instance locally than as property. well, now auto-complete... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=abc97cf2270191f8966d8eff630c2ee8f528df86;p=jjobs-war.git

better store the user instance locally than as property. well, now auto-complete cannot help here anymore. :-(
---

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java
index b05c8d1c..3714d194 100644
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionBean.java
@@ -166,11 +166,6 @@ public class JobsAdminUserWebSessionBean implements JobsAdminUserWebSessionContr
 	 */
 	private String street;
 
-	/**
-	 * User instance
-	 */
-	private User user;
-
 	/**
 	 * Remote user bean
 	 */
@@ -550,16 +545,6 @@ public class JobsAdminUserWebSessionBean implements JobsAdminUserWebSessionContr
 		this.street = street;
 	}
 
-	@Override
-	public User getUser () {
-		return this.user;
-	}
-
-	@Override
-	public void setUser (final User user) {
-		this.user = user;
-	}
-
 	@Override
 	public String getUserName () {
 		return this.userName;
@@ -669,9 +654,6 @@ public class JobsAdminUserWebSessionBean implements JobsAdminUserWebSessionContr
 		this.setUserPassword(null);
 		this.setUserPasswordRepeat(null);
 		this.setZipCode(null);
-
-		// - user instance
-		this.setUser(null);
 	}
 
 	/**
diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionController.java
index 3a853738..3580232d 100644
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebSessionController.java
@@ -317,20 +317,6 @@ public interface JobsAdminUserWebSessionController extends Serializable {
 	 */
 	void setStreet (final String street);
 
-	/**
-	 * Getter for user instance (e.g. from show_user)
-	 * <p>
-	 * @return User instance
-	 */
-	User getUser ();
-
-	/**
-	 * Setter for user instance (e.g. from show_user)
-	 * <p>
-	 * @param user User instance
-	 */
-	void setUser (final User user);
-
 	/**
 	 * Getter for user name
 	 * <p>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 350b1914..629ec20c 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -9,7 +9,7 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="userId" value="#{adminUserController.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewParam name="userId" value="#{user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -20,32 +20,32 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminUserController.user}" />
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty user}" />
 
-			<h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminUserController.user}">
+			<h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty user}">
 				<f:facet name="header">
 					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-						<f:param value="#{adminUserController.user.userName}" />
-						<f:param value="#{adminUserController.user.userId}" />
+						<f:param value="#{user.userName}" />
+						<f:param value="#{user.userId}" />
 					</h:outputFormat>
 				</f:facet>
 
 				<h:column>
 					<h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
 
-					<h:outputText id="userId" styleClass="data_field" value="#{adminUserController.user.userId}" />
+					<h:outputText id="userId" styleClass="data_field" value="#{user.userId}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
 
-					<h:outputText id="userName" styleClass="data_field" value="#{adminUserController.user.userName}" />
+					<h:outputText id="userName" styleClass="data_field" value="#{user.userName}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
 
-					<h:outputText id="userCreated" styleClass="data_field" value="#{adminUserController.user.userCreated.time}">
+					<h:outputText id="userCreated" styleClass="data_field" value="#{user.userCreated.time}">
 						<f:convertDateTime for="userCreated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -53,7 +53,7 @@
 				<h:column>
 					<h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />
 
-					<h:outputText id="userUpdated" styleClass="data_field" value="#{adminUserController.user.userUpdated.time}">
+					<h:outputText id="userUpdated" styleClass="data_field" value="#{user.userUpdated.time}">
 						<f:convertDateTime for="userUpdated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -61,19 +61,19 @@
 				<h:column>
 					<h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />
 
-					<h:outputText id="userAccountStatus" styleClass="data_field #{adminUserController.user.userAccountStatus.styleClass}" value="#{msg[adminUserController.user.userAccountStatus.messageKey]}" />
+					<h:outputText id="userAccountStatus" styleClass="data_field #{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
 
-					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[adminUserController.user.userProfileMode.messageKey]}" />
+					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[user.userProfileMode.messageKey]}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
 
-					<h:outputText id="userLastLocked" styleClass="data_field" value="#{adminUserController.user.userLastLocked.time}">
+					<h:outputText id="userLastLocked" styleClass="data_field" value="#{user.userLastLocked.time}">
 						<f:convertDateTime for="userLastLocked" type="both" />
 					</h:outputText>
 				</h:column>
@@ -81,13 +81,13 @@
 				<h:column>
 					<h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />
 
-					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{adminUserController.user.lastLockedReason}" />
+					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{user.lastLockedReason}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
 
-					<h:outputText id="contactCreated" styleClass="data_field" value="#{adminUserController.user.userContact.contactCreated.time}">
+					<h:outputText id="contactCreated" styleClass="data_field" value="#{user.userContact.contactCreated.time}">
 						<f:convertDateTime for="contactCreated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -95,7 +95,7 @@
 				<h:column>
 					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />
 
-					<h:outputText id="contactUpdated" styleClass="data_field" value="#{adminUserController.user.userContact.contactUpdated.time}">
+					<h:outputText id="contactUpdated" styleClass="data_field" value="#{user.userContact.contactUpdated.time}">
 						<f:convertDateTime for="contactUpdated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -103,81 +103,81 @@
 				<h:column>
 					<h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />
 
-					<h:outputText id="isOwnContact" styleClass="data_field" value="#{adminUserController.user.userContact.isOwnContact()}" />
+					<h:outputText id="isOwnContact" styleClass="data_field" value="#{user.userContact.isOwnContact()}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
 
-					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[adminUserController.user.userContact.contactGender.messageKey]}" />
+					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[user.userContact.contactGender.messageKey]}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
 
-					<h:outputText id="contactTitle" styleClass="data_field" value="#{adminUserController.user.userContact.contactTitle}" />
+					<h:outputText id="contactTitle" styleClass="data_field" value="#{user.userContact.contactTitle}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
 
-					<h:outputText id="contactFirstName" styleClass="data_field" value="#{adminUserController.user.userContact.contactFirstName}" />
+					<h:outputText id="contactFirstName" styleClass="data_field" value="#{user.userContact.contactFirstName}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
 
-					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{adminUserController.user.userContact.contactFamilyName}" />
+					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{user.userContact.contactFamilyName}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
 
-					<h:outputText id="contactStreet" styleClass="data_field" value="#{adminUserController.user.userContact.contactStreet}" />
+					<h:outputText id="contactStreet" styleClass="data_field" value="#{user.userContact.contactStreet}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
 
-					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{adminUserController.user.userContact.contactHouseNumber}" />
+					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{user.userContact.contactHouseNumber}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
 
-					<h:outputText id="contactZipCode" styleClass="data_field" value="#{adminUserController.user.userContact.contactZipCode}" />
+					<h:outputText id="contactZipCode" styleClass="data_field" value="#{user.userContact.contactZipCode}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
 
-					<h:outputText id="contactCity" styleClass="data_field" value="#{adminUserController.user.userContact.contactCity}" />
+					<h:outputText id="contactCity" styleClass="data_field" value="#{user.userContact.contactCity}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
 
-					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{adminUserController.user.userContact.contactEmailAddress}">
-						<h:outputText value="#{adminUserController.user.userContact.contactEmailAddress}" />
+					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{user.userContact.contactEmailAddress}">
+						<h:outputText value="#{user.userContact.contactEmailAddress}" />
 					</h:outputLink>
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
 
-					<h:outputText id="contactBirthday" styleClass="data_field" value="#{adminUserController.user.userContact.contactBirthday.time}">
+					<h:outputText id="contactBirthday" styleClass="data_field" value="#{user.userContact.contactBirthday.time}">
 						<f:convertDateTime for="contactBirthday" type="date" />
 					</h:outputText>
 				</h:column>
 			</h:panelGrid>
 
 			<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
-				<ui:param name="user" value="#{adminUserController.user}" />
+				<ui:param name="user" value="#{user}" />
 			</ui:include>
 
 			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
-				<ui:param name="cellphoneNumber" value="#{adminUserController.user.userContact.contactCellphoneNumber}" />
-				<ui:param name="user" value="#{adminUserController.user}" />
+				<ui:param name="cellphoneNumber" value="#{user.userContact.contactCellphoneNumber}" />
+				<ui:param name="user" value="#{user}" />
 			</ui:include>
 		</ui:define>
 	</ui:composition>