Renamed package smsprovider -> mobileprovider. They don't only provide SMS but also...

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

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index ec8a9b92f168dd26cce8f8c0540926ee0f2da933..251994eaf3dd85f7259513182d6c19f1c439444e 100644 (file)
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ

diff --git a/lib/jphone-lib.jar b/lib/jphone-lib.jar
index 2fc3981fc2bb4825116a152cda7739fc56fc61f8..874d4e7abe6d53a399310fca0cc7c4f8fcbe9b41 100644 (file)
Binary files a/lib/jphone-lib.jar and b/lib/jphone-lib.jar differ

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java
index f30ddb5849d9be7d4decbd8a3e5c21055085a1c6..4f33d8446654935f795ed28fe8ca1be026c34230 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java
@@ -39,7 +39,7 @@ 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.smsprovider.SmsProvider;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException;
 import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
@@ -73,7 +73,7 @@ public class PizzaAdminUserWebSessionBean implements PizzaAdminUserWebSessionCon
        /**
         * Cellphone number's carrier
         */
-       private SmsProvider cellphoneCarrier;
+       private MobileProvider cellphoneCarrier;
 
        /**
         * Cellphone number
@@ -285,7 +285,7 @@ public class PizzaAdminUserWebSessionBean implements PizzaAdminUserWebSessionCon
                }
 
                // Is the provider set?
-               if ((cellphone instanceof DialableCellphoneNumber) && (this.getCellphoneCarrier() instanceof SmsProvider) && (this.getCellphoneNumber() != null) && (this.getCellphoneNumber() > 0)) {
+               if ((cellphone instanceof DialableCellphoneNumber) && (this.getCellphoneCarrier() instanceof MobileProvider) && (this.getCellphoneNumber() != null) && (this.getCellphoneNumber() > 0)) {
                        // Is the number set?
                        if (cellphone.getPhoneNumber() == null) {
                                // Is null
@@ -360,12 +360,12 @@ public class PizzaAdminUserWebSessionBean implements PizzaAdminUserWebSessionCon
        }
 
        @Override
-       public SmsProvider getCellphoneCarrier () {
+       public MobileProvider getCellphoneCarrier () {
                return this.cellphoneCarrier;
        }
 
        @Override
-       public void setCellphoneCarrier (final SmsProvider cellphoneCarrier) {
+       public void setCellphoneCarrier (final MobileProvider cellphoneCarrier) {
                this.cellphoneCarrier = cellphoneCarrier;
        }
 

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java
index d24cf739a1f5fd473a7a9cf9c23111fdf5a59bc3..63b07eb83f5f415474e2708e8234ace0a86649a1 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java
@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.List;
 import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcountry.data.Country;
-import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
@@ -85,14 +85,14 @@ public interface PizzaAdminUserWebSessionController extends Serializable {
         * <p>
         * @return Cellphone number's carrier
         */
-       SmsProvider getCellphoneCarrier ();
+       MobileProvider getCellphoneCarrier ();
 
        /**
         * Setter for cellphone number's carrier prefix
         * <p>
         * @param cellphoneCarrier Cellphone number's carrier prefix
         */
-       void setCellphoneCarrier (final SmsProvider cellphoneCarrier);
+       void setCellphoneCarrier (final MobileProvider cellphoneCarrier);
 
        /**
         * Getter for ellphone number

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
index fcad6353569c7b16ef22367b64d49807f54e29d3..acaf269a69e517e313270ca06e7050a629e5be64 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
@@ -41,7 +41,7 @@ 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.smsprovider.SmsProvider;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
@@ -74,7 +74,7 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
        /**
         * Cellphone number's carrier
         */
-       private SmsProvider cellphoneCarrier;
+       private MobileProvider cellphoneCarrier;
 
        /**
         * Cellphone number
@@ -401,7 +401,7 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                }
 
                // Is the provider set?
-               if ((cellphone instanceof DialableCellphoneNumber) && (this.getCellphoneCarrier() instanceof SmsProvider) && (this.getCellphoneNumber() != null) && (this.getCellphoneNumber() > 0)) {
+               if ((cellphone instanceof DialableCellphoneNumber) && (this.getCellphoneCarrier() instanceof MobileProvider) && (this.getCellphoneNumber() != null) && (this.getCellphoneNumber() > 0)) {
                        // Is the number set?
                        if (cellphone.getPhoneNumber() == null) {
                                // Is null
@@ -442,12 +442,12 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
        }
 
        @Override
-       public SmsProvider getCellphoneCarrier () {
+       public MobileProvider getCellphoneCarrier () {
                return this.cellphoneCarrier;
        }
 
        @Override
-       public void setCellphoneCarrier (final SmsProvider cellphoneCarrier) {
+       public void setCellphoneCarrier (final MobileProvider cellphoneCarrier) {
                this.cellphoneCarrier = cellphoneCarrier;
        }
 
@@ -894,7 +894,7 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                        this.setPhoneAreaCode(phone.getPhoneAreaCode());
                        this.setPhoneNumber(phone.getPhoneNumber());
                }
-               if ((cellphone instanceof DialableCellphoneNumber) && (cellphone.getCellphoneProvider() instanceof SmsProvider)) {
+               if ((cellphone instanceof DialableCellphoneNumber) && (cellphone.getCellphoneProvider() instanceof MobileProvider)) {
                        this.setCellphoneCarrier(cellphone.getCellphoneProvider());
                        this.setCellphoneNumber(cellphone.getPhoneNumber());
                }

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java
index ec3bbc0693a91fcd8296c0a6d8c3b08ef8dbffee..2eff8017d19621788e8359ed0d012957fbfca74b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java
@@ -21,7 +21,7 @@ import java.util.Date;
 import java.util.List;
 import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcountry.data.Country;
-import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
@@ -99,14 +99,14 @@ public interface PizzaUserWebSessionController extends Serializable {
         * <p>
         * @return Cellphone number's carrier
         */
-       SmsProvider getCellphoneCarrier ();
+       MobileProvider getCellphoneCarrier ();
 
        /**
         * Setter for cellphone number's carrier prefix
         * <p>
         * @param cellphoneCarrier Cellphone number's carrier prefix
         */
-       void setCellphoneCarrier (final SmsProvider cellphoneCarrier);
+       void setCellphoneCarrier (final MobileProvider cellphoneCarrier);
 
        /**
         * Getter for ellphone number

diff --git a/src/java/org/mxchange/pizzaapplication/converter/smsprovider/PizzaMobileProviderConverter.java b/src/java/org/mxchange/pizzaapplication/converter/smsprovider/PizzaMobileProviderConverter.java
index e5b58179ab091668793b900fe3278d8f69c61d01..e72cd1784b2d45bfd497ef5bc6374cb42602992b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/converter/smsprovider/PizzaMobileProviderConverter.java
+++ b/src/java/org/mxchange/pizzaapplication/converter/smsprovider/PizzaMobileProviderConverter.java
@@ -28,8 +28,8 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
-import org.mxchange.jphone.phonenumbers.smsprovider.MobileProviderSingletonBeanRemote;
-import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
+import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 
 /**
  * Converter for SMS provider instance