]> git.mxchange.org Git - jfinancials-war.git/blobdiff - src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
Updated copyright year
[jfinancials-war.git] / src / java / org / mxchange / jfinancials / beans / contact / phone / FinancialsAdminContactPhoneWebRequestBean.java
index 2869e4d0277ba46a5ae6b82816661b9b6f304d26..c1cac3dfb972c06e6dbdf29359a3271d4b075048 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2022 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
 package org.mxchange.jfinancials.beans.contact.phone;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
-import javax.annotation.PostConstruct;
+import java.util.Date;
+import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Any;
-import javax.faces.view.facelets.FaceletException;
+import javax.faces.application.FacesMessage;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
+import org.mxchange.jcontacts.events.contact.update.ObservableUpdatedContactEvent;
 import org.mxchange.jcontacts.events.fax.linked.AdminLinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.fax.unlinked.AdminUnlinkedFaxNumberEvent;
@@ -41,28 +38,21 @@ import org.mxchange.jcontacts.events.landline.linked.AdminLinkedLandLineNumberEv
 import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.events.landline.unlinked.AdminUnlinkedLandLineNumberEvent;
 import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent;
-import org.mxchange.jcontacts.events.mobile.linked.AdminLinkedMobileNumberEvent;
-import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent;
-import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent;
-import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent;
-import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote;
-import org.mxchange.jcountry.data.Country;
-import org.mxchange.jfinancials.beans.BaseFinancialsController;
-import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestHelperController;
+import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
+import org.mxchange.jcontacts.model.contact.Contact;
+import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote;
+import org.mxchange.jcountry.model.data.Country;
+import org.mxchange.jfinancials.beans.BaseFinancialsBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
-import org.mxchange.jphone.exceptions.PhoneNumberAlreadyLinkedException;
-import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException;
-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.jphone.exceptions.phone.PhoneNumberAlreadyLinkedException;
+import org.mxchange.jphone.exceptions.phone.PhoneNumberNotLinkedException;
+import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
+import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent;
-import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
 
 /**
  * An administrative contact phone controller (bean)
@@ -71,7 +61,7 @@ import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEv
  */
 @Named ("adminContactPhoneController")
 @RequestScoped
