Renaming season has started:

[addressbook-mailer-ejb.git] / src / java / org / mxchange / jphone / phonenumbers / phone / AddressbookPhoneSessionBean.java

diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java
index 05a219b84cbb2fdfe2755f67e3e02e997794312b..247d4200bf1e23eb85ded4d0827071be6ebff72d 100644 (file)
--- a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java
@@ -23,12 +23,12 @@ import javax.persistence.NoResultException;
 import javax.persistence.Query;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-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;
 
 /**
  * A general phone EJB
@@ -51,18 +51,18 @@ public class AddressbookPhoneSessionBean extends BaseDatabaseBean implements Pho
 
        @SuppressWarnings ("unchecked")
        @Override
-       public List<DialableCellphoneNumber> allCellphoneNumbers () {
+       public List<DialableMobileNumber> allMobileNumbers () {
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCellphoneNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N
 
                // Get query
-               Query query = this.getEntityManager().createNamedQuery("AllCellphoneNumbers", CellphoneNumber.class); //NOI18N
+               Query query = this.getEntityManager().createNamedQuery("AllCellphoneNumbers", MobileNumber.class); //NOI18N
 
                // Get list from it
-               List<DialableCellphoneNumber> list = query.getResultList();
+               List<DialableMobileNumber> list = query.getResultList();
 
                // Trace message
-               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allCellphoneNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
+               this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N
 
                // Return it
                return list;
@@ -107,7 +107,7 @@ public class AddressbookPhoneSessionBean extends BaseDatabaseBean implements Pho
        }
 
        @Override
-       public DialableCellphoneNumber findCellphoneById (final Long cellphoneId) throws PhoneEntityNotFoundException {
+       public DialableMobileNumber findMobileNumberById (final Long cellphoneId) throws PhoneEntityNotFoundException {
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findCellphoneById: cellphoneId={1} - CALLED!", this.getClass().getSimpleName(), cellphoneId)); //NOI18N
 
@@ -121,18 +121,18 @@ public class AddressbookPhoneSessionBean extends BaseDatabaseBean implements Pho
                }
 
                // Now find it
-               Query query = this.getEntityManager().createNamedQuery("SearchCellphoneId", CellphoneNumber.class); //NOI18N
+               Query query = this.getEntityManager().createNamedQuery("SearchCellphoneId", MobileNumber.class); //NOI18N
 
                // Set parameter
                query.setParameter("cellphoneId", cellphoneId); //NOI18N
 
                // Init instance
-               DialableCellphoneNumber cellphone = null;
+               DialableMobileNumber cellphone = null;
 
                // Try to get a result
                try {
                        // Get a single result
-                       cellphone = (DialableCellphoneNumber) query.getSingleResult();
+                       cellphone = (DialableMobileNumber) query.getSingleResult();
                } catch (NoResultException ex) {
                        // The entry was not found, so throw it again
                        throw new PhoneEntityNotFoundException(cellphoneId, ex);