cellphone is history, now there is mobile ... ;-)

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

diff --git a/src/org/mxchange/jcontacts/contact/gender/Gender.java b/src/org/mxchange/jcontacts/contact/gender/Gender.java
index d5ba5a95eae07cc6e8f3a8c6c7b496fc297da347..0871506ea5695bace81ca3e2be077e7353cd878b 100644 (file)
--- a/src/org/mxchange/jcontacts/contact/gender/Gender.java
+++ b/src/org/mxchange/jcontacts/contact/gender/Gender.java
@@ -151,4 +151,5 @@ public enum Gender implements Serializable {
        public String getMessageKey () {
                return this.messageKey;
        }
+
 }

diff --git a/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java b/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java
index b126f0f531889e9bf215f2106121383b1ee55102..53d25490fcfe5a6f640eab47a5e0262715a7591d 100644 (file)
--- a/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java
+++ b/src/org/mxchange/jcontacts/contact/gender/GenderUtils.java
@@ -65,4 +65,5 @@ public class GenderUtils implements Serializable {
         */
        private GenderUtils () {
        }
+
 }

diff --git a/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java b/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java
index 3dbfad5318060c88404a1ce61af2b7f1364ef069..192b2e78467bef68e688a66b258502965e40cb77 100644 (file)
--- a/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java
+++ b/src/org/mxchange/jcontacts/contact/utils/ContactUtils.java
@@ -46,7 +46,7 @@ public class ContactUtils implements Serializable {
         * the equal() method is implemented and checks all fields.
         * <p>
         * @param contact Contact one
-        * @param other Contact two
+        * @param other   Contact two
         * <p>
         * @return Whether both are the same
         */
@@ -74,67 +74,16 @@ public class ContactUtils implements Serializable {
                                (Objects.equals(contact.getContactZipCode(), other.getContactZipCode())));
        }
 
-       /**
-        * Updates mobile data in contact instance. This method also removes the
-        * mobile instance if no provider is selected. A bean (mostly EJB) should
-        * then make sure that the mobile entry is being unlinked from contact
-        * instance or being removed, if no longer used.
-        * <p>
-        * @param contact Contact instance to update
-        * @param mobileProvider New mobile provider (or old)
-        * @param mobileNumber New mobile number (or old)
-        * <p>
-        * @return Whether the mobile has been unlinked in contact object
-        */
-       public static boolean updateCellPhoneNumber (final Contact contact, final MobileProvider mobileProvider, final Long mobileNumber) {
-               // At least contact must be valid
-               if (null == contact) {
-                       // Throw NPE
-                       throw new NullPointerException("contact is null"); //NOI18N
-               } else if ((mobileProvider instanceof MobileProvider) && (null == mobileNumber)) {
-                       // Mobile provider given, but no number
-                       throw new NullPointerException("mobileNumber is null"); //NOI18N
-               }
-
-               // Default is not unlinked
-               boolean isUnlinked = false;
-
-               // Is there a mobile number?
-               if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
-                       // Is provider null?
-                       if ((null == mobileProvider) || (null == mobileNumber) || (mobileNumber == 0)) {
-                               // Remove instance
-                               contact.setContactMobileNumber(null);
-
-                               // Mark as unlinked
-                               isUnlinked = true;
-                       } else {
-                               // Yes, then update as well
-                               contact.getContactMobileNumber().setMobileProvider(mobileProvider);
-                               contact.getContactMobileNumber().setPhoneNumber(mobileNumber);
-                       }
-               } else if ((mobileProvider instanceof MobileProvider) && (mobileNumber > 0)) {
-                       // Create new instance
-                       DialableMobileNumber mobile = new MobileNumber(mobileProvider, mobileNumber);
-
-                       // Set it in contact
-                       contact.setContactMobileNumber(mobile);
-               }
-
-               // Return status
-               return isUnlinked;
-       }
-
        /**
         * Updates land-line data in contact instance. This method also removes the
         * land-line instance if no country is selected. A bean (mostly EJB) should
         * then make sure that the land-line entry is being unlinked from contact
         * instance or being removed, if no longer used.
         * <p>
-        * @param contact Contact instance being updated
-        * @param faxCountry Updated fax number or null
+        * @param contact     Contact instance being updated
+        * @param faxCountry  Updated fax number or null
         * @param faxAreaCode Updated fax area code or null
-        * @param faxNumber Updated fax number
+        * @param faxNumber   Updated fax number
         * <p>
         * @return Whether the fax number has been unlinked in contact object
         */
@@ -181,10 +130,10 @@ public class ContactUtils implements Serializable {
         * then make sure that the land-line entry is being unlinked from contact
         * instance or being removed, if no longer used.
         * <p>
-        * @param contact Contact instance being updated
-        * @param phoneCountry New phone country or old or null
+        * @param contact       Contact instance being updated
+        * @param phoneCountry  New phone country or old or null
         * @param phoneAreaCode New phone's area code (or old)
-        * @param phoneNumber New phone number (or old)
+        * @param phoneNumber   New phone number (or old)
         * <p>
         * @return Whether the land-line number has been unlinked in contact object
         */
@@ -225,6 +174,57 @@ public class ContactUtils implements Serializable {
                return isUnlinked;
        }
 
+       /**
+        * Updates mobile data in contact instance. This method also removes the
+        * mobile instance if no provider is selected. A bean (mostly EJB) should
+        * then make sure that the mobile entry is being unlinked from contact
+        * instance or being removed, if no longer used.
+        * <p>
+        * @param contact        Contact instance to update
+        * @param mobileProvider New mobile provider (or old)
+        * @param mobileNumber   New mobile number (or old)
+        * <p>
+        * @return Whether the mobile has been unlinked in contact object
+        */
+       public static boolean updateMobileNumber (final Contact contact, final MobileProvider mobileProvider, final Long mobileNumber) {
+               // At least contact must be valid
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if ((mobileProvider instanceof MobileProvider) && (null == mobileNumber)) {
+                       // Mobile provider given, but no number
+                       throw new NullPointerException("mobileNumber is null"); //NOI18N
+               }
+
+               // Default is not unlinked
+               boolean isUnlinked = false;
+
+               // Is there a mobile number?
+               if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
+                       // Is provider null?
+                       if ((null == mobileProvider) || (null == mobileNumber) || (mobileNumber == 0)) {
+                               // Remove instance
+                               contact.setContactMobileNumber(null);
+
+                               // Mark as unlinked
+                               isUnlinked = true;
+                       } else {
+                               // Yes, then update as well
+                               contact.getContactMobileNumber().setMobileProvider(mobileProvider);
+                               contact.getContactMobileNumber().setPhoneNumber(mobileNumber);
+                       }
+               } else if ((mobileProvider instanceof MobileProvider) && (mobileNumber > 0)) {
+                       // Create new instance
+                       DialableMobileNumber mobile = new MobileNumber(mobileProvider, mobileNumber);
+
+                       // Set it in contact
+                       contact.setContactMobileNumber(mobile);
+               }
+
+               // Return status
+               return isUnlinked;
+       }
+
        /**
         * Private constructor for utilities
         */