Please cherry-pick:

- using gender for Mr./Mrs. is plain wrong, now "personal title" and "academic
  title" are being used.

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
index 84111d94e322c8cb515f81a54325ea05ed8e1943..80fff898ac94a15270bf3cf6ca84bbe5ed6e90c1 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
@@ -36,7 +36,7 @@ import org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
 import org.mxchange.jcontacts.contact.UserContact;
-import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
 import org.mxchange.jcontacts.contact.utils.ContactUtils;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
@@ -156,11 +156,6 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
         */
        private String firstName;
 
-       /**
-        * Gender instance
-        */
-       private Gender gender;
-
        /**
         * House number
         */
@@ -221,15 +216,20 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
         */
        private MobileProvider mobileProvider;
 
+       /**
+        * PersonalTitle instance
+        */
+       private PersonalTitle personalTitle;
+
        /**
         * Street
         */
        private String street;
 
        /**
-        * Title
+        * Academic academicTitle
         */
-       private String title;
+       private String academicTitle;
 
        /**
         * An event fired when the administrator has updated contact data
@@ -254,9 +254,9 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
        @Override
        public String addContact () {
                // Are all minimum fields set?
-               if (this.getGender() == null) {
+               if (this.getPersonalTitle() == null) {
                        // Throw NPE
-                       throw new NullPointerException("gender is null"); //NOI18N
+                       throw new NullPointerException("personalTitle is null"); //NOI18N
                } else if (this.getFirstName() == null) {
                        // Throw NPE
                        throw new NullPointerException("firstName is null"); //NOI18N
@@ -321,7 +321,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
 
                // Set all fields: contact
                this.setContactId(contact.getContactId());
-               this.setTitle(contact.getContactTitle());
+               this.setAcademicTitle(contact.getContactTitle());
                this.setBirthday(contact.getContactBirthday());
                this.setCity(contact.getContactCity());
                this.setComment(contact.getContactComment());
@@ -329,7 +329,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                this.setEmailAddress(contact.getContactEmailAddress());
                this.setFamilyName(contact.getContactFamilyName());
                this.setFirstName(contact.getContactFirstName());
-               this.setGender(contact.getContactGender());
+               this.setPersonalTitle(contact.getContactPersonalTitle());
                this.setHouseNumber(contact.getContactHouseNumber());
                this.setHouseNumberExtension(contact.getContactHouseNumberExtension());
                this.setStreet(contact.getContactStreet());
@@ -368,9 +368,9 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
        @Override
        public Contact createContactInstance () {
                // Are all minimum fields set?
-               if (this.getGender() == null) {
+               if (this.getPersonalTitle() == null) {
                        // Throw NPE
-                       throw new NullPointerException("gender is null"); //NOI18N
+                       throw new NullPointerException("personalTitle is null"); //NOI18N
                } else if (this.getFirstName() == null) {
                        // Throw NPE
                        throw new NullPointerException("firstName is null"); //NOI18N
@@ -391,9 +391,10 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Create new instance
-               Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
+               Contact contact = new UserContact(this.getPersonalTitle(), this.getFirstName(), this.getFamilyName());
 
                // Add all others
+               contact.setContactTitle(this.getAcademicTitle());
                contact.setContactBirthday(this.getBirthday());
                contact.setContactStreet(this.getStreet());
                contact.setContactHouseNumber(this.getHouseNumber());
@@ -674,16 +675,6 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                this.firstName = firstName;
        }
 
-       @Override
-       public Gender getGender () {
-               return this.gender;
-       }
-
-       @Override
-       public void setGender (final Gender gender) {
-               this.gender = gender;
-       }
-
        @Override
        public Short getHouseNumber () {
                return this.houseNumber;
@@ -774,6 +765,16 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                this.mobileProvider = mobileProvider;
        }
 
+       @Override
+       public PersonalTitle getPersonalTitle () {
+               return this.personalTitle;
+       }
+
+       @Override
+       public void setPersonalTitle (final PersonalTitle personalTitle) {
+               this.personalTitle = personalTitle;
+       }
+
        @Override
        public String getStreet () {
                return this.street;
@@ -785,13 +786,13 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
        }
 
        @Override
-       public String getTitle () {
-               return this.title;
+       public String getAcademicTitle () {
+               return this.academicTitle;
        }
 
        @Override
-       public void setTitle (final String title) {
-               this.title = title;
+       public void setAcademicTitle (final String academicTitle) {
+               this.academicTitle = academicTitle;
        }
 
        @Override
@@ -826,9 +827,9 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
        }
 
        @Override
-       public boolean isGenderRequired () {
+       public boolean isPersonalTitleRequired () {
                // Get context parameter
-               String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_admin_gender_enabled"); //NOI18N
+               String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_admin_personal_title_enabled"); //NOI18N
 
                // Is it set?
                boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
@@ -843,7 +844,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
        private void clear () {
                // Clear all data
                // - personal data
-               this.setTitle(null);
+               this.setAcademicTitle(null);
                this.setFirstName(null);
                this.setFamilyName(null);
                this.setStreet(null);
@@ -919,8 +920,8 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro
                }
 
                // Update all fields
-               contact.setContactGender(this.getGender());
-               contact.setContactTitle(this.getTitle());
+               contact.setContactPersonalTitle(this.getPersonalTitle());
+               contact.setContactTitle(this.getAcademicTitle());
                contact.setContactFirstName(this.getFirstName());
                contact.setContactFamilyName(this.getFamilyName());
                contact.setContactStreet(this.getStreet());

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java
index 57bbffc9d8101e7b93e295809fbba0f65f4f21be..8a390532192f1588be3b0d927b3e1a6608200a29 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java
@@ -19,7 +19,7 @@ package org.mxchange.addressbook.beans.contact;
 import java.io.Serializable;
 import java.util.Date;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
@@ -286,18 +286,18 @@ public interface AddressbookAdminContactWebRequestController extends Serializabl
        void setFirstName (final String firstName);
 
        /**
-        * Gender of the contact
+        * Getter for personal title
         * <p>
-        * @return the gender
+        * @return Personal title
         */
