From edf9c387789b34b8062883dba8cab3508599130b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 12 Oct 2015 13:50:33 +0200 Subject: [PATCH] =?utf8?q?updated=20jar(s)=20+=20fixed=20method=20calls=20?= =?utf8?q?+=20template=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcontacts-business-core.jar | Bin 47982 -> 48106 bytes lib/jcontacts-core.jar | Bin 19902 -> 20750 bytes lib/jphone-core.jar | Bin 19613 -> 19489 bytes lib/juser-core.jar | Bin 16696 -> 16710 bytes .../addressbook/beans/user/UserWebBean.java | 62 +++++++++--------- .../templates/generic/form_personal_data.tpl | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index fbe26f77d5b6b551c3c196627875d93f84c8d915..bc2ca161b5dcd606d2dff54511b93357bd6fde5a 100644 GIT binary patch delta 7242 zcmb7J3vg8B6+ZWd-OX+mlO>Q;LU;rNNq7YEAmNz=^C09M9>E}x7&bfv1i~{2o5)K* ziSVl+Mi3eXn8DVt5Kz%V9nso4;Eb(f>!4KaYb>RmX***((|+gNyV;wtvD3`#{qN&^ z=kfpNKj-`>cmJXP>7Tm0vLvjZizu9^X5%4uvOa&~p{yf1?r#m}>)(=bRq@(X9%{7$ z9!_dAdH6;vY$e# zbj(37t95ge{JTf~OSjt^y&D>qtGanH0}Ar;zME$8-E4kW&UaOmqR|vJF=|S z!cAWy>6Ael4Q--KnnYog)j-)ac_C?DnnF`)nwO^23=n}k$l{1-D4ue0pI1vGDIO4D zXVUOu8bJyCN@pc3v?lukD#RzSFS4-r>8z}UxHscsW}F&e44c3s4NB-#BFb3wFAeBl zW)aY>KW4%d6NNDz44`(!aAseL2h5TAIYK_mj8s#sx>uT_rK+mRL25$TSnWx*sH{+H zmFG9gl5Bg(MtfCjMQj*WdT6OF^*0#XFjg*6I_o0_%Z_{v9Zh6m=~>bDm|KCXq#vQo2a%|dTduf|Ax?S6z|YzlgayboI~BL zbZKu3X0tIZ%3kHM{S=sY8Pnfz5{~`^Tc^c2mzCSq?R<+GYC{_olE|AoA9;bHS=zRF3>n=+3Y+%%Zt+%$?tbCknf8l}5wGEH%FTyi6r%;Hdo$5Q@U z&UaN*t+eTx2zHOsA`W(UE{sywWm&Dy3wAZz^+{ zW=Pj1wi<$xp-Bz|N&xgCpgs(_{g`t;BMJ;eA*-pg)!kgXH7E|P0Vc>PeE*U;-h&|}qbtx*#f$BbS8OAPNE zBmQW_7aM0Ee9?Gegm%s1xHUmqpU@hf>@sONDlVoapw_64>KO$Nsq#!@OSwq4*YQG! z;|E0U3Muk2YGAOsRu-Gdv_`Pqhn=_IBG%q5*3OsIl;``90@oHP%R?IH=xyB5kYZOD#=$Jk)kf@Bi#NF}mc9ZVj`yL1;qMx)L=xdS zLZY!O;i-@!S0QmQZR=sHrDq`JY#&mLeWTGDq?P-Z(b?P5^C88qMV>LhK}&Ox=A1@M z4bFKdG`Y}+CdRJRXgxKF4HGJ@_I8C7yn!|fZD*#{f8K(Wt9?k}!in8>6Kxjc&A1rx z31eei3n^s_aWZ2U51I$-B6?f*9^~HWL#`1WI3?aU&+4NsF3ZY(7*dCA#uO`GmDSRl zka(*PiAId!geeLr zf-FZGDuqXp*bR^AQ7J@qk;kYMf`KvF!phkl=$xnt_D}(r3VY#qI_iOaGVYfQ$fd#o zNI)ifhMqNVtf#HgqHT}Nd@Z#ZTlaUf`91zXnPnACR`y5o=WrFs7D5x6~aVHbK?|{ zrBR0Z>zovIv(ber0J&77sdzC}*%!?V%Rtq#cu|b6AH_G|Ff&ZD^>E|#GMGksk>mMP zVZ>$BJ;bRwNk)xQyfg;o!Z@Vn*e0$Picu^)Sj)MBFFI<5^<`Kv*EzatRSgwz-st zCrxSzrsZTCq^**2BamzjTF#33s5Llh6{5-j3LLB+ZYJ9xoB6_~x5!yk%wS2jOlu_D zg>dIbEn@Acc34GLAB!krjT(Hq;$$0?QWsK6DV2#7PPRcQUPx)|LrNgomQzIt@m`v?SZ04o^UbwSDMdc!-AWJ4dwVWE&K@A*9H;sIGWEk!&-AQno@$ zb01Q~oe&;oN>w&p-L4zFBq$}>f^v4Rf)j~n0px^9oY2h(p<~V1pE(e4)dp`g3NpU2 z1_FOgeQcPA+aiBIbnea(VE8v(<(*DYEwxT{&>gAXSQ;7m68As$I_T+e+6Tu_ca|pN z2oXhx`Jx>3ybI$C4r!G*=%^eaa=fSdeg6@{|DP3C9co%?q1LGM^@-tdK|U0esnqqE zcG#s+ma4B!VlDh9*OzJ%2ktd-92nMsYI}slfdn)#@@rAe7kFg{aDRebc`zn`>u287 zLz-~n7+Z|PBFblRLH^1ygYy%9Niqp#Q^LbcyOrAEa_R92Wd8p?@qr#U`aK z(?@VXWBLYKs!paws~hPa?I6?HG?ccD>Rx)HO-fXuPC~$A>SeTCs4Fr&+EJ5w1+4`2 zK(%DBBa(GC_O+Cjg5~2AW6_Hc?03MPGO?>^jbO7gJvJ#51;I@wMm%BamQ(3a`!ikI zc@wo(^y40aRiYGkf}de(%iRaI4c!FGY;>7ixD&y8&z|J5Ny#Qyjy^1VBW)7wtt}4K zKFOtBGf|sqi=f)7tg@x_61?FW8cMci!RKaqv=2?}HhNO9JF+}BDV-RRA?|`*Swq_) zmp!0I(te&fvyPj}2Mc?6J#++&d=X z+)uC>`By9(^0}7uNI9$TchG@wdWJXR=PfDNi0D!B7aIFBeu3%Gjz=T zjY?#{*R_mQZF{3^(z#S0Kl}ay-e{xo8{UMh{7^0S8Yk$K1|;Tqej4jV(i{&0 z2*IQTT9$mu0%Rhnb*9E?M0R`z^0CfEgSy)m=gX#qVkBE(tFv+@2Np3+mP?}C!e^Hc@Ur4 zq_c&kgII24E|W&4lCBoIlc5`#M*)0EfW}J5`BGYh6&cos+AG2a=SgW6a%c%QD^G#P z4~2(OAIa%acyLSdj399&1TxWf9<;9sZ6K)NeAnHQ>=as@;<{UsU7)`#^nsdZ6Fn~U zftKW3g4t|p#x2Qfz+7jH(^xpPBvo7aAcfFjX%W6BxUEz#vf6l}DlcUyj^1or!>zxyL_$^*yh`&(6!^#Wuc({I{nukID`8=%l&*kA= z{{kN3FV^s|>0%`hA6%^CA?4B%9u8bu)$2bw{krOga}iT}^7PsS8xjAqVP4>`qxEjK z>eP}{RI&T;WV?E&%PsWXeNx0&F2e(V9j%Qsg#Oy>Xyuy`1O$&wgeVgH>u4Q37l08s zNF}Iam))%9*~>%pv-RfN2tL@Te_tLTa(fh8K`zwMdVQ$?0=3t&D+8F-wktz)f3x|; zqYgIP)#@vT2|dz84^}r?)E)o$!v|y4Hq zmN(>drt{L2jBF?O_$J_q6=`$;}{(|-Z? CYT2a# delta 7690 zcmZ`;Yfw~I67D+W;Tclz}F@E^yI|91E)OPvF}MBzlI8;|=YI-YGjp8d1~_jlv@`pZOIRh%)Mn;K&d zH_schxw&V|UScsL#Ml7pV`ke?3on-Y|7eKY zDvWT@yj~d-pd?`U{5}Bi-83c=Z5$+FZyBpC$323AwqDzv>O-ss6<&_>$C{txk9fl7w} z>mYWE@MhWq*P_&>?S9t{2)`l1TV?hb)MNriRM~@fQzW;Uu;o>5b$`3pbsN&}OK@a9 z!Q5sE&eR+p+imf|M zTWc4(BdpMW2JN4Vzj}fiv`gz4GPr-Rz7RFLwVLR`Y^RQ;9>lMq=^NJM#AH@^J4dQx zU0&OCOHqwGM`!ARY^M&9eoPim6!h$a^;i)5>414-XULxa=Co)A`*p{zDGR`03&3C% z!_RqXC_U+>--pvtHsY8EG}eiW`Z7P&@1|#&)=sYdGTS|ww<+6C5Mt86urjCiQWG0aE@m$a#v>8tWSmkV%cu-3ev2hOe{I}4>!J!c# zvoAa0H@zs)W;kfRdbBhywNyJLF>!DtZ6c;bId@qAa1QaN(h-BI_{BnP*Kk!iHQAV? z{&8ZM>YSPaBD~)@*Ek^0OOGeH4r5*(QT`J#P7JA9k&$8?lW*VR+ev(TioXrSNCVfv zYOPg2XN)sWaUbUzs#EDXQELAQzv~S8o|V3OY=qv>cc}XKgx`2k`md)(>0cY`j(7+W z)hpv7Brl1i9ycbjM@5oJtRT~CyeiU6Q;gP<>34NQrblFC{9qZg6wm@B#_BbR-4Nle z)Fi_9A$$|U?})G-WP`R*vj8%QS(3L!vV~ejl1c1Xme+L$(jSPl9&3ZPo92F+VuX0#{p6-($a9Wih0 zj8;~>Z}qNC!v_%!SLutYvKqbE@Rqx&Hk?-Qq^a{D4_L{UdcLgUOM{zMd(p0O(^@yJ zbJKbuv~L!zG5V8PPxC`V!<@NDv(n}l#^zGB4@4Q|19v3)z%yw+@JFUW(^UHIX)a0A z)VUWDRORl0>i!MCTDEL)TRL2e#(zu`JwU^2m=F0f60hRwk$jC7){58JRxI)@jso<< zS@1J4r;JC-t177hkI6I%oC0kiyb_vXQ|VxfOtA@q>Y$j1o4~sQI~96?m|;WIU~s{d zViL^4eF9rJNgJKbFgaQUr&I_AuG2Y-nlJ-~>9sRSh)?GlE)ZY=z8J!Q+;?yJh>cd? zYU!&dg4gWJOPn)Grj8B38^!}FF!QKHB+u2_9a|X`Wj<1HM(JD-(`KQp0m|ACD0)N<@Nzjz_H)kN-?n?TyT2_#ffrJ>_*)TckLoU< z><)nMK?qYe;Vg6I^d>*;q*99k3$~h z1~{ojs%Z_0$aYS6@vLx8bJJ69>JoA|-SEPI-;l$G^*7x}(khr7(5_OOwkC#S0&+4_ zs&2PsAccWP24$01aJXzg=ts~ z91K0NV{y+pKr-Gyd>*BgVA>)DkO|3O6QG4@A79JlYzLL)HkES-WH}5S^kk}(gl7!uW!_4PK_Lmp31^i4<;58s9?#m0= zLOBbRb0JVTpJtSGI8CzTj}_4pDLq}z2SsT_Vy0tbxd)o^Tt&1TIE4pB^Ad3X6atsa z6pV`#si~_s&gs|=%p<7f?`uIV*{B1pe#*4_+XLKdA#n4}sBS`{2p>*V*@OB

?O) zS`N+3D*GgQ2OzgXfar<}pNY5icMiV!^lo7J_I^;RrKz_Stn>uCzO2CXLopar$0=p zcW1tu(taH~!*%ud_D7=RYfND(RAfhtdgf?{6GvY)>evHCDY89GM(!6^1BOqPDCmMupq|IsVtf;- zJrm(kGADhO5LX5>Rea}&wk%30!LfE6YjLnykYWv-bLOGt1vsMtTXjB8tOHnK0ZYu% z5`|h!XKnp}ivqxN`T)aU6GG0hd<=%tVpcj2_a$mnXI$!hejFRH3W2eSm=a~$aEC+; zp2Sq}i%KoSr9O-SuGO-)@%Er6RtjcepdjW#romZ;Az23Ze%6ppyBK6r2 zAbOD-*qk^??>~vmz0HEX6BM>puMo^YYZA%cX4xS1+z>W^Q-RF|7jaba-ey7G4GOs< zFnzGMStwH14S}M$i7PX_xAphbtovH9Uj&8KyBZ5yp7L@r>%x{LQWp+k33d)Lu*)vN z=EzH+BPX`j0#3F`d3s63L%f6Xh8n0L?}HHzRAZRT`Lx9)WbiYWWb{p+{q)zaJM!z; zd#C>y&cBYmcHyqUZTlauN}F+MC%;#hujb-sIrYO;{!LA#bfJ~Hw;2Ec diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index b977044176df140d0a842f3cd87d2d9913325158..30e9640892d5fe2c8dbe696eeb1e857b2d0c5c9c 100644 GIT binary patch delta 6791 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 b=O~VF%Lv8M4WyXOUJ`pQ4td{c=F$HF+VG|G delta 5859 zcmeHLd3+Vs75>h=yf<%|EQF9q3fX`_!jjDp1Bi%`E%3swLKI(;$D$_VwpgX^*1A?~i>=z$+Pc)W=giCtlVRR}{j>S~a<@6>eBU{9 z-o59}mABGEH<2;F*_ROpg21NOR-;0@G`6+jI*rHAlt}wQ1-EKA)k(LICQG-4rc3uc zP0iXAn>+L1^UJe$>A)^s6>CXfWK~@4(Mo)g-niPHU+T-{`4`%9UoOw93tDx3RXlOZ znuOZkROr)r?R{TyPFU8uJ3HfD2|}0`$7d|^@uIpsqs}MugBi!0bH9It%ga%MK` zoZ1;%v-aeUj-GgLFCn|vy^_f?Gh&@<)^3Q#I^%>)mT=AuhIqt3+h;Ju;h}R%d7hZD zrl&VyiSx2^8e-{K;S^tprC$!5=*!}Hi9XVo#q+2>%E#8##d^89ewV()TsMMC>sc?c zDA5y-vvaK5KNhc-oYxUc#5+u{9TT?vV6aSF?K=`AZIHw{_lUoI&nQ6tt5uB3)ZHzE z)YwRNM0jXBK`1{0*IlBQak8fj{! zsgve-Y3ik!C{2SjCrHyM%_M0iOEX296Lp%Z(@CR)G%bv2bh5ZHUBFKXanmFWP7Tux znyJ$)oo1`6j9M+&rk*rf)uhY?T6Vj-CUZRvRztG(1vA>$BsLIo)%neN>a(mOO>b9a z*=1^J_Wp?8-o36X(Zi2NsvXCTRMT_j$>Ya!X3jL?19C0XoUVwaaxc8nk!BHVvZBjO zy3oql`sljOws;TW1XUV1!N-ZHo*6WKL}=yFTnn3HTP3h6-qj)U6V%2bCF&8_q5^~P6pnbv&(zifoN)ri5R!z0}nbggLb?n=bkIqf3n zt?urMr&vs97G>&9y^ONefx*!sfnGa1^>wLq)Gt)0=M_<~FPZla1uEDAr{w>C*8j7g zwK@_U(f87@`zUuCb{p7??-=+t+6^Spu5Kx+Pj16Q27ZA@b(&*fFE#5l*PwY6HSi*S zZs2$F_-PqEBcngd=!lH|igygWi}wutOx6y_+OP0y0|)WAfx~#qz#s7^1JB|)1JC0H z1NY+r13$%s2Kuniz|r++{#E~zcvMhgu54IfJLcY_v6+-}Dnofa9in3nYIDygSr z3l@X0B#xyx4VsYQ=>q zmLZOnv$2Xr*dtpcn`dj->_W@rYM!#ENLpYcS$Qo#?c}FjadhLnl)dxCR1bQ^s3vi- z?Tz8tGX7`CuUn9$npzx$l77u#9>XEas8HqvnILi5Oy2BY=B|@G1#<(jNT zY`ODY7GXax#}!PJ)5z8k&yqIXE5+)Tl=qxvwoDH9wy~>IPdWYUr;Z%CHkBhk7~l(M z>9LlsOIf-eOH*$qpQ-g{qP!0?^RDMrPH)?U<5k>bnPAdC%sEbypOa@ii*3VpZg;3X zBS$4~<+XhHxqSi|ID`;>i!3~a!MqvV#;cXQ3glrYc5yEwE1EKrcc7VT@|u07<=tYL z*Xp<@?){bbgYMyh27wBj3NNtH7ftg8h9za&C;9D(1=T)k&SFt00#|~(&G_*avUx`; z<_)8iH>G;slN#_3(};uxXzb_Mh&ym6Tlo>M`r*qSBr*9h?lKKi`89DdJc-=|K4L~6 zvn!u4(0?!npQ09@VG6#)419(8?7=efp@TBeMSiTO04^on0lKLlbdwEAvU{0GpO&9v zhPMy_fCfXSAqY`Ea_BhZ(l8WIv1zG zqdX@6_-#ydGg<4&O>pi)I~iwJ8XT)ABK!ewdU0-abH0OZ-I>OgRXma0A3(`t zjw%5oafTuSVbzyP0Q4*tT`M45wF6Nw1=TUPBYT?yxk& zEDv&HgjzkM(Ja?D-VrTxOOE**$uUU%?cDfLNNtUl^4H1XV&dtRVcL6DyfVhT#D8sm zuBqPdEBo7!(&c{V#=Ob>!c~oab&0Jo!1)0RhnrYosKi3G&MH%%%+CqjFk2-43kPaM AYXATM diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index b8dca2dabf7a76459a987f1aa219cbae8f80a21f..6da09db142b3d85355881e06c93e869b931e72a0 100644 GIT binary patch delta 4185 zcmbtXT}+$j6+Yi*?9cwWmfOsM${KL$)vLLh_yNlaqWq*-tZiIzC%!xE5)Yi7wi_lrNAn)?(nW4A8I*F57}K8uYS>*)@Z{V$gMi z7BinZJM_Ko#q{!(#p}sy8aWqI%NJh~Yf*pUAde<)r&BR35A?IbX>N5}BuR8Zc zDCVUq3VEqX^ybewB9sZ);iE1c#mY%0WYGlpU!W(4`1?DEKTT7l74*^soncvGrRd;!>!8&(F3;wzduW=@ zg4#hd@_J@zPWI=deMPvw^VkJqE>JQ%uxF>t--~pelgq#SHQIBWT%L6O^8UD&Xk3I3 z^o!T4lbH_>jOecanF%tBB_BH+N2pVbS4_H&&}EIHB3T}FdkK-JQ6nayOhLe@Ie>q0 zpt5{#3V>}z^3ed6DB3o0qB2y+p!DP7p&oEM1?Wxyx|6hzP6McfB*CyQ0#sw-hm|G1 z4vZaGgK8-Qkd-o2fX-lNR`MwTI++jre1+YT{zlke!#WjMFXW_UXtI3|!o@30t7NBO z<$|PFICN!Yv#fovicxkw{`kCk#Ij)#Hl%m3A(*v6 zA-_#{BPG`@mCH6RbJKE@6!ayK`OMoacWk%(c23KId+9LX*=Fn=7`tLqYj;=;iU2!o z6q%Y`{aMg{Eq8Nj;cURP4`X&M_n_sq9kkR@y@XdkjY-ZwM-G-)E(zJVJTk!iEyoxc zpI7xLWRx8J=MUC^j5X0+eIk09OXswQ_Rv{wX1JNq&_zR5 zVezT6HuJaYsV@MOSS)#6^cg{s-{2AH>io=1Z65=yL##D0z!p$3L~~t_(~I0Wl<943 z(;T%x*4LZLibH3qk|O^#kE>p#Wm|Oa5?9BR z+GlWO!}e}))rZUm>$lnP3_=vpwx^!~08KI5u>F3s9ox4N$X~OCq#Z7Y=rGtdzIqnJ z*lxB0`Hqdtj_qL@kz5JDjJb9Lvg0VaO#9_Q7SF;HAhYG2XFvx35wbiNXRcx6nCZy- z6SAMgvx2j|j_j{d=@QB#7e*e~YuISKvhU|-Ja};PzaJ0cuy{LBEZ%ML1gA|h=%fc& z9Ovc~Hxt}U8g$yADTB^PNV-~os+qp@D~q?TTuQytCuYnh@%T`s(4&iAQ2L%kr!;Tj z<<#<6mRYQoMZASewuOTFmdvY1OEgC_MKV8bpHWp%iU;RWIL`8}SsC0jS|E+s@4LN-f&)oU~j5nHE>N!nCTKO(ERQNcxR(rew3; ze7uc0+&Yw&EhavqY{*+`XLG9URBFMzHRNqJBw@q+4mOl$ZBT`KtD7EC7W$SA3ps62 zm7JMvHgHL`{O~etxVD20L44wJ*b*G@1Z0v(b!gKJoq417Q-7prf2@rS+k2s6}P%S z;j%Z^^HCmp5glm9_p7)u(8IILfc$9v1dEsj2Ib=X;BlTk9Gv3LjGyFgE`FN3_u|vs z6$~Zh;!sjPGB>|q#qWlaywNyZs{f`)d~+~}Z`n$G#}-!bWAr=y?nr(Rq2sZ{mm-5liyGwo{khsF`LyL zV$>&;612YhhftQ7OL0;CSVGf_92=ka+mg?Qa`fw~zmJHI6HUlPL3tSKDzK}GPonN%|RfyG5zw2lHEc3qsEJ#uS delta 4319 zcmbtXYfM{57C!gd_}Ui(!4N~k%Y^W$UUt^1H#Rjt&2srrz1rL4NrN@%54s=89QQvdbGerN8*zUCn% zttHRgJ9Ex=&di+eoVhRkO?mzq#eKBTX4i?FL^*TU-PNjR?)tvJa{IN9+n=h{oHmL8-7ZrVlVZmJU{nI~;Qx*(P^Uv>=9utNLAYHmPW>&X&h-tD4jPn~!* zYhtN}Y*axi6)jRFm5tF(s=`S1B>5?Df|Mz$q208H$7_ioS4Z1PAupbb@m7y#IavrL zK#Biqv36154f2OCDzk9L4ubc8bL zDDA_D&(Nc0YQY;2Xg`$$m7hZJMui3zZrTZ==eabtlLXfxMl=M`VF~Isgec2ERVYlY zu+u2gvkO|-8;2A)VG-6%585zGatBx@f@g&e(jlomkzKHq)Q(AQuQa`;O{7yhbwFn` zoKEV(4DVMhdSe~$lJ*t`R7wIrWN|CabW5Rb>VZl>Yqvt27wq7j*4A&s9Hr4&i*Js^ z-a05(p07f^beKI6H_E)06)kLPxR0VNyWXz4-tNP&`^Xk{5w*a8`x|#aJQ>m}lZ*fT zralbF#W#vKLwV9)@V)^(@45aF*+)Ij56JNe-mDvc#bSHy zL^qtH4v=GXzYK_5IR))W*RNV!SyShLI8KAm*#LwwFc)p3&~vSU^`|XxM(6=jwjG4l zC~Lv_uo(z0f8bNn->39j>sC~0fpR6{z(r#O_G1a-QvM{Jq5yBjgbe&#JUxhMFg`}7 z%?E4ljenJ^s>q=6zk4ecnL0~ml+P}^iTK|jQ)g{{Vbd(9#1k$`r*Upha&wBC35_0f zQcMRAPir)(W9W<~Q>#YP@s<3CH)PH2n`O-nsnS>d$N1X?$8EMIY86_^5c(N0Q4(^1 zc}Qg{0#AB$uBmfM)8HOIA5kg&SboyoH&}WX9_ioUwq{O&PiTG8Q}=+*mxHX zER#kk2S>3VqkfDMSQVlJB3fFo6vnd+W3bN{nA;>{F{ly1Cn0)D0$C;q*hFuZa>8(tf zIh$(6w9;W(d2*-K$^}@txP_H6(~6M@o5l6|g8HPDM=V-;!Z+Q_d}~RoSzHKNeY?D= zZ${E;=7eF{fo1r%VzFY~fl8D{BSj6!z2nrF^zF)~RyesB$DERq&D5CO`KMs_>K1kb zsKLzYPGl7WE5Yh>Ol#Nsq#LwOdQ)M+awT@kg{*WO7&ZhevzfCC_ajL99Hc7e4=P+l z`WQ1GQds@su85Ms7ol%{sOq~7Cf^qSEgukl`LXzO6~n)dl5t zri#*?~$(T6Nz{nFJ$HJz?TdEJ5V0$L~+npHl~wC_q&jNk8?A~%@8-k8jWc5fJUS7SnwZ; zs!fWv#!uFNNZeIPjMp@cD0Y2%>XL{B_S*GDJX|jdzSCTw*!EH|Ufgm*k)`m7{l$fn zakcmesK?&9u!oR9+km%P@#QwJW)z*>;z!SRtpz8BIX)3F?$MP&9<^~HT=JBsjUp1p zgwK4$hEWw8mOwSYbf(8m~b+$b6< z$iRuVhqj^TZ!Qk;yhU8HIeO(o6c7E_;0V5dR31X@Sfpdt1RU+||0eJC0B-jDZA(dQ7)hX1qi6#v|uA+)xC@=a{D?T($lX+P{}!8fh=xg)~ezRo)CW;-s2&JWr zrIY_Dg)*jYj#iH202#VlTMul>YyA&k!|xhzWdn*&o?>MQ^w#9_Rt_MZptS*ra<&FL zyUyAf#EY|$nS9^c2*eb&@q~!@fv9yhp&*LYHXlTl*;aw5Pqt+sD$6btL|wJZ1yL^c zMZ73JnS9tjNC6}gapvZW2O*G2g$^=I f7xhtOwmXP}WG(<@4jV&dWG8Dmim_E#feZuyC_I9$ diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index f861daab..01ae202d 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java @@ -219,16 +219,16 @@ public class UserWebBean implements UserWebController { if (this.userNameList.contains(user.getUserName())) { // Abort here throw new IllegalArgumentException(MessageFormat.format("User name {0} already added.", user.getUserName())); - } else if (this.emailAddressList.contains(user.getUserContact().getEmailAddress())) { + } else if (this.emailAddressList.contains(user.getUserContact().getContactEmailAddress())) { // Already added - throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getEmailAddress())); + throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getContactEmailAddress())); } // Add user name this.userNameList.add(user.getUserName()); // Add email addres - this.emailAddressList.add(user.getUserContact().getEmailAddress()); + this.emailAddressList.add(user.getUserContact().getContactEmailAddress()); } @Override @@ -265,19 +265,19 @@ public class UserWebBean implements UserWebController { // Copy all fields: // - base data this.setUserId(user.getUserId()); - this.setGender(user.getUserContact().getGender()); - this.setFirstName(user.getUserContact().getFirstName()); - this.setFamilyName(user.getUserContact().getFamilyName()); - this.setStreet(user.getUserContact().getStreet()); - this.setHouseNumber(user.getUserContact().getHouseNumber()); - this.setZipCode(user.getUserContact().getZipCode()); - this.setCity(user.getUserContact().getCity()); - this.setCountry(user.getUserContact().getCountry()); + this.setGender(user.getUserContact().getContactGender()); + this.setFirstName(user.getUserContact().getContactFirstName()); + this.setFamilyName(user.getUserContact().getContactFamilyName()); + this.setStreet(user.getUserContact().getContactStreet()); + this.setHouseNumber(user.getUserContact().getContactHouseNumber()); + this.setZipCode(user.getUserContact().getContactZipCode()); + this.setCity(user.getUserContact().getContactCity()); + this.setCountry(user.getUserContact().getContactCountry()); // Get cellphone, phone and fax instance - DialableCellphoneNumber cellphone = user.getUserContact().getCellphoneNumber(); - DialableFaxNumber fax = user.getUserContact().getFaxNumber(); - DialableLandLineNumber phone = user.getUserContact().getPhoneNumber(); + DialableCellphoneNumber cellphone = user.getUserContact().getContactCellphoneNumber(); + DialableFaxNumber fax = user.getUserContact().getContactFaxNumber(); + DialableLandLineNumber phone = user.getUserContact().getContactPhoneNumber(); // - contact data if (phone instanceof DialableLandLineNumber) { @@ -294,11 +294,11 @@ public class UserWebBean implements UserWebController { this.setFaxAreaCode(fax.getPhoneAreaCode()); this.setFaxNumber(fax.getPhoneNumber()); } - this.setEmailAddress(user.getUserContact().getEmailAddress()); + this.setEmailAddress(user.getUserContact().getContactEmailAddress()); // -- other data - this.setBirthday(user.getUserContact().getBirthday()); - this.setComment(user.getUserContact().getComment()); + this.setBirthday(user.getUserContact().getContactBirthday()); + this.setComment(user.getUserContact().getContactComment()); } @Override @@ -320,21 +320,21 @@ public class UserWebBean implements UserWebController { // Create new contact Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName()); - contact.setStreet(this.getStreet()); - contact.setHouseNumber(this.getHouseNumber()); - contact.setZipCode(this.getZipCode()); - contact.setCity(this.getCity()); - contact.setCountry(this.getCountry()); - contact.setEmailAddress(this.getEmailAddress()); - contact.setPhoneNumber(phone); - contact.setFaxNumber(fax); - contact.setCellphoneNumber(cellphone); - contact.setBirthday(this.getBirthday()); - contact.setComment(this.getComment()); + contact.setContactStreet(this.getStreet()); + contact.setContactHouseNumber(this.getHouseNumber()); + contact.setContactZipCode(this.getZipCode()); + contact.setContactCity(this.getCity()); + contact.setContactCountry(this.getCountry()); + contact.setContactEmailAddress(this.getEmailAddress()); + contact.setContactPhoneNumber(phone); + contact.setContactFaxNumber(fax); + contact.setContactCellphoneNumber(cellphone); + contact.setContactBirthday(this.getBirthday()); + contact.setContactComment(this.getComment()); // Created timestamp and ownContact - contact.setCreated(new GregorianCalendar()); - contact.setOwnContact(Boolean.TRUE); + contact.setContactCreated(new GregorianCalendar()); + contact.setContactOwnContact(Boolean.TRUE); // Set contact in user user.setUserContact(contact); @@ -597,7 +597,7 @@ public class UserWebBean implements UserWebController { @Override public boolean isEmailAddressRegistered (final User user) { - return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(user.getUserContact().getEmailAddress()))); + return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(user.getUserContact().getContactEmailAddress()))); } @Override diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl index c54746b3..77e992e4 100644 --- a/web/WEB-INF/templates/generic/form_personal_data.tpl +++ b/web/WEB-INF/templates/generic/form_personal_data.tpl @@ -176,7 +176,7 @@

- + -- 2.39.5