Continued:

- add parameter handling
- added some i18n strings
- updated jar(s)
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 0a5cdf28792248f870844e1f1099ad02f151c28e..52192afb650a52b7b7b6199a0479a2083a849665 100644 (file)
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 e14d648e3bcd46495351db84d51b09385b0be2ef..cf6b0ff7ab8718301ea8e9f7e5d24f2baf2f520a 100644 (file)
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 1edfbee9b04986846313ec49b9ee1c5c87f43960..cfb53da23519d5be52c7a546173925e588057e5c 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -16,21 +16,27 @@
         <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="Project">
-        <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="login/login_show_addressbook.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="user/login.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/admin_index.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="login/login_user_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="150" y="900" zoom="true"/>
         <Node id="login/login_edit_address.xhtml" x="150" y="300" zoom="true"/>
         <Node id="login/login_edit_user_data.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="650" y="450" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="900" y="300" zoom="true"/>
         <Node id="*" x="650" y="150" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="400" y="150" zoom="true"/>
         <Node id="terms.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="400" y="150" zoom="true"/>
         <Node id="user/register_done.xhtml" x="1150" y="300" zoom="true"/>
         <Node id="bye.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/admin_index.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_user_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_show_addressbook_entries.xhtml" x="650" y="750" zoom="true"/>
         <Node id="index.xhtml" x="650" y="600" zoom="true"/>
         <Node id="imprint.xhtml" x="900" y="450" zoom="true"/>
         <Node id="login/login_index.xhtml" x="150" y="750" zoom="true"/>

diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java
index 11caa31830591f01b8ab49b3384dbf7fb86f93e9..5d57825f087f90d8dcbb80f14705ef26601683c4 100644 (file)
--- 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 2fe90ffc60068f19de0053c9ae2d544dd73b6cf6..b61838db122f095f72efaa5303f1b1e182ca2f71 100644 (file)
--- 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
+        * <p>
+        * @return Sharee's user id
+        */
+       public Long getShareeUserId ();
+
+       /**
+        * Setter for sharee's user id
+        * <p>
+        * @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 91451aa9f03538cfba55fb3655a22806687e51ef..bc9c6bf4fe0e3c5fcf0c23202e86ca06fdafb8a7 100644 (file)
--- 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 1b3b06ad89c1070a74940ad08ecc9b6c08378c96..052813f1192eca59d7312c81a328f287ae8906a1 100644 (file)
--- 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 79a7df9fc77733733bf9495f45363b475794fa77..f7aa45233bd0a33cf3825d583f977e2c26352449 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -33,6 +33,10 @@
                <validator-id>UserProfileVisibilityValidator</validator-id>
                <validator-class>org.mxchange.addressbook.validator.booleans.UserProfileVisibilityValidator</validator-class>
        </validator>
+       <validator>
+               <validator-id>UserIdValidator</validator-id>
+               <validator-class>org.mxchange.jusercore.model.user.UserIdValidator</validator-class>
+       </validator>
        <navigation-rule>
                <from-view-id>*</from-view-id>
                <navigation-case>

diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/login/login_list_sharing_addressbooks.xhtml
index 34c13e5b63b667749033d4d3aad2ec36f59f57ba..38102206fe06543bc45c865c0fa59ceaea7fbab2 100644 (file)
--- 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"
          >
 
+       <f:metadata>
+               <f:viewParam id="userId" name="profile" value="#{shareController.shareeUserId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
+                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+                       <f:validator for="userId" validatorId="UserIdValidator" />
+               </f:viewParam>
+       </f:metadata>
+
        <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS}</ui:define>
 

diff --git a/web/user/user_profile.xhtml b/web/user/user_profile.xhtml
index 33db5830351d6d11fd29fef6c1783708da09e456..b5eeb999bc5c0f53e47ac4a5cccedd0fac28dc74 100644 (file)
--- a/web/user/user_profile.xhtml
+++ b/web/user/user_profile.xhtml
@@ -6,6 +6,13 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
+       <f:metadata>
+               <f:viewParam id="userId" name="profile" value="#{shareController.shareeUserId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
+                       <f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+                       <f:validator for="userId" validatorId="UserIdValidator" />
+               </f:viewParam>
+       </f:metadata>
+
        <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>