]> git.mxchange.org Git - pizzaservice-war.git/blobdiff - src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
Please cherry-pick:
[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / beans / contact / PizzaContactWebSessionBean.java
index 0660eb0b755aea538d1405f2654cea742ef80269..5c01b27eddb99915bf6c70e763a6b401f39ff3da 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Haeder
+ * Copyright (C) 2016, 2017 Roland Häder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -20,6 +20,7 @@ import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.PostConstruct;
@@ -33,35 +34,35 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
+import org.mxchange.jcontacts.contact.ContactUtils;
 import org.mxchange.jcontacts.contact.UserContact;
-import org.mxchange.jcontacts.contact.gender.Gender;
-import org.mxchange.jcontacts.contact.utils.ContactUtils;
-import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
-import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
+import org.mxchange.jcontacts.contact.title.PersonalTitle;
+import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
-import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.phonenumbers.mobile.MobileNumber;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
-import org.mxchange.jusercore.events.login.UserLoggedInEvent;
-import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
-import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent;
-import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
+import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.juserlogincore.events.confirmation.ObservableUserConfirmedAccountEvent;
+import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent;
+import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException;
 import org.mxchange.pizzaapplication.beans.BasePizzaController;
-import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController;
 import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController;
+import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController;
 
 /**
  * A general contact bean (controller)
  * <p>
- * @author Roland Haeder<roland@mxchange.org>
+ * @author Roland Häder<roland@mxchange.org>
  */
 @Named ("contactController")
 @SessionScoped
@@ -73,19 +74,14 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        private static final long serialVersionUID = 542_145_347_916L;
 
        /**
-        * Birth day
+        * Academic academicTitle
         */
-       private Date birthday;
+       private String academicTitle;
 
        /**
-        * Cellphone number's carrier
-        */
-       private MobileProvider cellphoneCarrier;
-
-       /**
-        * Cellphone number
+        * Birth day
         */
-       private Long cellphoneNumber;
+       private Date birthday;
 
        /**
         * City
@@ -100,12 +96,12 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        /**
         * Remote contact bean
         */
-       private final ContactSessionBeanRemote contactBean;
+       private ContactSessionBeanRemote contactBean;
 
        /**
         * Contact list
         */
-       private List<Contact> contactList;
+       private final List<Contact> contactList;
 
        /**
         * Country instance
@@ -120,7 +116,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        /**
         * Email address list
         */
-       private List<String> emailAddressList;
+       private final List<String> emailAddressList;
 
        /**
         * Email address repeated
@@ -152,11 +148,6 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
         */
        private String firstName;
 
-       /**
-        * Gender instance
-        */
-       private Gender gender;
-
        /**
         * House number
         */
@@ -167,11 +158,6 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
         */
        private String houseNumberExtension;
 
-       /**
-        * Whether a cellphone entry has been unlinked
-        */
-       private boolean isCellphoneUnlinked;
-
        /**
         * Whether a fax entry has been unlinked
         */
@@ -182,20 +168,40 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
         */
        private boolean isLandLineUnlinked;
 
+       /**
+        * Whether a mobile entry has been unlinked
+        */
+       private boolean isMobileUnlinked;
+
        /**
         * Phone number area code
         */
-       private Integer phoneAreaCode;
+       private Integer landLineAreaCode;
 
        /**
         * Country instance for phone number
         */
-       private Country phoneCountry;
+       private Country landLineCountry;
 
        /**
         * Phone number
         */
-       private Long phoneNumber;
+       private Long landLineNumber;
+
+       /**
+        * Mobile number
+        */
+       private Long mobileNumber;
+
+       /**
+        * Mobile number's carrier
+        */
+       private MobileProvider mobileProvider;
+
+       /**
+        * Personal academicTitle
+        */
+       private PersonalTitle personalTitle;
 
        /**
         * A list of all selectable contacts
@@ -228,24 +234,21 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
         * Default constructor
         */
        public PizzaContactWebSessionBean () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
+               // Call super constructor
+               super();
 
-                       // Try to lookup
-                       this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N
-               } catch (final NamingException e) {
-                       // Throw again
-                       throw new FaceletException(e);
-               }
+               // Init lists/maps
+               this.contactList = new LinkedList<>();
+               this.emailAddressList = new LinkedList<>();
        }
 
