From da18f9b92f0c3772c7a3313f2b9e7f72ab3abc97 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 20 Oct 2015 15:03:14 +0200
Subject: [PATCH] =?utf8?q?Continued:=20-=20No,=20also=20c:set=20is=20not?=
 =?utf8?q?=20right=20and=20previous=20also=20not.=20So=20how=20can=20I=20s?=
 =?utf8?q?et=20a=20value=20in=20a=20bean=20from=20a=20template=3F=20-=20mo?=
 =?utf8?q?ved=20some=20components=20to=20proper=20location=20-=20added=20m?=
 =?utf8?q?issing=20this.=20-=20updated=20jar(s)=20Signed-off-by:Roland=20H?=
 =?utf8?q?=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcontacts-core.jar                        | Bin 20766 -> 20873 bytes
 .../profile/UserProfileWebRequestBean.java    |   2 +-
 .../templates/generic/user_profile_link.tpl   |   4 +++-
 web/login/login_shared_addressbooks.xhtml     |  10 +++++-----
 .../login_start_sharing_addressbook.xhtml     |   9 ++++-----
 web/user/show_addressbook.xhtml               |   9 +++++----
 web/user/user_list.xhtml                      |  15 +++++----------
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index f42fc0bb6f804a7134b6959a34e8c210f76a3980..6b3619e1b879be6ab4b7b20ecf765dde842559b6 100644
GIT binary patch
delta 2381
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
Y=QP($?yjG?OnzK{5Z|A1A|{>x1Fh1I3IG5A

delta 2266
zcmaJ?Yiv|i5dP-w!nu3*mOf~u_CX(%c4@b7x|F`#Ew-hPZCRde5f;1BLc7IoQ53bJ
zLX;RoIf({ij6o89Xhd0!k3=IsjQ&ugiHU!RQKNrM3>qH+-!r#btwwKhXTF&;Gk5Np
zIddL-ik>)2NrSyEw*{C$)0yymk}s+8Ot`E0qVKaq01nM}4CDurtl&&EG8-K$@3_4o
zzq+EnqH0edP(Bfxjn2d(lk?|GT<kReL7v0D^$F9fsm9@9YH;`|YIpdD)GR!aZe(~;
z<y-S-pH3<80rFPq2o>s4Z`RyC3*EHBgJMb+k|HEkQJP6BEi9vSi{%V2N+`pk>u8ll
znRLB~S+bBVC`VAPpw)u%1mz1V5L75=ji4eyYXubxDiP$H6Sz)bsh~1JenI7eDg;#u
zsuEN!s76q&qV<aE1O`MIu+T~yM9i|No;C_`#2opb1|f|?nuIh9X%W)u(bINyxuVUA
zdQIxH&_@08p92yv<Y6)>L5D2bLSaQ)6>ZaHJ*A1C?Uy`Mmw4QmTCNLnk0+kaJxMFJ
z+jxa`DB5Y$E*jRsywBYuHjV1C{1<a~+qg<#f@?P2h*LH$BB5xHO?xS#FKu3#NGUi^
z`9*MHTKWNmTcVgj99viwj$;<%Jvf}WT=;;S-qg{O18WMUmnaR2(&3>Dq|hp)Q8rf5
zYWOG*EtH@5vgEQwwfe1^;v$<v0v=qzbIeU5JkOeE7_WC$fYdadQ|p_v+XyZ)c)=hS
zxgEX?L(H34vz(2?aZ+T$SOA_87;R)ZBId~($GnJ6)+fjwrX<mw_^bb=8MlQihR^eH
zkhg|IPtWYHoH}yTcqFD{lySN>Nq<qBJa@taH@E^r*rMQ92wTX*Rtwv(-HRRA>BTM#
z3mLK4a8zNpi5nI6SlEk*g?+fmf)`^FB`U5r3)(Ma+(dzi32{3h@<9`8OiT)#GErnA
z#?ZvH!XbrQ5=Ym6L^>A8bcYpY5+?&)w46&q@as=o{3SN3aaiG28@J(z!tFNhz)?1|
zaVPGwaW`gdbfH_9)`xTF#P}YCV>a%^eKtC9zm2sh7Ia)cR-fzYKrr!Y{j-L(p0`wL
zW~J$PV^N01g(_vygE|Cwp_1_>{Y>M@P5HdptC55aC}afmqaJ+7*}WGVSx0DKDFyCd
z;8kc;Xv+H$Mh-_>i{?Kfy`+yf-P0_Q{ILFrw1QJ@L9ydoiB_~NMsiudVueCGajYMC
zV-3zesQa3GOFH>`@}!}JbC7J(u#WR~V-sToH*gHui`ScLybHF39&FY>Ey^Zm-KXnY
z?krvK=*NKL8Cu#wcU<}IXpaYwcY}<x)2#(_G5$S^ztE)6Y@$WFu+__Xx0~ot2wLdG
zCW~|E5~FT~9*fUplV~=3nDh$j^YR7`c-SDMFlb`P!b)thkST^?Y*pAsSXmT_$D=c|
z6VtJH=R`cRZ!$VYNIcoPmZ(u**jT2&X$$JR+7G+8E9}rew7>1*s_9D|b>2GcRM=%>
z7$cg3f%Z`wyPdAJrE6{JT0;7P$gPpe!?P2Um3<SjgVC|Ri8y!B7@{_AhTq11j4SZO
znZUR{5^Uh82NVw4n8cKRE!bpKj_AS8DxI8}nMm#Y-k{4`bv-;P^{qky*CPwdkj;Hm
z#`SjdBpE_EDtMozt7KFxXsTF}`e(rP8&cs`s8*=q*@4!p9H5q$3~oz9T2d!>2XZ!G
z4eLy9Kxxrj#($eG`?`HuGF^zfQXCtWR5Wp}`yIE7FGn5kuU~pQ>X-ZLoJ;NN{_NU!
z*;mHJU@sZzu7xXAMhdGJpQJ^Ug0I@I=$3&T$A9-gHf8BOp)CLZdFL(h4v~H?RG>c@
zu$>TB2C|KZ7F2JLXWf72uy76}l;rR}f3-SK^2~Xm{Nj5&y5;pRehD~tEJa@kHRk{8
zu3lo}^E%m#dQ<hsA=@$j=Pdox{@k%gYsFZm=_7+_j_s0D^QR&6bH^TTS+LDa{>Rqn
al%Z_H->vtCigZ<Pj-DF2Zuzx7@%<fcjE7VJ

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>
-- 
2.39.5