-       Gender getGender ();
+       PersonalTitle getPersonalTitle ();
 
        /**
-        * Gender of the contact
+        * Setter for personal title
         * <p>
-        * @param gender the gender to set
+        * @param personalTitle Personal title
         */
-       void setGender (final Gender gender);
+       void setPersonalTitle (final PersonalTitle personalTitle);
 
        /**
         * House number
@@ -385,18 +385,18 @@ public interface AddressbookAdminContactWebRequestController extends Serializabl
        void setStreet (final String street);
 
        /**
-        * Getter for title
+        * Getter for academic title
         * <p>
-        * @return title
+        * @return Academic title
         */
-       String getTitle ();
+       String getAcademicTitle ();
 
        /**
-        * Setter for title
+        * Setter for academic title
         * <p>
-        * @param title Title
+        * @param academicTitle Academic title
         */
-       void setTitle (final String title);
+       void setAcademicTitle (final String academicTitle);
 
        /**
         * ZIP code
@@ -449,11 +449,11 @@ public interface AddressbookAdminContactWebRequestController extends Serializabl
        String generateMobileNumber (final DialableMobileNumber mobileNumber);
 
        /**
-        * Checks/returns whether the gender/salutation is required for this
+        * Checks/returns whether the personal title (Mr./Mrs.) is required for this
         * controller.
         * <p>
-        * @return Whether gender is required
+        * @return Whether personal title is required
         */
-       boolean isGenderRequired ();
+       boolean isPersonalTitleRequired ();
 
 }

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
index 2e5fd812ee73881d2c6e3afcd0a1515c0919fa16..627db6cbda17807768b5afa7000d4eec710b5bfe 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java
@@ -38,7 +38,7 @@ import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
 import org.mxchange.jcontacts.contact.UserContact;
-import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
 import org.mxchange.jcontacts.contact.utils.ContactUtils;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
@@ -73,6 +73,11 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
         */
        private static final long serialVersionUID = 542_145_347_916L;
 
+       /**
+        * Academic academicTitle
+        */
+       private String academicTitle;
+
        /**
         * Birth day
         */
@@ -143,11 +148,6 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
         */
        private String firstName;
 
-       /**
-        * Gender instance
-        */
-       private Gender gender;
-
        /**
         * House number
         */
@@ -198,6 +198,11 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
         */
        private MobileProvider mobileProvider;
 
+       /**
+        * Personal academicTitle
+        */
+       private PersonalTitle personalTitle;
+
        /**
         * A list of all selectable contacts
         */
@@ -208,11 +213,6 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
         */
        private String street;
 
-       /**
-        * Title
-        */
-       private String title;
-
        /**
         * Regular user controller
         */
@@ -470,7 +470,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
                DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Create new contact
-               Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
+               Contact contact = new UserContact(this.getPersonalTitle(), this.getFirstName(), this.getFamilyName());
                contact.setContactStreet(this.getStreet());
                contact.setContactHouseNumber(this.getHouseNumber());
                contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
@@ -566,7 +566,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
                assert (contact.getContactId() > 0) : MessageFormat.format("Instance userLoginController.userContact.contactId={0} is invalid", contact.getContactId()); //NOI18N
 
                // Update all fields
-               contact.setContactGender(this.getGender());
+               contact.setContactPersonalTitle(this.getPersonalTitle());
                contact.setContactFirstName(this.getFirstName());
                contact.setContactFamilyName(this.getFamilyName());
                contact.setContactStreet(this.getStreet());