-       @Override
-       public void afterAdminAddedContact (@Observes final AdminAddedContactEvent event) {
-               // Trace message
-               /* NOISY-DEBUG: */ System.out.println(MessageFormat.format("contactController.afterAdminAddedContact(): event={0} - CALLED!", event)); //NOI18N
-
+       /**
+        * Observes events being fired when an administrator has added a new
+        * contact.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminAddedContactEvent (@Observes final ObservableAdminAddedContactEvent event) {
                // The event must be valid
                if (null == event) {
                        // Throw NPE
@@ -265,14 +268,18 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.clear();
 
                // Call other method
-               this.contactList.add(event.getAddedContact());
+               this.uniqueAddContact(event.getAddedContact());
 
-               // Call other method
+               // Add to selectable contacts
                this.selectableContacts.add(event.getAddedContact());
        }
 
-       @Override
-       public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) {
+       /**
+        * Event observer for newly added users by administrator
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -292,8 +299,13 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.clear();
        }
 
-       @Override
-       public void afterAdminLinkedUser (@Observes final AdminLinkedUserEvent event) {
+       /**
+        * Observes events being fired when an administrator has linked a new user
+        * with existing contact data.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminLinkedUserEvent (@Observes final ObservableAdminLinkedUserEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -319,8 +331,12 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.clear();
        }
 
-       @Override
-       public void afterAdminUpdatedContactDataEvent (@Observes final AdminUpdatedContactEvent event) {
+       /**
+        * Event observer for updated contact data by administrators
+        * <p>
+        * @param event Updated contact data event
+        */
+       public void afterAdminUpdatedContactDataEvent (@Observes final ObservableAdminUpdatedContactEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -333,67 +349,22 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                        throw new NullPointerException("event.updatedContact.contactId is null"); //NOI18N
                } else if (event.getUpdatedContact().getContactId() < 1) {
                        // Not avalid id
-                       throw new IllegalArgumentException(MessageFormat.format("contactId of contact={0} is not valid: {1}", event.getUpdatedContact(), event.getUpdatedContact().getContactId())); //NOI18N
-               }
-
-               // Get iterator from list
-               Iterator<Contact> iterator = this.contactList.iterator();
-
-               // "Walk" through all entries
-               while (iterator.hasNext()) {
-                       // Get next element
-                       Contact next = iterator.next();
-
-                       // Is id number the same?
-                       if (Objects.equals(event.getUpdatedContact().getContactId(), next.getContactId())) {
-                               // Found entry, so remove it and abort
-                               this.contactList.remove(next);
-
-                               // Remove also email from list
-                               this.emailAddressList.remove(next.getContactEmailAddress());
-                               break;
-                       }
+                       throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getUpdatedContact(), event.getUpdatedContact().getContactId())); //NOI18N
                }
 
-               // Add contact to list
-               this.contactList.add(event.getUpdatedContact());
+               // Add contact instance only once
+               this.uniqueAddContact(event.getUpdatedContact());
 
                // Add email address to list
                this.emailAddressList.add(event.getUpdatedContact().getContactEmailAddress());
        }
 
