From 9f3172677e8cb8641e7d1d846077cb6c9970b0b2 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 12 Apr 2016 20:11:52 +0200 Subject: [PATCH] Changed interface (POJI) name SmsProvider to MobileProvider 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 24369 -> 24411 bytes lib/jphone-lib.jar | Bin 1622 -> 1640 bytes ...java => PizzaMobileProviderConverter.java} | 24 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/java/org/mxchange/pizzaapplication/converter/smsprovider/{PizzaSmsProviderConverter.java => PizzaMobileProviderConverter.java} (81%) diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index f3842ac699566b448d005be0eb2aee5a71843015..ec8a9b92f168dd26cce8f8c0540926ee0f2da933 100644 GIT binary patch delta 916 zcmdnEkMZ_CMxFp~W)?061`Y;>xeF%pXfn-NFwuMglgWaKHx)qSZ%rUMS&h*EL`5*# zGR<8uc{-yzi1&ce5kx67xq$?;nLI(fZA{icYV&8NhfKV47xZ`puCTrQUyy;}|K^9R zyo`*tlQ-%pO*Y`+Ve`#T%FIdKtiT?`%os44QBt2DA`(!PUzVAYT4X)>fU?NuLtLJW z%=Q|ZXxb**^C&SofONsknZnc0%&0$EML+>2;x2HTo!12DgzL=>Gn|+h7@Q{SOH>nO zn6czUMvyO#N$mvFjWS#LL3|6HJ7B(;9;<*L$alf^aor693=AObGI@fG%H{w&D^^Tj z?s2}v#3ksMlLPVNpPIiv~ zM{Q+alQJ$P9sW^FEv=GP?ix?TE^HM-j^~vw01t<5#2!V}QztHi2DnA1Q z2%8{GU|7=FB?DA!Hd!l%M;>GsN0*Fs6(a)!2)m&ubeyah8w#?bB36b;UJq<>pBd-m zL$M0-7%_;VQ*AP1Trk)fDDi=!hQl9hATT{cgWNJs8my&t%L?1KEDQ`FY>A>}eh^TL b*yKA*Jd?KtNluoI=iy3XXJB|74pIdG6fYGD delta 796 zcmcb;k8$HZMxFp~W)?061`Y;>EmJ1)Xfkb{GSPei(}pP%Zz_Pu-Bpe z1yR!(-9gj?Mn@2(%;W~5vY9+V)HWt-Ahr23(?cfS4O4nN)^XjF{~*Y~@L}^qR$fL% ztI3IyN|Wu~d6Uoa04dqb(fv&%c?Y4 zC8!nTu+>2>tV~;`O#T>d35=@AIuQ;)(aCuc;P_b(VF}{hh6u_=`hs{lk>McfXk;LW zl86ceQ3X+vAnJ6KH&`$_5jCejI0NBh53IG5A diff --git a/lib/jphone-lib.jar b/lib/jphone-lib.jar index cd5aade5b6e0df051f37ee11fd7dc2c7d69d4b2b..2fc3981fc2bb4825116a152cda7739fc56fc61f8 100644 GIT binary patch delta 272 zcmcb{^MZ#rz?+$ci-CcIf#LRoo{78~%(sA)#eC+8KVxS>MjJ3a zgV93}DDDxPnc%aDk%0k(LneP@G+^`1Ps+?moh;9$IN6m+luIx%CkHB&$fV5}IJuX} z0jA~xlN7reT)oU>E@pE^zsU=jbYTkQ*`z1;GG{RZT{rm`vjxa`lTBId!7eCgfw*WT liv^hf1S+n^>I3GNvPNKW;XPJ6gyFhe5ljpWznB?-005VFT9g0) delta 271 zcmaFCbB%{Lz?+$ci-CcIfniZj*F;_o=7m7YVm_FPF=0|*CB{>W&+9GqJ`*^o_fvImnWJ6~c>4v3%5q|N9zc`}oOB9IqQ zlwX#al3HYKXU)jK6`WsMl$`38nUl)MpbXI~Gg*w;oY8x-AG0plv_|GuW}y2fbFx@~ v?RH_Y2h(jV5I60BihqWRo3i?V */ @FacesConverter (value = "CellphoneCarrierConverter") -public class PizzaSmsProviderConverter implements Converter { +public class PizzaMobileProviderConverter implements Converter { /** * Logger instance @@ -48,12 +48,12 @@ public class PizzaSmsProviderConverter implements Converter { /** * SMS provider bean */ - private SmsProviderSingletonBeanRemote providerController; + private MobileProviderSingletonBeanRemote providerController; /** * Initialization of this converter */ - public PizzaSmsProviderConverter () { + public PizzaMobileProviderConverter () { // Try to get it try { // Get initial context @@ -63,7 +63,7 @@ public class PizzaSmsProviderConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N /// and SMS provider controller - this.providerController = (SmsProviderSingletonBeanRemote) context.lookup("java:global/PizzaService-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.SmsProviderSingletonBeanRemote"); //NOI18N + this.providerController = (MobileProviderSingletonBeanRemote) context.lookup("java:global/PizzaService-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N @@ -85,10 +85,10 @@ public class PizzaSmsProviderConverter implements Converter { } // Get full list - List providerList = this.providerController.allSmsProvider(); + List providerList = this.providerController.allMobileProvider(); // Init value - SmsProvider provider = null; + MobileProvider provider = null; // Try this better try { @@ -102,7 +102,7 @@ public class PizzaSmsProviderConverter implements Converter { this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: providerId={0}", providerId)); //NOI18N // Try to find it - for (final SmsProvider prov : providerList) { + for (final MobileProvider prov : providerList) { // Is the id the same? (null-safe) if (Objects.equals(prov.getProviderId(), providerId)) { // Found it @@ -128,13 +128,13 @@ public class PizzaSmsProviderConverter implements Converter { if ((null == value) || ((String.valueOf(value)).isEmpty())) { // Is null return ""; //NOI18N - } else if (!(value instanceof SmsProvider)) { + } else if (!(value instanceof MobileProvider)) { // Not same interface - throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement SmsProvider.", value)); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement MobileProvider.", value)); //NOI18N } // Return category id - return String.valueOf(((SmsProvider) value).getProviderId()); + return String.valueOf(((MobileProvider) value).getProviderId()); } } -- 2.39.5