From: Roland Haeder Date: Thu, 15 Oct 2015 06:43:53 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1bdeedfb160a839b615d3ce752595ca7f2b884d1;p=addressbook-war.git Continued: - add parameter handling - added some i18n strings - updated jar(s) Signed-off-by:Roland Häder --- diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 0a5cdf28..52192afb 100644 Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index e14d648e..cf6b0ff7 100644 Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 1edfbee9..cfb53da2 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -16,21 +16,27 @@ - + + + + + + + + + + - - + - - - - + + 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}