-       @Override
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
-               // event should not be null
-               if (null == event) {
-                       // Throw NPE
-                       throw new NullPointerException("event is null"); //NOI18N
-               } else if (event.getRegisteredUser() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("event.registeredUser is null"); //NOI18N
-               } else if (event.getRegisteredUser().getUserId() == null) {
-                       // userId is null
-                       throw new NullPointerException("event.registeredUser.userId is null"); //NOI18N
-               } else if (event.getRegisteredUser().getUserId() < 1) {
-                       // Not avalid id
-                       throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getRegisteredUser(), event.getRegisteredUser().getUserId())); //NOI18N
-               }
-
-               // Get user instance
-               Contact registeredContact = event.getRegisteredUser().getUserContact();
-
-               // Copy all data from registered->user
-               this.copyContact(registeredContact);
-
-               // Add user name and email address
-               this.addUserNameEmailAddress(registeredContact);
-
-               // Clear all data
-               this.clear();
-       }
-
-       @Override
-       public void afterUserConfirmedAccount (@Observes final UserConfirmedAccountEvent event) {
+       /**
+        * Event observer when user confirmed account.
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterUserConfirmedAccount (@Observes final ObservableUserConfirmedAccountEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -409,31 +380,16 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                        throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getConfirmedUser(), event.getConfirmedUser().getUserId())); //NOI18N
                }
 
-               // "Cache" contact instance
-               Contact contact = event.getConfirmedUser().getUserContact();
-
-               // Get iterator from list
-               Iterator<Contact> iterator = this.contactList.iterator();
-
-               // "Walk" through all entries
-               while (iterator.hasNext()) {
-                       // Get next element
-                       Contact next = iterator.next();
-
-                       // Is id number the same?
-                       if (Objects.equals(contact.getContactId(), next.getContactId())) {
-                               // Found entry, so remove it and abort
-                               this.removeContact(next);
-                               break;
-                       }
-               }
-
-               // Add contact to list
-               this.contactList.add(contact);
+               // Add contact instance only once
+               this.uniqueAddContact(event.getConfirmedUser().getUserContact());
        }
 
-       @Override
-       public void afterUserLogin (@Observes final UserLoggedInEvent event) {
+       /**
+        * Event observer for logged-in user
+        * <p>
+        * @param event Event instance
+        */
+       public void afterUserLoginEvent (@Observes final ObservableUserLoggedInEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -453,33 +409,75 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.copyContact(event.getLoggedInUser().getUserContact());
        }
 
+       /**
+        * Event observer for new user registrations
+        * <p>
+        * @param event User registration event
+        */
+       public void afterUserRegistrationEvent (@Observes final ObservableUserRegisteredEvent event) {
+               // event should not be null
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getRegisteredUser() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.registeredUser is null"); //NOI18N
+               } else if (event.getRegisteredUser().getUserId() == null) {
+                       // userId is null
+                       throw new NullPointerException("event.registeredUser.userId is null"); //NOI18N
+               } else if (event.getRegisteredUser().getUserId() < 1) {
+                       // Not avalid id
+                       throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getRegisteredUser(), event.getRegisteredUser().getUserId())); //NOI18N
+               }
+
+               // Get user instance
+               Contact registeredContact = event.getRegisteredUser().getUserContact();
+
+               // Copy all data from registered->user
+               this.copyContact(registeredContact);
+
+               // Add contact instance only once
+               this.uniqueAddContact(registeredContact);
+
+               // Add user name and email address
+               this.addUserNameEmailAddress(registeredContact);
+
+               // Clear all data
+               this.clear();
+       }
+
        @Override
+       @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<Contact> allContacts () {
-               // Debug message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactController.allContacts: contactList.size()={0} - EXIT!", this.contactList.size()));
-
                // Return un-modified list
-               return Collections.unmodifiableList(this.contactList);
+               return this.contactList;
        }
 
        @Override