-public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsController implements FinancialsAdminContactPhoneWebRequestController {
+public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBean implements FinancialsAdminContactPhoneWebRequestController {
 
        /**
         * Call-stack instance (5 may show BeanELResolver.getValue as caller)
@@ -86,6 +76,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
        /**
         * Administrative EJB for phone number
         */
+       @EJB (lookup = "java:global/jfinancials-ejb/adminContactPhone!org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote")
        private AdminContactsPhoneSessionBeanRemote adminContactPhoneBean;
 
        /**
@@ -102,25 +93,12 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
        @Any
        private Event<ObservableAdminLinkedLandLineNumberEvent> adminLinkedLandLineNumberEvent;
 
-       /**
-        * Event being fired when a mobile number has been linked
-        */
-       @Inject
-       @Any
-       private Event<ObservableAdminLinkedMobileNumberEvent> adminLinkedMobileNumberEvent;
-
        /**
         * Administrative phone controller
         */
        @Inject
        private FinancialsAdminPhoneWebRequestController adminPhoneController;
 
-       /**
-        * Bean helper
-        */
-       @Inject
-       private FinancialsWebRequestHelperController beanHelper;
-
        /**
         * Contact instance
         */
@@ -171,31 +149,14 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
        private Event<ObservableAdminUnlinkedLandLineNumberEvent> landLineNumberUnlinkedEvent;
 
        /**
-        * Mobile number
-        */
-       private Long mobileNumber;
-
-       /**
-        * Event being fired when administrator unlinks mobile from contact
-        */
-       @Inject
-       @Any
-       private Event<ObservableAdminUnlinkedMobileNumberEvent> mobileNumberUnlinkedEvent;
-
-       /**
-        * Mobile provider
+        * When phone number has been created
         */
-       private MobileProvider mobileProvider;
+       private Date phoneEntryCreated;
 
        /**
-        * When fax number has been created
+        * When phone number has been updated
         */
-       private Calendar phoneEntryCreated;
-
-       /**
-        * When fax number has been updated
-        */
-       private Calendar phoneEntryUpdated;
+       private Date phoneEntryUpdated;
 
        /**
         * Phone id (primary key)
@@ -245,7 +206,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * @param event Event being fired
         */
        public void afterAdminAddedUserEvent (@Observes final ObservableAdminAddedUserEvent event) {
-               // event should not be null
+               // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N
@@ -270,7 +231,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * @param event Updated contact data event
         */
        public void afterAdminUpdatedContactDataEvent (@Observes final ObservableAdminUpdatedContactEvent event) {
-               // event should not be null
+               // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N
@@ -305,10 +266,10 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                        throw new NullPointerException("event is null"); //NOI18N
                } else if (event.getCreatedContact() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("event.createdContact is null"); //NOI18N //NOI18N
+                       throw new NullPointerException("event.createdContact is null"); //NOI18N
                } else if (event.getCreatedContact().getContactId() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("event.createdContact.contactId is null"); //NOI18N //NOI18N
+                       throw new NullPointerException("event.createdContact.contactId is null"); //NOI18N
                } else if (event.getCreatedContact().getContactId() < 1) {
                        // Not valid
                        throw new IllegalStateException(MessageFormat.format("event.createdContact.contactId={0} is not valid.", event.getCreatedContact().getContactId())); //NOI18N
@@ -341,7 +302,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                }
 
                // Get fax number from event
-               DialableFaxNumber number = event.getFaxNumber();
+               final DialableFaxNumber number = event.getFaxNumber();
 
                // Copy all data to this bean
                this.setPhoneId(number.getPhoneId());
@@ -375,7 +336,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                }
 
                // Get fax number from event
-               DialableLandLineNumber number = event.getLandLineNumber();
+               final DialableLandLineNumber number = event.getLandLineNumber();
 
                // Copy all data to this bean
                this.setPhoneId(number.getPhoneId());
@@ -387,36 +348,28 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
        }
 
        /**
-        * Observes events being fired when a bean helper has successfully created a
-        * mobile number instance.
+        * Event observer for updated contact data by the user
         * <p>
-        * @param event Event being fired
+        * @param event Updated contact data event
         */
-       public void afterCreatedMobileNumberEvent (@Observes final ObservableCreatedMobileNumberEvent event) {
-               // The event instance must be valid
+       public void afterUpdatedContactDataEvent (@Observes final ObservableUpdatedContactEvent event) {
+               // Event and contained entity instance should not be null
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N
-               } else if (event.getMobileNumber() == null) {
+               } else if (event.getUpdatedContact() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("event.mobileNumber is null"); //NOI18N
-               } else if (event.getMobileNumber().getPhoneId() == null) {
-                       // Throw NPE yet again
-                       throw new NullPointerException("event.mobileNumber.phoneId is null"); //NOI18N
-               } else if (event.getMobileNumber().getPhoneId() < 1) {
-                       // Throw NPE yet again
-                       throw new NullPointerException(MessageFormat.format("event.mobileNumber.phoneId={0} is invalid", event.getMobileNumber().getPhoneId())); //NOI18N
+                       throw new NullPointerException("event.updatedContact is null"); //NOI18N
+               } else if (event.getUpdatedContact().getContactId() == null) {
+                       // userId is null
+                       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 fax number from event
-               DialableMobileNumber number = event.getMobileNumber();
-
-               // Copy all data to this bean
-               this.setPhoneId(number.getPhoneId());
-               this.setMobileProvider(number.getMobileProvider());
-               this.setMobileNumber(number.getPhoneNumber());
-               this.setPhoneEntryCreated(number.getPhoneEntryCreated());
-               this.setPhoneEntryUpdated(number.getPhoneEntryUpdated());
+               // Clear all data
+               this.clear();
        }
 
        /**
@@ -426,7 +379,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         */
        public String doLinkMainFaxNumber () {
                // Get contact from helper
-               Contact targetContact = this.getContact();
+               final Contact targetContact = this.getContact();
 
                // Is all data properly set?
                if (null == targetContact) {
@@ -462,16 +415,16 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                }
 
                // Init instances
-               Contact updatedContact;
-               DialableFaxNumber number = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
+               final Contact updatedContact;
+               final DialableFaxNumber number = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Try it again
                try {
                        // Link it, too
                        updatedContact = this.adminContactPhoneBean.linkNewFaxNumberWithContact(targetContact, number);
-               } catch (final PhoneNumberAlreadyLinkedException ex) {
+               } catch (final PhoneNumberAlreadyLinkedException | ContactNotFoundException ex) {
                        // Throw again as cause
-                       this.showFacesMessage("form_add_contact_fax:faxNumber", ex); //NOI18N
+                       this.showFacesMessage("form_add_contact_fax:faxNumber", ex, FacesMessage.SEVERITY_ERROR); //NOI18N
                        return ""; //NOI18N
                }
 
@@ -490,7 +443,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         */
        public String doLinkMainLandLineNumber () {
                // Get contact from helper
-               Contact targetContact = this.getContact();
+               final Contact targetContact = this.getContact();
 
                // Is all data properly set?
                if (null == targetContact) {
@@ -526,16 +479,16 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                }
 
                // Init instance
-               Contact updatedContact;
-               DialableLandLineNumber number = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
+               final Contact updatedContact;
+               final DialableLandLineNumber number = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
 
                // Try it again
                try {
                        // Link it, too
                        updatedContact = this.adminContactPhoneBean.linkNewLandLineNumberWithContact(targetContact, number);
-               } catch (final PhoneNumberAlreadyLinkedException ex) {
+               } catch (final PhoneNumberAlreadyLinkedException | ContactNotFoundException ex) {
                        // Throw again as cause
-                       this.showFacesMessage("form_add_contact_landLine:landLineNumber", ex); //NOI18N
+                       this.showFacesMessage("form_add_contact_landLine:landLineNumber", ex, FacesMessage.SEVERITY_ERROR); //NOI18N
                        return ""; //NOI18N
                }
 
@@ -546,63 +499,6 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                return "admin_show_contact"; //NOI18N
        }
 
-       /**
-        * Links mobile number to contact from bean helper as "main mobile number".
-        * <p>
-        * @return Redirect outcome
-        */
-       public String doLinkMainMobileNumber () {
-               // Get contact from helper
-               Contact targetContact = this.getContact();
-
-               // Is all data properly set?
-               if (null == targetContact) {
-                       // Throw NPE
-                       throw new NullPointerException("targetContact is null"); //NOI18N
-               } else if (targetContact.getContactId() == null) {
-                       // Throw it again
-                       throw new NullPointerException("targetContact.contactId is null"); //NOI18N
-               } else if (targetContact.getContactId() < 1) {
-                       // Is not valid
-                       throw new IllegalArgumentException(MessageFormat.format("targetContact.contactId={0} is not valid", targetContact.getContactId())); //NOI18N
-               } else if (this.getMobileProvider() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("this.mobileProvider is null"); //NOI18N
-               } else if (this.getMobileProvider().getProviderId() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("this.mobileProvider.providerId is null"); //NOI18N
-               } else if (this.getMobileProvider().getProviderId() < 1) {
-                       // Throw NPE
-                       throw new NullPointerException(MessageFormat.format("this.mobileProvider.providerId={0} is invalid", this.getMobileProvider().getProviderId())); //NOI18N
-               } else if (this.getMobileNumber() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("this.mobileNumber is null"); //NOI18N
-               } else if (this.getMobileNumber() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber={0} is invalid", this.getMobileNumber())); //NOI18N
-               }
-
-               // Init instance
-               Contact updatedContact;
-               DialableMobileNumber number = new MobileNumber(this.getMobileProvider(), this.getMobileNumber());
-
-               // Try it again
-               try {
-                       // Link it, too
-                       updatedContact = this.adminContactPhoneBean.linkNewMobileNumberWithContact(targetContact, number);
-               } catch (final PhoneNumberAlreadyLinkedException ex) {
-                       // Throw again as cause
-                       this.showFacesMessage("form_add_contact_mobile:mobileNumber", ex); //NOI18N
-                       return ""; //NOI18N
-               }
-
-               // Fire event
-               this.adminLinkedMobileNumberEvent.fire(new AdminLinkedMobileNumberEvent(updatedContact, number));
-
-               // Return to contact profile
-               return "admin_show_contact"; //NOI18N
-       }
-
        /**
         * Getter for contact instance
         * <p>
@@ -729,42 +625,6 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                this.landLineNumber = landLineNumber;
        }
 
-       /**
-        * 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 provider
-        * <p>
-        * @return Mobile provider
-        */
-       public MobileProvider getMobileProvider () {
-               return this.mobileProvider;
-       }
-
-       /**
-        * Setter for mobile provider
-        * <p>
-        * @param mobileProvider Mobile provider
-        */
-       public void setMobileProvider (final MobileProvider mobileProvider) {
-               this.mobileProvider = mobileProvider;
-       }
-
        /**
         * Setter for phone id
         * <p>
@@ -783,24 +643,6 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                this.phoneId = phoneId;
        }
 
-       /**
-        * Post-construction method
-        */
-       @PostConstruct
-       public void init () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup the beans
-                       this.adminContactPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N
-               } catch (final NamingException e) {
-                       // Throw again
-                       throw new FaceletException(e);
-               }
-       }
-
        /**
         * Unlinks fax data with current contact
         * <p>
@@ -808,7 +650,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         */
        public String unlinkFaxContactData () {
                // Create fax number instance
-               DialableFaxNumber number = this.createFaxNumber();
+               final DialableFaxNumber number = this.createFaxNumber();
 
                // Is all data set
                if (number == null) {
@@ -838,14 +680,14 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                }
 
                // Init contact instance
-               Contact updatedContact;
+               final Contact updatedContact;
 
                try {
                        // Unlink it and return contact without fax instance
                        updatedContact = this.adminContactPhoneBean.unlinkFaxDataFromContact(this.getContact(), number);
-               } catch (final PhoneNumberNotLinkedException ex) {
+               } catch (final PhoneNumberNotLinkedException | ContactNotFoundException ex) {
                        // Did not work
-                       this.showFacesMessage("form_unlink_contact_fax:faxNumberId", ex); //NOI18N
+                       this.showFacesMessage("form_unlink_contact_fax:faxNumberId", ex, FacesMessage.SEVERITY_ERROR); //NOI18N
                        return ""; //NOI18N
                }
 
@@ -863,7 +705,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         */
        public String unlinkLandLineContactData () {
                // Create fax number instance
-               DialableLandLineNumber number = this.createLandLineNumber();
+               final DialableLandLineNumber number = this.createLandLineNumber();
 
                // Is all data set
                if (number == null) {
@@ -893,14 +735,14 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                }
 
                // Init contact instance
-               Contact updatedContact;
+               final Contact updatedContact;
 
                try {
                        // Unlink it and return contact without landLine instance
                        updatedContact = this.adminContactPhoneBean.unlinkLandLineDataFromContact(this.getContact(), number);
-               } catch (final PhoneNumberNotLinkedException ex) {
+               } catch (final PhoneNumberNotLinkedException | ContactNotFoundException ex) {
                        // Did not work
-                       this.showFacesMessage("form_unlink_contact_landLine:landLineNumberId", ex); //NOI18N
+                       this.showFacesMessage("form_unlink_contact_landLine:landLineNumberId", ex, FacesMessage.SEVERITY_ERROR); //NOI18N
                        return ""; //NOI18N
                }
 
@@ -911,70 +753,6 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
                return "admin_show_contact"; //NOI18N
        }
 
-       /**
-        * Unlinks mobile data with current contact
-        * <p>
-        * @return Redirect outcome
-        */
-       public String unlinkMobileContactData () {
-               // Create fax number instance
-               DialableMobileNumber number = this.createMobileNumber();
-
-               // Is all data set
-               if (number == null) {
-                       // Not set, throw NPE
-                       throw new NullPointerException("number is null"); //NOI18N
-               } else if (number.getPhoneId() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("number.phoneId is null"); //NOI18N
-               } else if (number.getPhoneId() < 1) {
-                       // Invalid number
-                       throw new IllegalArgumentException(MessageFormat.format("number.phoneId={0} is not valid", number.getPhoneId())); //NOI18N
-               } else if (number.getMobileProvider() == null) {
-                       // Throw NPE
-                       throw new NullPointerException("number.mobileProvider is null"); //NOI18N
-               } else if (number.getMobileProvider().getProviderId() == null) {
-                       // ... throw again
-                       throw new NullPointerException("number.mobileProvider.providerId is null"); //NOI18N
-               } else if (number.getMobileProvider().getProviderId() < 1) {
-                       // Id not valid
-                       throw new IllegalArgumentException(MessageFormat.format("number.mobileProvider.providerId={0} is not valid.", number.getMobileProvider().getProviderId())); //NOI18N
-               } else if (number.getPhoneNumber() == null) {
-                       // Throw NPE again
-                       throw new NullPointerException("number.phoneNumber is null"); //NOI18N
-               } else if (number.getPhoneNumber() < 1) {
-                       // Throw it again ...
-                       throw new NullPointerException(MessageFormat.format("number.phoneNumber={0} is not valid.", number.getPhoneNumber())); //NOI18N
-               } else if (this.getContact() == null) {
-                       // ... and throw again
-                       throw new NullPointerException("this.contact is null"); //NOI18N
-               } else if (this.getContact().getContactId() == null) {
-                       // ... and again ...
-                       throw new NullPointerException("this.contact.contactId is null"); //NOI18N
-               } else if (this.getContact().getContactId() < 1) {
-                       // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("this.contact.contactId={0} is invalid.", this.getContact().getContactId())); //NOI18N
-               }
-
-               // Init contact instance
-               Contact updatedContact;
-
-               try {
-                       // Unlink it and return contact without mobile instance
-                       updatedContact = this.adminContactPhoneBean.unlinkMobileDataFromContact(this.getContact(), number);
-               } catch (final PhoneNumberNotLinkedException ex) {
-                       // Did not work
-                       this.showFacesMessage("form_unlink_contact_mobile:mobileNumberId", ex); //NOI18N
-                       return ""; //NOI18N
-               }
-
-               // Fire event
-               this.mobileNumberUnlinkedEvent.fire(new AdminUnlinkedMobileNumberEvent(updatedContact, number));
-
-               // All fine here
-               return "admin_show_contact"; //NOI18N
-       }
-
        /**
         * Clears this bean
         */
@@ -989,17 +767,12 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         */
        private DialableFaxNumber createFaxNumber () {
                // Instanciate it
-               DialableFaxNumber number = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
+               final DialableFaxNumber number = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Set all other fields
                number.setPhoneEntryCreated(this.getPhoneEntryCreated());
                number.setPhoneEntryUpdated(this.getPhoneEntryUpdated());
-
-               // Is id number there?
-               if (this.getPhoneId() instanceof Long) {
-                       // Set it
-                       number.setPhoneId(this.getPhoneId());
-               }
+               number.setPhoneId(this.getPhoneId());
 
                // Return it
                return number;
@@ -1013,41 +786,12 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         */
        private DialableLandLineNumber createLandLineNumber () {
                // Initialize it
-               DialableLandLineNumber number = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
+               final DialableLandLineNumber number = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
 
                // Add all other data
                number.setPhoneEntryCreated(this.getPhoneEntryCreated());
                number.setPhoneEntryUpdated(this.getPhoneEntryUpdated());
-
-               // Is id number set?
-               if (this.getPhoneId() instanceof Long) {
-                       // Set it
-                       number.setPhoneId(this.getPhoneId());
-               }
-
-               // Return it
-               return number;
-       }
-
-       /**
-        * Returns an instance of a DialableMobileNumber from all fields stored in
-        * this bean.
-        * <p>
-        * @return An instance of a DialableMobileNumber class
-        */
-       private DialableMobileNumber createMobileNumber () {
-               // Initialize it
-               DialableMobileNumber number = new MobileNumber(this.getMobileProvider(), this.getMobileNumber());
-
-               // Add all other data
-               number.setPhoneEntryCreated(this.getPhoneEntryCreated());
-               number.setPhoneEntryUpdated(this.getPhoneEntryUpdated());
-
-               // Is id number set?
-               if (this.getPhoneId() instanceof Long) {
-                       // Set it
-                       number.setPhoneId(this.getPhoneId());
-               }
+               number.setPhoneId(this.getPhoneId());
 
                // Return it
                return number;
@@ -1056,10 +800,10 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
        /**
         * Getter for phone entry created
         * <p>
-        * @param faxNumberEntryCreated Phone entry created
+        * @return Phone entry created
         */
        @SuppressWarnings ("ReturnOfDateField")
-       private Calendar getPhoneEntryCreated () {
+       private Date getPhoneEntryCreated () {
                return this.phoneEntryCreated;
        }
 
@@ -1069,7 +813,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * @param phoneEntryCreated Phone entry created
         */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       private void setPhoneEntryCreated (final Calendar phoneEntryCreated) {
+       private void setPhoneEntryCreated (final Date phoneEntryCreated) {
                this.phoneEntryCreated = phoneEntryCreated;
        }
 
@@ -1079,7 +823,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * @return Phone entry updated
         */
        @SuppressWarnings ("ReturnOfDateField")
-       private Calendar getPhoneEntryUpdated () {
+       private Date getPhoneEntryUpdated () {
                return this.phoneEntryUpdated;
        }
 
@@ -1089,7 +833,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsCon
         * @param phoneEntryUpdated Phone entry updated
         */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       private void setPhoneEntryUpdated (final Calendar phoneEntryUpdated) {
+       private void setPhoneEntryUpdated (final Date phoneEntryUpdated) {
                this.phoneEntryUpdated = phoneEntryUpdated;
        }