From: Roland Haeder <roland@mxchange.org>
Date: Tue, 20 Oct 2015 13:03:14 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=da18f9b92f0c3772c7a3313f2b9e7f72ab3abc97;p=addressbook-war.git

Continued:
- No, also c:set is not right and previous also not. So how can I set a value in a bean from a template?
- moved some components to proper location
- added missing this.
- updated jar(s)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index f42fc0bb..6b3619e1 100644
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
diff --git a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java
index 0869a84b..24ff1a1b 100644
--- a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java
@@ -60,7 +60,7 @@ public class UserProfileWebRequestBean implements UserProfileWebRequestControlle
 
 	@Override
 	public User getUser () {
-		return user;
+		return this.user;
 	}
 
 	@Override
diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/generic/user_profile_link.tpl
index 379c763e..c142209e 100644
--- a/web/WEB-INF/templates/generic/user_profile_link.tpl
+++ b/web/WEB-INF/templates/generic/user_profile_link.tpl
@@ -6,9 +6,11 @@
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 
 	<h:outputText styleClass="notice" value="#{msg.ERROR_USER_INSTANCE_NOT_SET}" rendered="#{empty profileController.user}" />
+
+	<h:outputText class="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty profileController.user and not profileController.isProfileLinkVisible()}" />
+
 	<h:link id="userProfileLink" outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty profileController.user and profileController.isProfileLinkVisible()}">
 		<h:outputText id="userName" value="#{profileController.user.userName}" />
 		<f:param name="userId" value="#{profileController.user.userId}" />
 	</h:link>
-	<h:outputText class="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" />
 </ui:composition>
diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml
index 358a5910..e531374f 100644
--- a/web/login/login_shared_addressbooks.xhtml
+++ b/web/login/login_shared_addressbooks.xhtml
@@ -4,7 +4,7 @@
 	  xmlns:ui="http://java.sun.com/jsf/facelets"
 	  xmlns:h="http://xmlns.jcp.org/jsf/html"
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
 	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS}</ui:define>
@@ -21,6 +21,8 @@
 
 				<div class="para">
 					<h:dataTable id="sharedAddressbooks" var="share" value="#{shareController.allShares()}" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks()}">
+						<c:set value="#{share.shareUserSharee}" target="#{profileController}" property="user" />
+
 						<h:column>
 							<f:facet name="header">#{msg.SHARED_ADDRESSBOOK}</f:facet>
 
@@ -32,9 +34,7 @@
 
 						<h:column>
 							<f:facet name="header">#{msg.SHAREE_USER_NAME}</f:facet>
-							<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-								<f:setPropertyActionListener target="#{share.shareUserSharee}" value="#{profileController.user}" />
-							</ui:include>
+							<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl" />
 						</h:column>
 
 						<h:column>
@@ -47,7 +47,7 @@
 				</div>
 
 				<div class="para">
-					<h:outputText class="notice" value="#{msg.LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks() == false}" />
+					<h:outputText class="notice" value="#{msg.LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS}" rendered="#{not shareController.isSharingAddressbooks()}" />
 				</div>
 
 				<div class="table_footer">
diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/login/login_start_sharing_addressbook.xhtml
index 2f152fe1..50cc203f 100644
--- a/web/login/login_start_sharing_addressbook.xhtml
+++ b/web/login/login_start_sharing_addressbook.xhtml
@@ -3,7 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 	  xmlns:ui="http://java.sun.com/jsf/facelets"
 	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core">
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
 	<ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}</ui:define>
@@ -23,7 +24,7 @@
 					<h:outputText id="ownProfileInvisible" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not loginController.isUserLoggedIn()}" />
 
 					<h:dataTable id="userList" headerClass="table_header_column" var="user" value="#{addressbookController.allUsersNotSharing()}" rendered="#{loginController.isUserLoggedIn() and not loginController.isInvisible()}">
-						<f:setPropertyActionListener target="#{user}" value="#{profileController.user}" />
+						<c:set value="#{share.shareUserSharee}" target="#{profileController}" property="user" />
 						<h:column>
 							<f:facet name="header">#{msg.USER_ID}</f:facet>
 							<h:outputText value="#{user.userId}" />
@@ -31,9 +32,7 @@
 
 						<h:column>
 							<f:facet name="header">#{msg.USER_NAME}</f:facet>
-							<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-								<f:setPropertyActionListener target="#{user}" value="#{profileController.user}" />
-							</ui:include>
+							<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl" />
 						</h:column>
 
 						<h:column>
diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml
index 9c980d8b..7000aaed 100644
--- a/web/user/show_addressbook.xhtml
+++ b/web/user/show_addressbook.xhtml
@@ -3,7 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 	  xmlns:ui="http://java.sun.com/jsf/facelets"
 	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core">
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
 	<f:metadata>
 		<f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
@@ -22,6 +23,8 @@
 
 		<ui:define name="content">
 			<h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.isAddressbookLoaded()}">
+				<c:set value="#{addressbookController.addressbookUser}" target="#{profileController}" property="user" />
+
 				<f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
 
 				<h:outputLabel for="addressbookId" class="table_label">#{msg.ADDRESSBOOK_ID}</h:outputLabel>
@@ -31,9 +34,7 @@
 				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
 
 				<h:outputLabel for="userProfileLink" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
-				<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-					<f:setPropertyActionListener target="#{addressbookController.addressbookUser}" value="#{profileController.user}" />
-				</ui:include>
+				<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl" />
 
 				<h:outputLabel for="addressbookCreated" class="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
 				<h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml
index 8a08d31d..12f18f92 100644
--- a/web/user/user_list.xhtml
+++ b/web/user/user_list.xhtml
@@ -4,7 +4,7 @@
 	  xmlns:ui="http://java.sun.com/jsf/facelets"
 	  xmlns:h="http://xmlns.jcp.org/jsf/html"
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
 	<ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
@@ -20,25 +20,20 @@
 				</div>
 
 				<h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
+					<c:set value="#{share.shareUserSharee}" target="#{profileController}" property="user" />
 					<h:column>
 						<f:facet name="header">#{msg.USER_ID}</f:facet>
-						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-							<f:setPropertyActionListener target="#{user}" value="#{profileController.user}" />
-						</ui:include>
+						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl" />
 					</h:column>
 
 					<h:column>
 						<f:facet name="header">#{msg.USER_NAME}</f:facet>
-						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-							<f:setPropertyActionListener target="#{user}" value="#{profileController.user}" />
-						</ui:include>
+						<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl" />
 					</h:column>
 
 					<h:column>
 						<f:facet name="header">#{msg.USER_CREATED}</f:facet>
-						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}">
-							<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-						</h:outputFormat>
+						<h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
 					</h:column>
 
 					<h:column>