-       public Contact createContactInstance () {
-               // User message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createContactInstance: CALLED!", this.getClass().getSimpleName()));
+       public void clearEmailAddresses () {
+               // Clear both
+               this.setEmailAddress(null);
+               this.setEmailAddressRepeat(null);
+       }
 
+       @Override
+       public Contact createContactInstance () {
                // Is all required data set?
                if (!this.isRequiredPersonalDataSet()) {
                        // No, then abort here
                        throw new FaceletException(new IllegalArgumentException("Not all personal data is set, but createContactInstance() is called.")); //NOI18N
                }
 
+               // Required personal data must be set
+               assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
+
                // Generate phone number
-               DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
-               DialableCellphoneNumber cellphone = new CellphoneNumber(this.getCellphoneCarrier(), this.getCellphoneNumber());
+               DialableLandLineNumber phone = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
+               DialableMobileNumber mobile = new MobileNumber(this.getMobileProvider(), this.getMobileNumber());
                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());
@@ -490,11 +488,8 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                contact.setContactBirthday(this.getBirthday());
                contact.setContactComment(this.getComment());
 
-               // Debug message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createContactInstance: this.emailAddress={1}", this.getClass().getSimpleName(), this.getEmailAddress()));
-
                // Don't set null or wrong references
-               if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneCountry() instanceof Country) && (this.getPhoneAreaCode() != null) && (this.getPhoneNumber() != null) && (this.getPhoneAreaCode() > 0) && (this.getPhoneNumber() > 0)) {
+               if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) {
                        // Now the number must be given
                        if (phone.getPhoneAreaCode() == null) {
                                // Is null
@@ -536,23 +531,20 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                }
 
                // Is the provider set?
-               if ((cellphone instanceof DialableCellphoneNumber) && (this.getCellphoneCarrier() instanceof MobileProvider) && (this.getCellphoneNumber() != null) && (this.getCellphoneNumber() > 0)) {
+               if ((mobile instanceof DialableMobileNumber) && (this.getMobileProvider() instanceof MobileProvider) && (this.getMobileNumber() != null) && (this.getMobileNumber() > 0)) {
                        // Is the number set?
-                       if (cellphone.getPhoneNumber() == null) {
+                       if (mobile.getPhoneNumber() == null) {
                                // Is null
-                               throw new NullPointerException("cellphone.phoneNumber is null"); //NOI18N
-                       } else if (cellphone.getPhoneNumber() < 1) {
+                               throw new NullPointerException("mobile.phoneNumber is null"); //NOI18N
+                       } else if (mobile.getPhoneNumber() < 1) {
                                // Abort here
-                               throw new IllegalArgumentException("cellphone.phoneNumber is zero or below."); //NOI18N
+                               throw new IllegalArgumentException("mobile.phoneNumber is zero or below."); //NOI18N
                        }
 
-                       // Set cellphone number
-                       contact.setContactCellphoneNumber(cellphone);
+                       // Set mobile number
+                       contact.setContactMobileNumber(mobile);
                }
 
-               // Trace message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createContactInstance: contact={1} - EXIT!", this.getClass().getSimpleName(), contact));
-
                // Return it
                return contact;
        }
@@ -581,7 +573,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                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());
@@ -591,70 +583,92 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                contact.setContactCity(this.getCity());
                contact.setContactCountry(this.getCountry());
 
-               // Update contact's cellphone number
-               this.isCellphoneUnlinked = ContactUtils.updateCellPhoneNumber(contact, this.getCellphoneCarrier(), this.getCellphoneNumber());
+               // Update contact's mobile number
+               this.isMobileUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber());
 
                // Update contact's land-line number
-               this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
+               this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
 
                // Update contact's fax number
                this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Send it to the EJB