@@ -592,6 +592,16 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
                return "contact_data_saved"; //NOI18N
        }
 
+       @Override
+       public String getAcademicTitle () {
+               return this.academicTitle;
+       }
+
+       @Override
+       public void setAcademicTitle (final String academicTitle) {
+               this.academicTitle = academicTitle;
+       }
+
        @Override
        @SuppressWarnings ("ReturnOfDateField")
        public Date getBirthday () {
@@ -715,16 +725,6 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
                this.firstName = firstName;
        }
 
-       @Override
-       public Gender getGender () {
-               return this.gender;
-       }
-
-       @Override
-       public void setGender (final Gender gender) {
-               this.gender = gender;
-       }
-
        @Override
        public Short getHouseNumber () {
                return this.houseNumber;
@@ -796,23 +796,23 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
        }
 
        @Override
-       public String getStreet () {
-               return this.street;
+       public PersonalTitle getPersonalTitle () {
+               return this.personalTitle;
        }
 
        @Override
-       public void setStreet (final String street) {
-               this.street = street;
+       public void setPersonalTitle (final PersonalTitle personalTitle) {
+               this.personalTitle = personalTitle;
        }
 
        @Override
-       public String getTitle () {
-               return this.title;
+       public String getStreet () {
+               return this.street;
        }
 
        @Override
-       public void setTitle (final String title) {
-               this.title = title;
+       public void setStreet (final String street) {
+               this.street = street;
        }
 
        @Override
@@ -903,7 +903,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
 
        @Override
        public boolean isRequiredChangePersonalDataSet () {
-               return ((this.getGender() != null) &&
+               return ((this.getPersonalTitle() != null) &&
                                (this.getFirstName() != null) &&
                                (this.getFamilyName() != null) &&
                                (this.getStreet() != null) &&
@@ -914,7 +914,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
 
        @Override
        public boolean isRequiredPersonalDataSet () {
-               return ((this.getGender() != null) &&
+               return ((this.getPersonalTitle() != null) &&
                                (this.getFirstName() != null) &&
                                (this.getFamilyName() != null) &&
                                (this.getStreet() != null) &&
@@ -1009,8 +1009,8 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
        private void clear () {
                // Clear all data
                // - personal data
-               this.setGender(null);
-               this.setTitle(null);
+               this.setPersonalTitle(null);
+               this.setAcademicTitle(null);
                this.setFirstName(null);
                this.setFamilyName(null);
                this.setStreet(null);
@@ -1057,8 +1057,8 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController
 
                // Copy all fields:
                // - base data
-               this.setGender(contact.getContactGender());
-               this.setTitle(contact.getContactTitle());
+               this.setPersonalTitle(contact.getContactPersonalTitle());
+               this.setAcademicTitle(contact.getContactTitle());
                this.setFirstName(contact.getContactFirstName());
                this.setFamilyName(contact.getContactFamilyName());
                this.setStreet(contact.getContactStreet());

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
index 36359c006878b209994a1f922a4edb19e8dac1a2..5199c5c8955960b044480f071450a59a00f2205e 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java
@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.List;
 import javax.ejb.Local;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
@@ -255,18 +255,18 @@ public interface AddressbookContactWebSessionController extends Serializable {
        void setFirstName (final String firstName);
 
        /**
-        * Gender of the contact
+        * Getter for personal title
         * <p>
-        * @return the gender
+        * @return Personal title
         */
-       Gender getGender ();
+       PersonalTitle getPersonalTitle ();
 
        /**
-        * Gender of the contact
+        * Setter for personal title
         * <p>
-        * @param gender the gender to set
+        * @param personalTitle Personal title
         */
-       void setGender (final Gender gender);
+       void setPersonalTitle (final PersonalTitle personalTitle);
 
        /**
         * House number
@@ -354,18 +354,18 @@ public interface AddressbookContactWebSessionController extends Serializable {
        void setStreet (final String street);
 
        /**
-        * Title
+        * Getter for academic title
         * <p>
-        * @return the title
+        * @return Academic title
         */
-       String getTitle ();
+       String getAcademicTitle ();
 
        /**
-        * Title
+        * Setter for academic title
         * <p>
-        * @param title the title to set
+        * @param academicTitle Academic title
         */
-       void setTitle (final String title);
+       void setAcademicTitle (final String academicTitle);
 
        /**
         * ZIP code

diff --git a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java
index bf7926414a87009e8d25adda69e9a99471bd2cd9..2e363f68b7a7e8301daa1a905835840c42bcc510 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java
+++ b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java
@@ -21,11 +21,11 @@ import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 import org.mxchange.addressbook.beans.BaseAddressbookController;
-import org.mxchange.jcontacts.contact.gender.Gender;
-import org.mxchange.jcontacts.contact.gender.GenderUtils;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
+import org.mxchange.jcontacts.contact.title.TitleUtils;
 
 /**
- * A gender bean
+ * A gender and title bean
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
@@ -47,15 +47,15 @@ public class AddressbookGenderWebApplicationBean extends BaseAddressbookControll
        }
 
        @Override
-       public Gender[] getAllGenders () {
+       public PersonalTitle[] getAllGenders () {
                // Return it
-               return Gender.values();
+               return PersonalTitle.values();
        }
 
        @Override
-       public List<Gender> getSelectableGenders () {
+       public List<PersonalTitle> getSelectableGenders () {
                // Init array
-               List<Gender> genders = GenderUtils.selectableGenders();
+               List<PersonalTitle> genders = TitleUtils.allPersonalTitlesAsList();
 
                // Return it
                return genders;

diff --git a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java
index 0d9b1633555f34eda30f91b1e64262379599a6b9..ec7ee4eec9899004e52fb778012b48c604360e66 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java
+++ b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java
@@ -18,10 +18,10 @@ package org.mxchange.addressbook.beans.gender;
 
 import java.io.Serializable;
 import java.util.List;
-import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
 
 /**
- * An interface for data beans
+ * An interface for gender and title (static data) beans
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
@@ -32,13 +32,13 @@ public interface AddressbookGenderWebApplicationController extends Serializable
         * <p>
         * @return All genders as array
         */
-       Gender[] getAllGenders ();
+       PersonalTitle[] getAllGenders ();
 
        /**
         * Getter for only selectable genders as array, UNKNOWN is not selectable
         * <p>
         * @return All genders as array
         */
-       List<Gender> getSelectableGenders ();
+       List<PersonalTitle> getSelectableGenders ();
 
 }

diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java
index 4e5ca8e347414d0e4d26e03e76d122669d5a544c..de844d77f27b1006ce7e4ce5e5049d7776203f0b 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java
+++ b/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java
@@ -27,9 +27,9 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 public interface AddressbookProfileModeWebApplicationController extends Serializable {
 
        /**
-        * Getter for all genders as array
+        * Getter for all profile modes as array
         * <p>
-        * @return All genders as array
+        * @return All profile modes as array
         */
        ProfileMode[] getAllProfileModes ();
 }

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
index 5383b24e2b58bb6310e5569c32ad5a5186ab55f7..8f2a1663c627e6d235f9e0d8078199cf41f4d554 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
@@ -212,7 +212,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle
                        throw new IllegalArgumentException("userName is null"); //NOI18N
                } else if (this.beanHelper.getContact() == null) {
                        // No contact instance set, so test required fields: gender, first name and family name
-                       if (this.contactController.getGender() == null) {
+                       if (this.contactController.getPersonalTitle() == null) {
                                // Throw NPE again
                                throw new NullPointerException("contactController.gender is null"); //NOI18N
                        } else if (this.contactController.getFirstName() == null) {

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 45e4d86400c97a84c04c54d78572ed6af41f0248..8b32010ba1500d698a0ccc1148fc7bb6b647cb2f 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -13,9 +13,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Unknown gender
-GENDER_MALE=Herr
-GENDER_FEMALE=Frau
+PERSONAL_TITLE_MALE=Herr
+PERSONAL_TITLE_FEMALE=Frau
 CHOICE_YES=Ja
 CHOICE_NO=Nein
 PAGE_TITLE_INDEX_WELCOME=Willkommen!
@@ -59,7 +58,7 @@ PRIVACY_TERMS_LEGEND=Rechtliches:
 PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen.
 TERMS_NOT_ACCEPTED_MESSAGE=Bitte den AGBs zustimmen.
 PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer an.
-PERSONAL_DATA_GENDER=Anrede:
+PERSONAL_DATA_PERSONAL_TITLE=Anrede:
 PERSONAL_DATA_FIRST_NAME=Vorname:
 PERSONAL_DATA_FAMILY_NAME=Nachname:
 PERSONAL_DATA_STREET=Stra\u00dfe:
@@ -298,7 +297,7 @@ ADMIN_ADD_USER_TITLE=Neues Benutzeraccount anlegen
 ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen, sowie Benutzernamen und Email-Adresse ein.
 ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Pers\u00f6nliche Daten des Benutzers:
 ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Geben Sie hier die pers\u00f6nlichen Daten des neuen Benutzers ein.
-ADMIN_PERSONAL_DATA_GENDER=Anrede ausw\u00e4hlen:
+ADMIN_PERSONAL_DATA_PERSONAL_TITLE=Anrede ausw\u00e4hlen:
 ADMIN_PERSONAL_DATA_FIRST_NAME=Vorname:
 ADMIN_PERSONAL_DATA_FAMILY_NAME=Familienname:
 ADMIN_PERSONAL_DATA_STREET=Strassenname:
@@ -377,7 +376,7 @@ ADMIN_USER_DATA_ENTER_PASSWORD=Passwort eingeben:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Passwort wiederholen:
 ADMIN_LIST_USER_ID=Benutzer-Id:
 ADMIN_LIST_USER_NAME=Benutzername:
-ADMIN_LIST_USER_GENDER=Anrede:
+ADMIN_LIST_USER_PERSONAL_TITLE=Anrede:
 ADMIN_LIST_USER_FIRST_NAME=Vorname:
 ADMIN_LIST_USER_FAMILY_NAME=Nachname:
 ADMIN_LIST_USER_ACCOUNT_STATUS=Account-Status:
@@ -407,8 +406,8 @@ ADMIN_USER_LAST_LOCKED_REASON=Letzter Sperrgrund:
 ADMIN_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt:
 ADMIN_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert:
 ADMIN_CONTACT_IS_OWN_CONTACT=Eigenes Account:
-ADMIN_CONTACT_GENDER=Anrede:
-ADMIN_CONTACT_TITLE=Titel:
+ADMIN_CONTACT_PERSONAL_TITLE=Anrede:
+ADMIN_CONTACT_ACADEMIC_TITLE=Titel:
 ADMIN_CONTACT_FIRST_NAME=Vorname:
 ADMIN_CONTACT_FAMILY_NAME=Nachname:
 ADMIN_CONTACT_STREET=Strasse:
@@ -555,8 +554,8 @@ PERSONAL_DATA_BIRTHDAY=Geburtsdatum (tt.mm.jjjj):
 BIRTHDAY_PATTERN=dd.MM.yyyy
 INVALID_BIRTHDAY=Ung\u00fcltiges Geburtsdatum eingegeben.
 ADMIN_EXPORT_CONTACT_ID=Kontaktdaten-Id
-ADMIN_EXPORT_CONTACT_GENDER=Anrede
-ADMIN_EXPORT_CONTACT_TITLE=Titel
+ADMIN_EXPORT_CONTACT_PERSONAL_TITLE=Anrede
+ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE=Titel
 ADMIN_EXPORT_CONTACT_FIRST_NAME=Vorname
 ADMIN_EXPORT_CONTACT_FAMILY_NAME=Nachname
 ADMIN_EXPORT_CONTACT_STREET=Stra\u00dfe
@@ -577,7 +576,7 @@ GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED=Bitte geben Sie die Hausnummer ohne Zus
 GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED=Bitte geben Sie Ihre Postleitzahl ein.
 GUEST_CONTACT_DATA_CITY_REQUIRED=Bitte geben Sie Ihren Wohnort ein.
 GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Bitte geben Sie Ihr Geburtsdatum ein.
-FIELD_GENDER_REQUIRED=Bitte w\u00e4hlen Sie eine Anrede aus.
+FIELD_PERSONAL_TITLE_REQUIRED=Bitte w\u00e4hlen Sie eine Anrede aus.
 ADMIN_PERSONAL_DATA_TITLE=Titel:
 LINK_ADMIN_EXPORT_USER=Benutzerdaten exportieren
 LINK_ADMIN_EXPORT_USER_TITLE=Exportiert alle Benutzerdaten (und Kontaktdaten).

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 972648ca0d960ecc2ebc5457c5ae3bb35583d568..ef9100a1b385fe4fbd63026fd5a8bf212742b1ee 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -13,9 +13,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Unknown gender
-GENDER_MALE=Mr.
-GENDER_FEMALE=Mrs.
+PERSONAL_TITLE_MALE=Mr.
+PERSONAL_TITLE_FEMALE=Mrs.
 CHOICE_YES=Yes
 CHOICE_NO=No
 PAGE_TITLE_INDEX_WELCOME=Welcome!
@@ -59,7 +58,7 @@ PRIVACY_TERMS_LEGEND=Terms & privacy policy:
 PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Please accept our privacy policy.
 TERMS_NOT_ACCEPTED_MESSAGE=Please accept Terms&Conditions.
 PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least your name, address and phone number.
-PERSONAL_DATA_GENDER=Salutation:
+PERSONAL_DATA_PERSONAL_TITLE=Salutation:
 PERSONAL_DATA_FIRST_NAME=First name:
 PERSONAL_DATA_FAMILY_NAME=Family name:
 PERSONAL_DATA_STREET=Street:
@@ -277,10 +276,10 @@ PAGE_TITLE_ADMIN_ADD_USER=Add new user account
 CONTENT_TITLE_ADMIN_ADD_USER=Add new user account:
 TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users
 ADMIN_ADD_USER_TITLE=Create a new user account
-ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name, family name, user name and email address.
+ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least title, first name, family name, user name and email address.
 ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Personal data of the user:
 ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Here you can enter the personal data of the new user.
-ADMIN_PERSONAL_DATA_GENDER=Select gender:
+ADMIN_PERSONAL_DATA_PERSONAL_TITLE=Select title:
 ADMIN_PERSONAL_DATA_FIRST_NAME=First name:
 ADMIN_PERSONAL_DATA_FAMILY_NAME=Family name:
 ADMIN_PERSONAL_DATA_STREET=Name of street:
@@ -359,7 +358,7 @@ ADMIN_USER_DATA_ENTER_PASSWORD=Enter password:
 ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password:
 ADMIN_LIST_USER_ID=User id:
 ADMIN_LIST_USER_NAME=User name:
-ADMIN_LIST_USER_GENDER=Gender:
+ADMIN_LIST_USER_PERSONAL_TITLE=Gender:
 ADMIN_LIST_USER_FIRST_NAME=First name:
 ADMIN_LIST_USER_FAMILY_NAME=Family name:
 ADMIN_LIST_USER_ACCOUNT_STATUS=Account status:
@@ -386,8 +385,8 @@ ADMIN_USER_LAST_LOCKED_REASON=Last lock reason:
 ADMIN_USER_CONTACT_CREATED=When contact data created:
 ADMIN_USER_CONTACT_UPDATED=When contact data updated:
 ADMIN_CONTACT_IS_OWN_CONTACT=Own account:
-ADMIN_CONTACT_GENDER=Gender:
-ADMIN_CONTACT_TITLE=Title:
+ADMIN_CONTACT_PERSONAL_TITLE=Gender:
+ADMIN_CONTACT_ACADEMIC_TITLE=Title:
 ADMIN_CONTACT_FIRST_NAME=First name:
 ADMIN_CONTACT_FAMILY_NAME=Family name:
 ADMIN_CONTACT_STREET=Street:
@@ -476,7 +475,7 @@ CONTENT_TITLE_ADMIN_DELETE_CONTACT=Delete contact data:
 ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable
 BUTTON_ADMIN_DELETE_CONTACT=Delete contact data
 ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record.
-ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name and family name.
+ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least title, first name and family name.
 LINK_ADMIN_LIST_CONTACT=List contact data
 LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
 CONTACT_IS_USER=Is a user
@@ -549,8 +548,8 @@ PERSONAL_DATA_BIRTHDAY=Birthday (mm-dd-yyyy):
 BIRTHDAY_PATTERN=MM-dd-yyyy
 INVALID_BIRTHDAY=Wrong birthday entered.
 ADMIN_EXPORT_CONTACT_ID=Contact data id
-ADMIN_EXPORT_CONTACT_GENDER=Gender
-ADMIN_EXPORT_CONTACT_TITLE=Title
+ADMIN_EXPORT_CONTACT_PERSONAL_TITLE=Gender
+ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE=Title
 ADMIN_EXPORT_CONTACT_FIRST_NAME=First name
 ADMIN_EXPORT_CONTACT_FAMILY_NAME=Family name
 ADMIN_EXPORT_CONTACT_STREET=Street
@@ -571,7 +570,7 @@ GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED=Please enter your house number without
 GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED=Please enter your ZIP code.
 GUEST_CONTACT_DATA_CITY_REQUIRED=Please enter your city.
 GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Please enter your birthday.
-FIELD_GENDER_REQUIRED=Please select a salutation.
+FIELD_PERSONAL_TITLE_REQUIRED=Please select a salutation.
 ADMIN_PERSONAL_DATA_TITLE=Title:
 LINK_ADMIN_EXPORT_USER=Export user data
 LINK_ADMIN_EXPORT_USER_TITLE=Exports all user and contact data.

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
deleted file mode 100644 (file)
index 0cf4cfd..0000000
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">
-               <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
-                               <f:param value="#{beanHelper.contact.contactId}" />
-                       </h:outputFormat>
-               </f:facet>
-
-               <h:column>
-                       <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-                       <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
-
-                       <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.contact.contactCreated.time}">
-                               <f:convertDateTime for="contactCreated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
-
-                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.contact.contactUpdated.time}">
-                               <f:convertDateTime for="contactUpdated" type="both" />
-                       </h:outputText>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
-
-                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.contact.isOwnContact()}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
-
-                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
-
-                       <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
-
-                       <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.contact.contactStreet}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
-
-                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumber}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
-
-                       <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
-
-                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.contact.contactZipCode}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
-
-                       <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.contact.contactCity}" />
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
-                               <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-                       </h:outputLink>
-               </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
-
-                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.contact.contactBirthday.time}">
-                               <f:convertDateTime for="contactBirthday" type="date" />
-                       </h:outputText>
-               </h:column>
-       </h:panelGrid>
-</ui:composition>

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
index 762032166ea8aa108e25a5674317f06b4fcd8d97..1bfcb98a8e16443f35517e6e193bea413e30a88a 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl
@@ -35,13 +35,13 @@
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-               <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
                <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
        </h:column>

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl
index 1d9960430646de7639077be2672e9cd8cb97d091..61e914a9f3aae0e549344847c5f5c3a1359eb48c 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl
@@ -8,13 +8,13 @@
 
 
        <h:column>
-               <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+               <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-               <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+               <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
        </h:column>
 
        <h:column>
-               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+               <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
                <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
        </h:column>

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
index 2ac7b2c55e32e0b2f9851e7a80ee78fde1f0853f..e4d35cb921fb88f716e9199df8c0d8ef981f77e8 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
@@ -13,9 +13,9 @@
                </f:facet>
 
                <h:column>
-                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
                </h:column>
 
                <h:column>

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 77695f023d9d0ef4e7921078816940c3f7f49f17..b8d0765ac0867738745cd61562177dbdc68c4158 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -13,11 +13,11 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="gender" value="#{msg.ADMIN_PERSONAL_DATA_GENDER}" />
+                                       <h:outputLabel for="personalTitle" value="#{msg.ADMIN_PERSONAL_DATA_PERSONAL_TITLE}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+                                       <ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
                                                <ui:param name="targetController" value="#{adminContactController}" />
                                        </ui:include>
                                </div>
@@ -26,7 +26,7 @@
                        </div>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <div class="table_row">
@@ -51,7 +51,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.title}" />
+                                       <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 2d9fc075db1eefa21798ff7bf7051bb7e0420fd5..e49330f5b83d9ca95a2022a7354ce009480c0782 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -18,11 +18,11 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
+                                       <h:outputLabel for="personalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+                                       <ui:include src="/WEB-INF/templates/generic/personal_title_selection_box.tpl">
                                                <ui:param  name="targetController" value="#{contactController}" />
                                        </ui:include>
                                </div>
@@ -30,7 +30,7 @@
                                <div class="clear"></div>
 
                                <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                       <h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
                        </div>
 

diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
deleted file mode 100644 (file)
index 849dea0..0000000
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <ui:fragment rendered="#{empty targetController}">
-               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
-                       <ui:param name="styleClass" value="errors" />
-               </ui:include>
-       </ui:fragment>
-
-       <ui:fragment rendered="#{not empty targetController}">
-               <h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_gender'))}" requiredMessage="#{msg.FIELD_GENDER_REQUIRED}">
-                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-                       <f:selectItems value="#{genderController.selectableGenders}" var="gender" itemValue="#{gender}" itemLabel="#{msg[gender.messageKey]}" />
-               </h:selectOneMenu>
-       </ui:fragment>
-</ui:composition>

diff --git a/web/WEB-INF/templates/generic/personal_title_selection_box.tpl b/web/WEB-INF/templates/generic/personal_title_selection_box.tpl
new file mode 100644 (file)
index 0000000..7cd411b
--- /dev/null
+++ b/web/WEB-INF/templates/generic/personal_title_selection_box.tpl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <ui:fragment rendered="#{empty targetController}">
+               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+                       <ui:param name="styleClass" value="errors" />
+               </ui:include>
+       </ui:fragment>
+
+       <ui:fragment rendered="#{not empty targetController}">
+               <h:selectOneMenu styleClass="select" id="personalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
+                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+                       <f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
+               </h:selectOneMenu>
+       </ui:fragment>
+</ui:composition>

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index dc49f8cd02f92efecce686f44a279fde6aef4e79..4ecbfa0a2283d5d71e8cfc17fec6d70e3fc8afe7 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -38,13 +38,13 @@
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <description>Wether the gender is required for using the general contact controller.</description>
-        <param-name>is_feature_general_gender_enabled</param-name>
+        <description>Wether the personal title is required for using the general contact controller.</description>
+        <param-name>is_feature_general_personal_title_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <description>Whether gender is required for administrative contact controller.</description>
-        <param-name>is_feature_admin_gender_enabled</param-name>
+        <description>Whether personal title is required for administrative contact controller.</description>
+        <param-name>is_feature_admin_personal_title_enabled</param-name>
         <param-value>false</param-value>
     </context-param>
     <context-param>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index d9debf2fe23af581ef7b9f3f87adb5400d963f1e..f7528344c300db2b620a496dca30544b51a74372 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -35,7 +35,7 @@
                        <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
+                                               <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_ACADEMIC_TITLE}">
                                                        <f:param value="#{beanHelper.contact.contactId}" />
                                                </h:outputFormat>
                                        </div>

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 0f9c851b1ab71d8feee780d8dd93b39ad7aac825..ed56e153a6488c69b5e804add2b98079d7b96903 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -35,7 +35,7 @@
                        <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                                <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
-                                               <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
+                                               <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_ACADEMIC_TITLE}">
                                                        <f:param value="#{beanHelper.contact.contactId}" />
                                                </h:outputFormat>
                                        </div>

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 7754d3d8962756ac994f6fb4fe936938479884ab..db0b88321acd42042f3b4e538b6b985b496e33c7 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -39,15 +39,15 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_GENDER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
                                                </f:facet>
 
-                                               <h:outputText value="#{msg[contact.contactGender.messageKey]}" />
+                                               <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                                        </p:column>
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_TITLE}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactTitle}" />

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index e508400748b7f73bf190e2fc578870ed1d69a7af..3521fde8b2aa3474f74501238808e0f2404b3eff 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -38,10 +38,10 @@
 
                                <h:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[contact.contactGender.messageKey]}" />
