renamed cellphone -> mobile

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

diff --git a/lib/jfinancials-core.jar b/lib/jfinancials-core.jar
index c7773edc2a81dbdebecf87f08f92fed6ce6d0b32..e70db05b5b507809d1b42749bf1630296b936de2 100644 (file)
Binary files a/lib/jfinancials-core.jar and b/lib/jfinancials-core.jar differ

diff --git a/src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java b/src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java
index e6fe705909fbf674268d039f9d829917bdedace2..18ca4ff26b7ce02f1cb32d0bb159edb213dd60fc 100644 (file)
--- a/src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java
@@ -23,9 +23,9 @@ import java.util.Objects;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean;
 import org.mxchange.jcontacts.contact.utils.ContactUtils;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
+import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean;
 
 /**
  * A contact EJB
@@ -283,7 +283,7 @@ public class FinancialsContactSessionBean extends BaseFinancialsDatabaseBean imp
                // Set updated timestamp
                this.setAllContactPhoneEntriesUpdated(contact, isCellphoneUnlinked, isLandlineUnlinked, isFaxUnlinked);
 
-               // Merge cellphone, land-line and fix
+               // Merge mobile, land-line and fix
                Contact detachedContact = this.mergeContactData(contact);
 
                // Trace message

diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java
index f6e622e465626a64c71a3f4edd8480ab56bd4aa3..89543a250d7eea34c8b35021a51f73d69b6e28cc 100644 (file)
--- a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java
@@ -138,13 +138,13 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsDatabaseBean
                        throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
                } else if (mobileNumber.getMobileProvider() == null) {
                        // Throw NPE
-                       throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N
+                       throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
                } else if (mobileNumber.getMobileProvider().getProviderId() == null) {
                        // ... throw again
-                       throw new NullPointerException("mobileNumber.cellphoneProvider.providerId is null"); //NOI18N
+                       throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N
                } else if (mobileNumber.getMobileProvider().getProviderId() < 1) {
                        // Id not valid
-                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
                } else if (mobileNumber.getPhoneNumber() == null) {
                        // Throw NPE again
                        throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
@@ -190,13 +190,13 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsDatabaseBean
                        throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
                } else if (mobileNumber.getMobileProvider() == null) {
                        // Throw NPE
-                       throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N
+                       throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
                } else if (mobileNumber.getMobileProvider().getProviderId() == null) {
                        // ... throw again
-                       throw new NullPointerException("mobileNumber.cellphoneProvider.providerId is null"); //NOI18N
+                       throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N
                } else if (mobileNumber.getMobileProvider().getProviderId() < 1) {
                        // Id not valid
-                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
                } else if (mobileNumber.getPhoneNumber() == null) {
                        // Throw NPE again
                        throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N

diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java
index d280e21936f3ed25fc3b0edb698d28839a949c28..2dbd0b7bdbd142ae351266e3c82373429091696b 100644 (file)
--- a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java
@@ -139,7 +139,7 @@ public class FinancialsPhoneSessionBean extends BaseDatabaseBean implements Phon
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: cellphone={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
 
                // Return found instance
                return faxNumber;
@@ -178,7 +178,7 @@ public class FinancialsPhoneSessionBean extends BaseDatabaseBean implements Phon
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: cellphone={1} - EXIT!", this.getClass().getSimpleName(), landLineNumber)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), landLineNumber)); //NOI18N
 
                // Return found instance
                return landLineNumber;
@@ -205,22 +205,22 @@ public class FinancialsPhoneSessionBean extends BaseDatabaseBean implements Phon
                query.setParameter("mobileNumberId", mobileNumberId); //NOI18N
 
                // Init instance
-               DialableMobileNumber cellphone = null;
+               DialableMobileNumber mobile = null;
 
                // Try to get a result
                try {
                        // Get a single result
-                       cellphone = (DialableMobileNumber) query.getSingleResult();
+                       mobile = (DialableMobileNumber) query.getSingleResult();
                } catch (NoResultException ex) {
                        // The entry was not found, so throw it again
                        throw new PhoneEntityNotFoundException(mobileNumberId, ex);
                }
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: cellphone={1} - EXIT!", this.getClass().getSimpleName(), cellphone)); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: mobile={1} - EXIT!", this.getClass().getSimpleName(), mobile)); //NOI18N
 
                // Return found instance
-               return cellphone;
+               return mobile;
        }
 
 }

diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
index 1db5c534e9a9f3b9cc45798337393af5193fea02..fbb10eab3295b99e64e479a2d9ed558bcca4330f 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java
@@ -93,7 +93,7 @@ public class FinancialsAdminUserSessionBean extends BaseFinancialsDatabaseBean i
                user.setUserCreated(new GregorianCalendar());
                user.getUserContact().setContactCreated(new GregorianCalendar());
 
-               // Update cellphone, land-line and fax instance
+               // Update mobile, land-line and fax instance
                this.setAllContactPhoneEntriesCreated(user.getUserContact());
 
                // Persist it