-               this.contactBean.updateContactData(contact, this.isCellphoneUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
+               this.contactBean.updateContactData(contact, this.isMobileUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
 
                // All fine
                return "contact_data_saved"; //NOI18N
        }
 
-       @Override
+       /**
+        * Getter for academic title
+        * <p>
+        * @return Academic title
+        */
+       public String getAcademicTitle () {
+               return this.academicTitle;
+       }
+
+       /**
+        * Setter for academic title
+        * <p>
+        * @param academicTitle Academic title
+        */
+       public void setAcademicTitle (final String academicTitle) {
+               this.academicTitle = academicTitle;
+       }
+
+       /**
+        * Getter for birth day
+        * <p>
+        * @return Birth day
+        */
        @SuppressWarnings ("ReturnOfDateField")
        public Date getBirthday () {
                return this.birthday;
        }
 
-       @Override
+       /**
+        * Setter for birth day
+        * <p>
+        * @param birthday Birth day
+        */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
        public void setBirthday (final Date birthday) {
                this.birthday = birthday;
        }
 
-       @Override
-       public MobileProvider getCellphoneCarrier () {
-               return this.cellphoneCarrier;
-       }
-
-       @Override
-       public void setCellphoneCarrier (final MobileProvider cellphoneCarrier) {
-               this.cellphoneCarrier = cellphoneCarrier;
-       }
-
-       @Override
-       public Long getCellphoneNumber () {
-               return this.cellphoneNumber;
-       }
-
-       @Override
-       public void setCellphoneNumber (Long cellphoneNumber) {
-               this.cellphoneNumber = cellphoneNumber;
-       }
-
-       @Override
+       /**
+        * Getter for city name
+        * <p>
+        * @return City name
+        */
        public String getCity () {
                return this.city;
        }
 
-       @Override
+       /**
+        * Setter for city name
+        * <p>
+        * @param city City name
+        */
        public void setCity (final String city) {
                this.city = city;
        }
 
-       @Override
+       /**
+        * Getter for comments
+        * <p>
+        * @return Comments
+        */
        public String getComment () {
                return this.comment;
        }
 
-       @Override
+       /**
+        * Setter for comment
+        * <p>
+        * @param comment Comments
+        */
        public void setComment (final String comment) {
                this.comment = comment;
        }
@@ -670,12 +684,20 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                throw new UnsupportedOperationException("Setting controller type is not supported."); //NOI18N
        }
 
-       @Override
+       /**
+        * Getter for country instance
+        * <p>
+        * @return Country instance
+        */
        public Country getCountry () {
                return this.country;
        }
 
-       @Override
+       /**
+        * Setter for country instance
+        * <p>
+        * @param country Country instance
+        */
        public void setCountry (final Country country) {
                this.country = country;
        }
@@ -685,173 +707,333 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                return this.emailAddress;
        }
 
-       @Override
+       /**
+        * Setter for email address
+        * <p>
+        * @param emailAddress Email address
+        */
        public void setEmailAddress (final String emailAddress) {
                this.emailAddress = emailAddress;
        }
 
-       @Override
+       /**
+        * Getter for email address, repeated
+        * <p>
+        * @return the emailAddress, repeated
+        */
        public String getEmailAddressRepeat () {
                return this.emailAddressRepeat;
        }
 
-       @Override
+       /**
+        * Setter for email address repeated
+        * <p>
+        * @param emailAddressRepeat the emailAddress to set
+        */
        public void setEmailAddressRepeat (final String emailAddressRepeat) {
                this.emailAddressRepeat = emailAddressRepeat;
        }
 
-       @Override
+       /**
+        * Family name
+        * <p>
+        * @return the familyName
+        */
        public String getFamilyName () {
                return this.familyName;
        }
 
-       @Override
+       /**
+        * Family name
+        * <p>
+        * @param familyName the familyName to set
+        */
        public void setFamilyName (final String familyName) {
                this.familyName = familyName;
        }
 
-       @Override
+       /**
+        * Getter for fax number's area code
+        * <p>
+        * @return Fax number's area code
+        */
        public Integer getFaxAreaCode () {
                return this.faxAreaCode;
        }
 
-       @Override
+       /**
+        * Setter for fax number's area code
+        * <p>
+        * @param faxAreaCode Fax number's area code
+        */
        public void setFaxAreaCode (final Integer faxAreaCode) {
                this.faxAreaCode = faxAreaCode;
        }
 
-       @Override
+       /**
+        * Getter for fax's country instance
+        * <p>
+        * @return Fax' country instance
+        */
        public Country getFaxCountry () {
                return this.faxCountry;
        }
 
-       @Override
+       /**
+        * Setter for fax's country instance
+        * <p>
+        * @param faxCountry Fax' country instance
+        */
        public void setFaxCountry (final Country faxCountry) {
                this.faxCountry = faxCountry;
        }
 
