From 1bdeedfb160a839b615d3ce752595ca7f2b884d1 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 15 Oct 2015 08:43:53 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20add=20parameter=20handling=20-?= =?utf8?q?=20added=20some=20i18n=20strings=20-=20updated=20jar(s)=20Signed?= =?utf8?q?-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/juser-core.jar | Bin 22937 -> 23003 bytes lib/juser-lib.jar | Bin 3940 -> 3978 bytes nbproject/faces-config.NavData | 20 ++++++++++++------ .../beans/shares/SharesWebBean.java | 15 +++++++++++++ .../beans/shares/SharesWebController.java | 14 ++++++++++++ .../localization/bundle_de_DE.properties | 3 +++ .../localization/bundle_en_US.properties | 3 +++ web/WEB-INF/faces-config.xml | 4 ++++ .../login_list_sharing_addressbooks.xhtml | 7 ++++++ web/user/user_profile.xhtml | 7 ++++++ 10 files changed, 66 insertions(+), 7 deletions(-) diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 0a5cdf28792248f870844e1f1099ad02f151c28e..52192afb650a52b7b7b6199a0479a2083a849665 100644 GIT binary patch delta 1579 zcmZ9Me@s(X6vxkf?W6RUEwso=1sZK#9TqXcFKVa25C%#*##cNJe_7xp0gQHqF2E$rd3deQSe69y8Zxl>-6*>7}gyT^z zJ)?m!J~*L+voOwkUy%U2T#gLBeu6jW`P`%izSY15^kun~Q?6Yy8&e|QR@rQ5>S*iU zxM^)qM|WL2gFJl3?@Fy}cT_rpo7}g-;1Ztk*QmaO@3Ak} zld6Gf19ZU;SX$^;UuNLN<4&*gap68m`#z}QL(s!V_*C&**?YkR`@seWXyczk9t=PL z4nh?SLIe)s^bHAFbt33>m}{%3p58aaJIxPp8^?9 zW2h_>R|b4+Oz^D%xBNBnbAo?Kd_r(m>Xt7OpAtM=>SNP_?<9Ve_%*>NiO&dbDRav= zh~Fe$%YGMZFR@u-w}f`4%*SpMuaxJA{U_MwppV@b+M_|YtOA*-1^=6Ps^Ecgw`?T7 zNbqgtPaD%gViqtlD=c9dc%j_O2Jvor9ZSL5ipY`>WlMsB9!kSN4;)FV17%;ub#dUf zSB<9{=wSV_VeHiy4lX?r_o~V=QmC23feFF_VK{0y_i&09{mDyvt62y@Gq$nyP8G7ULq&dL_9ds?8>FQ+ynS$j*`i(=E45S z5B9nAq_ZL4PQAg7|Hdp_uiT$X|5F9PZB3GXyD_1kS@bxbUMuul+E&SzNXugnv**}0{# z^7%4Puqa$qyg3vq+}6Fbv!}bGtM9l^l62a`{cS(>m?KtkXco~VawDU~YXx=)FFs{4 z;n%{(IhVx49MWZE;mL=dM4RisRq=8b)pX-0gDlR$_F6MeNH)=bkT(R!abuT>XS@sW z+Z_SGt%?QxOKte0-KD=|vr10f>u57_{3SV}V&0N{27W%7xn0F<_lSyFj#>N`GhDR8c9_NPl|k{nKCp5^CLkE$0NCIlKD+uA_hCqcw;&Ua z(4q#Q5C)+X-i8<)g<3dUt$vrZC%^>nLoy736Gk9|UeAxmLtDg0 zSR6^iyi%Wb7Bu(-+r#PDSsD;yioZwvbK+kpK2Q7`#aD%W+6Cg%#2*#2ik&5Pnb;N1 z?T-Y+9O0;TozTxpzK7Til{yviY4gNyDV|am5VsX?E%RxA5Wl1NVd8fc|B1K+O&ApS zmIs7c@onWk%}(5*_;C4Sj%1J`1rmi5vPCM&ihOYZiz*%$8a`K1`@b_n)u_)^%&D3g zjg4ElHl~iYUuZD_wCJzbRBF}|kU(Vz))c&2?-f>EHiU(N4i`on!||sJUv3Oh)#1mD zuJlQgJkzr^&`>L6s$tjc>knkmz)t8vw0KmpSqofoDw@^F232Ud^x#}$%8oGtd8%WMD|M@ zl!Xt)`Bv}Vll4YF?E|;+e^*NJSnn*Q3qKyIdH{0`CLCI?tk0}>$x)*k`OBEWlwUaR zAji2B*=WscaZQ_2AKKuOuR8cG@SLN7X%4A(byRCJ1^{j~aq4RrY>x|b+n zaYhgu7mRa8FYT)rUu(-|@o<|<_Ejh{U@)R{gId>%{$R>3`c-p_SNFsgbJuOm g;F%W7l1lTDxS7H=^u6+Nv?d)t+n8j!*}$X!0Mb#A#Q*>R diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index e14d648e3bcd46495351db84d51b09385b0be2ef..cf6b0ff7ab8718301ea8e9f7e5d24f2baf2f520a 100644 GIT binary patch delta 746 zcmaDN*Co#z;LXg!#lXP9z%a+fefj%wBC{jQ-3r-)MRx=BQPDqXaT0DGunaa8;p)% zT87CML~o8^;$;Ria#-1!d4VGCVd+MPKQl2fe4gCE;mak-&LGClAkNMpvH3cO2BRup zW?E=*YLRD(Yei;pNiidXu!c`oVp*boPGVlVzE6H$y0vE1=D(aejEwA)wYXgk1Q-}t z7#Rc^fHVUWgAkY$W)K0=Yz&MHq6`cH-i%Bl%c^c`9D5;tZ1~@bIt*GBPksUdSS@htC>W z6l>f-T0XMM@}p^)EXXU((g>BD?8_@8kM2P=6mt$uuH!XTLRX`NqJ|9^X+XP_Fr26G zk)>=sP!fcl;aV6NmNdFSw8&1r!>llQ9|zmy3_czOkS*S`{Tk;3B|+F1MN1g# c$$R*W!A^#!7N9~~6om3v9*mklalj`IJ94cJm>q0GJeH5CYO{42%rI3=9F@j7%cTaNkYd%WZ+` zy~#{GreN1t@kooG1!~MMO4mo%mBS;=_LEXXE4 z`7RF+*w8mT(k%WELD|U~ygV5Cl~MF}!IbV{_7qa)GV9 z!z<0g4-7Y;JCr8N@WAX$( ih|MU`0JoWeVM${qFtGqFP@DXpOAx3 - + + + + + + + + + + - - + - - - - + + diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java index 11caa318..5d57825f 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java @@ -56,6 +56,11 @@ public class SharesWebBean implements SharesWebController { */ private Boolean isUserSharing = null; + /** + * User id of sharee + */ + private Long shareeUserId; + /** * Default constructor */ @@ -73,6 +78,16 @@ public class SharesWebBean implements SharesWebController { } } + @Override + public Long getShareeUserId () { + return this.shareeUserId; + } + + @Override + public void setShareeUserId (final Long shareeUserId) { + this.shareeUserId = shareeUserId; + } + @Override public boolean isSharingAddressbooks () { // Only to be called for logged-in users diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java index 2fe90ffc..b61838db 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java +++ b/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java @@ -31,4 +31,18 @@ public interface SharesWebController extends Serializable { * @return Whether the current user is sharing address books */ public boolean isSharingAddressbooks (); + + /** + * Getter for sharee's user id + *

+ * @return Sharee's user id + */ + public Long getShareeUserId (); + + /** + * Setter for sharee's user id + *

+ * @param shareeUserId Sharee's user id + */ + public void setShareeUserId (final Long shareeUserId); } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 91451aa9..bc9c6bf4 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -217,3 +217,6 @@ PAGE_TITLE_INDEX_USER_PROFILE=Benutzerprofil CONTENT_TITLE_INDEX_USER_PROFILE=\u00d6ffentliches Profil des Benutzers: PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=Mit einem Benutzer geteilte Adressb\u00fccher CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=Mit einem Benutzer geteilte Adressb\u00fccher auflisten: +PARAMETER_USER_ID_MISSING=Benutzernummer nicht angegeben. +PARAMETER_USER_ID_INVALID=Der angeklickte Link ist nicht mehr g\u00fcltig: Den Benutzer mit der Id-Nummer existiert nicht (mehr). +PARAMETER_USER_ID_NOT_FOUND=Benutzeraccount mit der Id-Nummer nicht gefunden. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 1b3b06ad..052813f1 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -217,3 +217,6 @@ PAGE_TITLE_INDEX_USER_PROFILE=User profile CONTENT_TITLE_INDEX_USER_PROFILE=Public profile of the user: PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=With a user shared address books CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=List with a user shared address books: +PARAMETER_USER_ID_MISSING=No user id number provided +PARAMETER_USER_ID_INVALID=The clicked link is no longer valid: The user with provided id number does not exist (anymore). +PARAMETER_USER_ID_NOT_FOUND=User account with given id number not found. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 79a7df9f..f7aa4523 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -33,6 +33,10 @@ UserProfileVisibilityValidator org.mxchange.addressbook.validator.booleans.UserProfileVisibilityValidator + + UserIdValidator + org.mxchange.jusercore.model.user.UserIdValidator + * diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/login/login_list_sharing_addressbooks.xhtml index 34c13e5b..38102206 100644 --- a/web/login/login_list_sharing_addressbooks.xhtml +++ b/web/login/login_list_sharing_addressbooks.xhtml @@ -6,6 +6,13 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > + + + + + + + #{msg.PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS} diff --git a/web/user/user_profile.xhtml b/web/user/user_profile.xhtml index 33db5830..b5eeb999 100644 --- a/web/user/user_profile.xhtml +++ b/web/user/user_profile.xhtml @@ -6,6 +6,13 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > + + + + + + + #{msg.PAGE_TITLE_INDEX_USER_PROFILE} -- 2.39.5