From b2ce3db57eb7c64f7b856e24d614556c3a57a048 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 12 Apr 2016 20:51:13 +0200 Subject: [PATCH] Renamed package smsprovider -> mobileprovider. They don't only provide SMS but also many other mobile services. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jphone-core.jar | Bin 24411 -> 24465 bytes lib/jphone-lib.jar | Bin 1640 -> 1658 bytes .../user/PizzaAdminUserWebSessionBean.java | 10 +++++----- .../PizzaAdminUserWebSessionController.java | 6 +++--- .../beans/user/PizzaUserWebSessionBean.java | 12 ++++++------ .../user/PizzaUserWebSessionController.java | 6 +++--- .../PizzaMobileProviderConverter.java | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index ec8a9b92f168dd26cce8f8c0540926ee0f2da933..251994eaf3dd85f7259513182d6c19f1c439444e 100644 GIT binary patch delta 997 zcmcb;k8$FDMxFp~W)?061`Y-W$CVR#G?^S$PBdS@WW93YO$8A7TN6l5R%0{(Q4x%` zAZj|JJBWI~=m?^encM`eSN3=?AOVBPj&>?+x%o+%IjNHuG6{p!ZDXq$caJ&th~&7W9vk z+RVX`%fuKwIYCkxrgS2Y#O5trv5d@48k)$eA4(VkwIdX6p2)L+n-}Ev3*KkkJ(w66 zJSN*oR1?xRc_NR@=1|ENMv!-IOYH>H(`2^tgZREWcffpYJyrp*H-+XF3ib#vFo3W- za!Zht|;2w}4RtLGTGC8iC{4v}Tm>eeSL^uFN zC+9_g)4+lVOAzliL{K);7sShn3M{|Qsi?6ZBIXzlP0pvH7c7jAt0!0_e zfJOOYr9mRvu`*1NI$+%mI;xX%qj^B0^MRt~dSKB9v6^7lqND;8%kAty3Sn{MAEyIW qkBB)21{W0d`u@o355|G>=bJbgrZYi62~fxxa%HnKFbG6|v;hF1&@Cze delta 977 zcmaJG}LbR&Ug5mXTC zy)en)cOfJZ-F$T+m3AG3P!|<-QFPH&KNe&mROdaq+85CW=N#VWyw7`{_j}&T3Vpdu zEdvKNS`#5gLaK7b;%9SmWuMGKa^-~w_YFVap_T5%BTFN!D#Hv-Vf30N@bIx7TUEZC zCUsvBKGI!|@ss1DW2a7^I5sl2=g%{ovc$riseEN`n4o4BBTs+Y2*DLcD$HA*FzaZ9 zkp2OUK*igl;l&{1bU=q;4%YNOjFol61x5#8%_Ks+Rvwy)R1@3nS8VTMfBvoTG3(EBt-TK^_@%0_@H8 zVdiXZ2*J;}3?2vahyUUBt$c?|?KWjQG@E0^NgH{I-DD6iw?MdH#xm)G#NILZM12s{ zHNZ^4?!g&S4MN>KElfSqiDaCMiDA1(WgWM#e)<-s+8kTSCTKP{ApzgKGAyxG7r$u( zNwVRah<@kjMM6`#>7iP%;7y?@u|xnXT@AY7UQwj4a?sr_%3Di*AzJ0ON_1-! x6NQy$O93HT<(n$m*#A3u(?+`+yF7nqG4ftZ2(C^QVIE@TwCSjUkhep4@e601CKdny diff --git a/lib/jphone-lib.jar b/lib/jphone-lib.jar index 2fc3981fc2bb4825116a152cda7739fc56fc61f8..874d4e7abe6d53a399310fca0cc7c4f8fcbe9b41 100644 GIT binary patch delta 345 zcmaFC^NWWkz?+$ci-CcIfx%_vL>^5h=am!97ckkboOn|KME=$Ul9SaK4M0=`qphIr z${r5}Bw#T4BcqB|Zhlf`PHI6>epzNpYLPy|P>}Lf*7XKE7#SEqI2@#$4WfLq1XC4b z$mGdPCNP0hOwEjell_<#VFD6NT9fB6XEC{~oXo*u33S|KXBG#LQ(9TTF4_(h1oA#X z1Wj0dXaJ%j7;S|n zF6i-KKmxi9ljB&GHHveK3ySi~GE-8E^btma6vt*J_-tZiU;yC|uwrJQ;>mJMRg8g? zXEK>UdE%2_G37A&O-^7{1dG%$Phq;fV6q5{CD2Ke{aGA94w%RScE@3$AdvSDBIv;C zD~RE$$@5r^%uyZ1$RxrH@hPUW5FT36cx`els|wUr24Vr;tZX1z4j_zRVqo~i4B`O* DQ7}{i 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 -- 2.39.5