-       @Override
+       /**
+        * Getter for fax number
+        * <p>
+        * @return Fax number
+        */
        public Long getFaxNumber () {
                return this.faxNumber;
        }
 
-       @Override
+       /**
+        * Setter for fax number
+        * <p>
+        * @param faxNumber Fax number
+        */
        public void setFaxNumber (final Long faxNumber) {
                this.faxNumber = faxNumber;
        }
 
-       @Override
+       /**
+        * First name
+        * <p>
+        * @return the first name
+        */
        public String getFirstName () {
                return this.firstName;
        }
 
-       @Override
+       /**
+        * First name
+        * <p>
+        * @param firstName the first name to set
+        */
        public void setFirstName (final String firstName) {
                this.firstName = firstName;
        }
 
-       @Override
-       public Gender getGender () {
-               return this.gender;
-       }
-
-       @Override
-       public void setGender (final Gender gender) {
-               this.gender = gender;
-       }
-
-       @Override
+       /**
+        * House number
+        * <p>
+        * @return the houseNumber
+        */
        public Short getHouseNumber () {
                return this.houseNumber;
        }
 
-       @Override
+       /**
+        * House number
+        * <p>
+        * @param houseNumber the houseNumber to set
+        */
        public void setHouseNumber (final Short houseNumber) {
                this.houseNumber = houseNumber;
        }
 
-       @Override
+       /**
+        * Getter for house number extension, example: 123a 'a' is then the
+        * extension and 123 is the house number.
+        * <p>
+        * @return House number extension
+        */
        public String getHouseNumberExtension () {
                return this.houseNumberExtension;
        }
 
-       @Override
+       /**
+        * Setter for house number extension
+        * <p>
+        * @param houseNumberExtension House number extension
+        */
        public void setHouseNumberExtension (final String houseNumberExtension) {
                this.houseNumberExtension = houseNumberExtension;
        }
 
