From: Roland Haeder Date: Tue, 12 Apr 2016 18:51:13 +0000 (+0200) Subject: Renamed package smsprovider -> mobileprovider. They don't only provide SMS but also... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b2ce3db57eb7c64f7b856e24d614556c3a57a048;p=pizzaservice-war.git Renamed package smsprovider -> mobileprovider. They don't only provide SMS but also many other mobile services. Signed-off-by: Roland Häder --- diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index ec8a9b92..251994ea 100644 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 2fc3981f..874d4e7a 100644 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 f30ddb58..4f33d844 100644 --- 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 d24cf739..63b07eb8 100644 --- 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 { *

* @return Cellphone number's carrier */ - SmsProvider getCellphoneCarrier (); + MobileProvider getCellphoneCarrier (); /** * Setter for cellphone number's carrier prefix *

* @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 fcad6353..acaf269a 100644 --- 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 ec3bbc06..2eff8017 100644 --- 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 { *

* @return Cellphone number's carrier */ - SmsProvider getCellphoneCarrier (); + MobileProvider getCellphoneCarrier (); /** * Setter for cellphone number's carrier prefix *

* @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 e5b58179..e72cd178 100644 --- 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