+                                       <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                                </h:column>
 
                                <h:column>
@@ -82,7 +82,7 @@
                        <h:form id="form_admin_add_contact">
                                <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
+                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_ACADEMIC_TITLE}" />
                                        </div>
 
                                        <div class="para">

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 1c2773d39bd2cc33826c5ca119fb58d9adf8a68b..2c5f755f9a6352a4907abd254014041fcd5cc732 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -44,13 +44,13 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.messageKey]}" />
+                                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
                                        <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
                                </h:column>

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index e14c2bc71976555dc1ea9ce15535f424250c2ff2..b36826bda1af08d017632754a14055967fec156b 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -44,13 +44,13 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.messageKey]}" />
+                                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
                                        <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
                                </h:column>

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 8332a7c1890b37857389e2fcc96e09f4dc650915..841bd93bed7c38c225199c68bdeca9abb2b141d8 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -44,13 +44,13 @@
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                       <h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-                                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.messageKey]}" />
+                                       <h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
                                        <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
                                </h:column>

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 84858cab771ebede30511820b96e0a4985ff4445..862dcc1d07af5a89f6e9e4a1f9271e84f3df4e0e 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -62,7 +62,7 @@
 
                                <h:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
+                                               <h:outputText value="#{msg.ADMIN_LIST_USER_PERSONAL_TITLE}" />
                                        </f:facet>
 
                                        <h:outputText value="#{msg[userActivity.activityContactGender.messageKey]}" />

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 49638be8c2d56d0aaa5915ed8e59073e77a41554..407caadadd478f95e6cef091083b2a731691142e 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -56,15 +56,15 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_GENDER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_PERSONAL_TITLE}" />
                                                </f:facet>
 