-       @Override
-       public Integer getPhoneAreaCode () {
-               return this.phoneAreaCode;
+       /**
+        * Getter for land-line number's area code
+        * <p>
+        * @return Land-line number's area code
+        */
+       public Integer getLandLineAreaCode () {
+               return this.landLineAreaCode;
        }
 
-       @Override
-       public void setPhoneAreaCode (final Integer phoneAreaCode) {
-               this.phoneAreaCode = phoneAreaCode;
+       /**
+        * Setter for land-line number's area code
+        * <p>
+        * @param landLineAreaCode Land-line number's area code
+        */
+       public void setLandLineAreaCode (final Integer landLineAreaCode) {
+               this.landLineAreaCode = landLineAreaCode;
        }
 
-       @Override
-       public Country getPhoneCountry () {
-               return this.phoneCountry;
+       /**
+        * Getter for land-line number's country instance
+        * <p>
+        * @return Land-line number's country instance
+        */
+       public Country getLandLineCountry () {
+               return this.landLineCountry;
        }
 
-       @Override
-       public void setPhoneCountry (final Country phoneCountry) {
-               this.phoneCountry = phoneCountry;
+       /**
+        * Setter for land-line number's country instance
+        * <p>
+        * @param landLineCountry Land-line number's country instance
+        */
+       public void setLandLineCountry (final Country landLineCountry) {
+               this.landLineCountry = landLineCountry;
        }
 
-       @Override
-       public Long getPhoneNumber () {
-               return this.phoneNumber;
+       /**
+        * Getter for land-line number
+        * <p>
+        * @return Land-line number
+        */
+       public Long getLandLineNumber () {
+               return this.landLineNumber;
        }
 
-       @Override
-       public void setPhoneNumber (final Long phoneNumber) {
-               this.phoneNumber = phoneNumber;
+       /**
+        * Setter for land-line number
+        * <p>
+        * @param landLineNumber Land-line number
+        */
+       public void setLandLineNumber (final Long landLineNumber) {
+               this.landLineNumber = landLineNumber;
        }
 
-       @Override
+       /**
+        * Getter for mobile number
+        * <p>
+        * @return Mobile number
+        */
+       public Long getMobileNumber () {
+               return this.mobileNumber;
+       }
+
+       /**
+        * Setter for mobile number
+        * <p>
+        * @param mobileNumber Mobile number
+        */
+       public void setMobileNumber (final Long mobileNumber) {
+               this.mobileNumber = mobileNumber;
+       }
+
+       /**
+        * Getter for mobile number's carrier
+        * <p>
+        * @return Mobile number's carrier
+        */
+       public MobileProvider getMobileProvider () {
+               return this.mobileProvider;
+       }
+
+       /**
+        * Setter for mobile number's provider
+        * <p>
+        * @param mobileProvider Mobile number's provider
+        */
+       public void setMobileProvider (final MobileProvider mobileProvider) {
+               this.mobileProvider = mobileProvider;
+       }
+
+       /**
+        * Getter for personal title
+        * <p>
+        * @return Personal title
+        */
+       public PersonalTitle getPersonalTitle () {
+               return this.personalTitle;
+       }
+
+       /**
+        * Setter for personal title
+        * <p>
+        * @param personalTitle Personal title
+        */
+       public void setPersonalTitle (final PersonalTitle personalTitle) {
+               this.personalTitle = personalTitle;
+       }
+
+       /**
+        * Getter for street
+        * <p>
+        * @return Street
+        */
        public String getStreet () {
                return this.street;
        }
 
-       @Override
+       /**
+        * Setter for street
+        * <p>
+        * @param street Street
+        */
        public void setStreet (final String street) {
                this.street = street;
        }
 
-       @Override
+       /**
+        * Getter for ZIP code
+        * <p>
+        * @return ZIP code
+        */
        public Integer getZipCode () {
                return this.zipCode;
        }
 
-       @Override
+       /**
+        * Setter for ZIP code
+        * <p>
+        * @param zipCode ZIP code
+        */
        public void setZipCode (final Integer zipCode) {
                this.zipCode = zipCode;
        }
 
-       @Override
-       public boolean hasContacts () {
-               return (!this.contactList.isEmpty());
-       }
-
        /**
-        * Post-initialization of this class
+        * Post-construction method
         */
        @PostConstruct
        public void init () {
+               // Try it
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Try to lookup
+                       this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N
+               } catch (final NamingException e) {
+                       // Throw again
+                       throw new FaceletException(e);
+               }
+
                // Get full email address list for reducing EJB calls
-               this.emailAddressList = this.contactBean.getEmailAddressList();
+               this.emailAddressList.addAll(this.contactBean.getEmailAddressList());
+
+               // Get all contacts
+               List<Contact> allContacts = this.contactBean.getAllContacts();
 
                // Get full contact list
-               this.contactList = this.contactBean.getAllContacts();
+               this.contactList.addAll(allContacts);
 
                // Get all users
                List<User> allUsers = this.userController.allUsers();
 
-               // Get all contacts
-               List<Contact> allContacts = this.contactBean.getAllContacts();
-
                // Get iterator
                Iterator<Contact> iterator = allContacts.iterator();
 
@@ -901,7 +1083,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
 
        @Override
        public boolean isRequiredChangePersonalDataSet () {
-               return ((this.getGender() != null) &&
+               return ((this.getPersonalTitle() != null) &&
                                (this.getFirstName() != null) &&
                                (this.getFamilyName() != null) &&
                                (this.getStreet() != null) &&
@@ -912,7 +1094,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
 
        @Override
        public boolean isRequiredPersonalDataSet () {
-               return ((this.getGender() != null) &&
+               return ((this.getPersonalTitle() != null) &&
                                (this.getFirstName() != null) &&
                                (this.getFamilyName() != null) &&
                                (this.getStreet() != null) &&
@@ -1007,8 +1189,8 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        private void clear () {
                // Clear all data
                // - personal data
-               this.setGender(null);
-               // TODO: Unfinished this.setTitle(null);
+               this.setPersonalTitle(null);
+               this.setAcademicTitle(null);
                this.setFirstName(null);
                this.setFamilyName(null);
                this.setStreet(null);
@@ -1019,13 +1201,12 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.setCountry(null);
 
                // - contact data
-               this.setEmailAddress(null);
-               this.setEmailAddressRepeat(null);
-               this.setPhoneAreaCode(null);
-               this.setPhoneCountry(null);
-               this.setPhoneNumber(null);
-               this.setCellphoneCarrier(null);
-               this.setCellphoneNumber(null);
+               this.clearEmailAddresses();
+               this.setLandLineAreaCode(null);
+               this.setLandLineCountry(null);
+               this.setLandLineNumber(null);
+               this.setMobileProvider(null);
+               this.setMobileNumber(null);
                this.setFaxAreaCode(null);
                this.setFaxCountry(null);
                this.setFaxNumber(null);
@@ -1055,7 +1236,8 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
 
                // Copy all fields:
                // - base data
-               this.setGender(contact.getContactGender());
+               this.setPersonalTitle(contact.getContactPersonalTitle());
+               this.setAcademicTitle(contact.getContactTitle());
                this.setFirstName(contact.getContactFirstName());
                this.setFamilyName(contact.getContactFamilyName());
                this.setStreet(contact.getContactStreet());
@@ -1068,21 +1250,21 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.setBirthday(contact.getContactBirthday());
                this.setComment(contact.getContactComment());
 
-               // Get cellphone, phone and fax instance
-               DialableCellphoneNumber cellphone = contact.getContactCellphoneNumber();
+               // Get mobile, phone and fax instance
+               DialableMobileNumber mobile = contact.getContactMobileNumber();
                DialableFaxNumber fax = contact.getContactFaxNumber();
                DialableLandLineNumber phone = contact.getContactLandLineNumber();
 
                // - contact data
                if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneAreaCode() > 0)) {
-                       this.setPhoneCountry(phone.getPhoneCountry());
-                       this.setPhoneAreaCode(phone.getPhoneAreaCode());
-                       this.setPhoneNumber(phone.getPhoneNumber());
+                       this.setLandLineCountry(phone.getPhoneCountry());
+                       this.setLandLineAreaCode(phone.getPhoneAreaCode());
+                       this.setLandLineNumber(phone.getPhoneNumber());
                }
 
-               if ((cellphone instanceof DialableCellphoneNumber) && (cellphone.getCellphoneProvider() instanceof MobileProvider)) {
-                       this.setCellphoneCarrier(cellphone.getCellphoneProvider());
-                       this.setCellphoneNumber(cellphone.getPhoneNumber());
+               if ((mobile instanceof DialableMobileNumber) && (mobile.getMobileProvider() instanceof MobileProvider)) {
+                       this.setMobileProvider(mobile.getMobileProvider());
+                       this.setMobileNumber(mobile.getPhoneNumber());
                }
 
                if ((fax instanceof DialableFaxNumber) && (fax.getPhoneAreaCode() > 0)) {
@@ -1120,4 +1302,43 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.emailAddressList.remove(contact.getContactEmailAddress());
        }
 
+       /**
+        * Adds unique instance to contact list. First any existing instance is
+        * being removed, then the new instance is added.
+        * <p>
+        * @param contact Contact instance to add uniquely
+        */
+       private void uniqueAddContact (final Contact contact) {
+               // Is the instance valid?
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Not valid id number
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N
+               }
+
+               // Get iterator from list
+               Iterator<Contact> iterator = this.contactList.iterator();
+
+               // "Walk" through all entries
+               while (iterator.hasNext()) {
+                       // Get next element
+                       Contact next = iterator.next();
+
+                       // Is id number the same?
+                       if (Objects.equals(contact.getContactId(), next.getContactId())) {
+                               // Found entry, so remove it and abort
+                               this.removeContact(next);
+                               break;
+                       }
+               }
+
+               // Add contact to list
+               this.contactList.add(contact);
+       }
+
 }