-                                               <h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
+                                               <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
                                        </p:column>
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_TITLE}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE}" />
                                                </f:facet>
 
                                                <h:outputText value="#{user.userContact.contactTitle}" />

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 511a03ae4605f14f2c5c18341c9e793e3d838e8c..f22a1a5619b42d3106f44205ac5c60e271ab5e1b 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -48,10 +48,10 @@
 
                                <h:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
+                                       <h:outputText value="#{msg[user.userContact.contactPersonalTitle.messageKey]}" />
                                </h:column>
 
                                <h:column>
@@ -118,7 +118,7 @@
                                                                <div class="table_right_medium">
                                                                        <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
                                                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                                                               <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+                                                                               <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                        </h:selectOneMenu>
                                                                </div>
 

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 74860144bb996c9caa178a38f03b668f53593ec2..b39945f4f7a7376445c8e2d8d83300073ad6745a 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html
        lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -43,11 +42,11 @@
 
                                        <div class="para">
                                                <div>
-                                                       <h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
+                                                       <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                                </div>
 
                                                <div>
-                                                       <h:outputFormat id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+                                                       <h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                                </div>
                                        </div>
 

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index d0cde138fc105d3d58d05ff711c296566f61826c..b7c91b4aeae55e48fddf230c898621d9cc05bfb9 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -55,11 +55,11 @@
 
                                        <div class="para">
                                                <div class="table_data_label">
-                                                       <h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
+                                                       <h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
                                                </div>
 
                                                <div class="table_data_field">
-                                                       <h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+                                                       <h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                                </div>
                                        </div>
 

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index f394d378bc16880b919d9c58bd216f2b756426c4..40adbfdf71bb1432be9f5d57d75e764989ffedac 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -32,7 +32,7 @@
 
                                        <div class="table_row">
                                                <h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
-                                                       <f:param value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+                                                       <f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
                                                        <f:param value="#{beanHelper.user.userContact.contactFirstName}" />
                                                        <f:param value="#{beanHelper.user.userContact.contactFamilyName}" />
                                                </h:outputFormat>