From 1655b1f85ba94b7391584797358b690384e133bd Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 15 Oct 2015 09:52:08 +0200 Subject: [PATCH] =?utf8?q?Cleanup=20through=20inspection=20+=20updated=20j?= =?utf8?q?ar(s)=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcontacts-core.jar | Bin 20748 -> 20850 bytes lib/jcore-logger-lib.jar | Bin 2533 -> 2524 bytes lib/jcore.jar | Bin 13656 -> 13647 bytes lib/jcoreee.jar | Bin 18511 -> 18716 bytes lib/jcountry-core.jar | Bin 6194 -> 6200 bytes lib/jcountry-lib.jar | Bin 1293 -> 1284 bytes lib/jphone-core.jar | Bin 22744 -> 22795 bytes lib/jshop-core.jar | Bin 48620 -> 48756 bytes lib/jshop-ee-lib.jar | Bin 7249 -> 7400 bytes .../beans/basket/BasketWebBean.java | 31 +++---- .../beans/basket/BasketWebController.java | 36 ++++---- .../category/AdminCategoryWebController.java | 10 +-- .../beans/checkout/CheckoutWebBean.java | 81 +++++++++--------- .../beans/checkout/CheckoutWebController.java | 6 +- .../beans/country/CountryWebController.java | 2 +- .../beans/customer/CustomerWebController.java | 52 +++++------ .../beans/gender/GenderWebController.java | 4 +- .../beans/product/AdminProductWebBean.java | 2 +- .../product/AdminProductWebController.java | 20 ++--- .../beans/receipt/ReceiptWebController.java | 6 +- .../beans/shop/ShopWebController.java | 10 +-- 21 files changed, 129 insertions(+), 131 deletions(-) diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 4bf2b793f990ceb4be6bc46a3fcbabd1234b7a7a..588f0e34e77622c6568476b940a2c8377d868844 100644 GIT binary patch delta 2530 zcmaJ@Yiv}<75>idwdd~LyT)&`#*1w*UgP(3ZEP0r+QyHp*AE;5#(-JCF$QA?+fZns ziyLU8C{jb_M--&01yMy+TL;)YXemjfR;tui?ax-ND&l z0S7&nw!kSNbbcX})(n)RKBH|Fd+r>ui1MyMfmz;{_XcXpf@3HjUFh z-C6u+W5TBWI#}{v;DC*P;-OUcZ90f=+PH<=iY9G3L*!ultT<#qXRvHv|-!8T6tG_vXWh3UGJXOA39%;_ICH6&m0z`!mGV|ZSnT4A?^V!U8s5B7R7j(uKCV82uc zEG8aQm^5)nAz|S#j#xN~DGOe_C|0IL^_ZX;sg9c{HE}}JW~F`7#AXw70_RPXnRtnz ziBk#-3X7?!=HF4FYo?5lJ9s>CCQ)~KX=b)=U}yMz^u~LU9x}Mr}TVEhUp_|z11NMT8x3p8Ig=5sKN5g*A=d7b& zuY~>j)o`)5m)8TY?_14wDr-)XAT z=SIBAUw-l951HL0-i%mmJF3uSqFds#$BUilHPNTgZ;3xFnOR721-{BQqSC|nIR?JZ zF^qb#3u7K8a8&L#B_MOK$HICc?!~ymK0;1eVsUY5VQFT5Zm}md(pgIs(HFK=>7Pcr zjl{x2nSR*ZoMFsP&2doC0D+_Hjp$ipLZMclkB;f(NWT7Ubkg094&Bhz;%&!%1x^G9 zF{w{=g`$USByd>ah%Iq$<3&t!bgl;H;LO~KsiT84iyUspFk|C5s%@OWtiptilbF?i z?P_PMa|-h|UcxDTt2;+Wy0^YztWTx7|K{QotiV?GR)A0L0Tj|%j^Bkn{sDZkJIENU z`Y`O?5h%Kjo~l4&yWux(W8M46yo%aNzwskvxe!XbjqIz~n3r}H{=3K-&(1aO!5nw{ zjj=oMe1N=hS4=5hvfdRn+8k(&qi zL#7)FA%%ig&W`B3&-UAR%;nr1@y4~@oMiqjr%To=DG$6bgMBYc6SH8Y?R?$jIS%s$ zBj*tRE5*|LD7Xq`ybZ&hLiVaPNvv`PvYa%yBnuPoR_5=p=4$lkBbn*(xQzY> DU>u`| delta 2412 zcmZuzYfN0%5&mW$oV$1LVxD%^7#55TYYZ&UH31gb<>>&+!Wv_+9lQaIF%LTir%6k@ zp^f_^O%+>5{o_ALoT&V0mDpZ2c55Y7fAmMIR%+EsRi#LgqDqx2wUts;PSZB-%w0c3 z)GOVYZ|2O*J!j6GIrq~W^x6&bC5D|Y6EJ|5t@t%x(AT^bAB@}%esU4O#cQ#6dDv(6 zURp?PEX>!%UTQCItZ%Dtm<@;Pmew{FF0G|ju5DL4+3DJE12+3dP?#>GCYvXz-R4&* zYV+SyM0lpiQS8Z=Z{6=*etlOEkhejnXutkA;MIXdj$ZY8(kT-|-_6aH#R3<1Os9aEmp#6d>1sxD{P*9bi z>a@V1z(ay+1RWMsE2vITy`Yew20@L2niMrFY7y8f%2pHI6c*8M(h+JCVv8lRo~MPh z3+WKjDI_AK%cCz?jdhBSDtgACVG}(xBI_KLcySMtF$tP5X`Ch$B^4dhMMrBg|FPcl zP)p{AyFbmzyj}V#dNvTm7cP29}k3lX3=T9Zs8Vg zD|*(VSvsS~+X^#AMSl+cT*s@=JNLuT_p1FWNC9+FdFFT3ADPswZ#GpOus~cg9=wb9 zm>VqIWX%s4x7Z^h4^ON*h^7w68U*7O<`>++aSrxQ8p zUw-kE4|%j1-}bXTU}J z9Og`TF)vXT#PzJ8MIq-5R2WzixAP(|8>lp}B5*a|zySkmf-fjsRCqo!-|`3AM{@*P zB>0jWsk!CR)Wu_|=T;VYRtlFg>)}DlS;q#UR#U9D+Cn2PE4*OgD|k`iB@180*Vxd) zCcbXr8`!Wgh#_6rmW-su_+^DH3*W@IEX44Ng@dRPbj3n7f));;hLAhhAMfj*n4OFd z$H%7PGTxhcyX{?v*}@wkn`aj2QymA$)LR{e^fUdvj#vB3c~i>Z!x8Lf1dO5$e5~1F z7*Df~(9TjGT>phvp+liF@Hrg&xM&U{!lNM`y`$GUUyewmT9^+bYX?Msxb!%jp`t(-B@9Vd}KEU>pf$d0>yN~Aq{Z_=U??(b&TjK6F zj1gVYwONz3A4S~u8{1h^1OI%(Jn8}DJz}>iDWf-IZvF4BU5jhHB9lMVsSq*HW%3HT zy*$;ZftW(Ci9Yn37{H(y4VidKERUL;u1--u<6*)_d;lX}P8^?Z!k9wBz_^JbOqfXG zn8IY{`R)kmP|UAy^{nW#(aWym3RC*yXi^WwW}QJC(tj&!^#*Z5VcNnBPU^qJ!cjiu zr|p8Zq+l&6SVGbH)C;N5<&CA4(8$u-^1}Sc(mEH*JQggRMaaS;&M6$Xu!M6u)!WWd z&nqljSi!3Pes8C)j5cLH=_O~{!TWrOXI#p8Yi2G5;;y*^>z19!GNvYP4tN_~ynz8m z*?!?h4Jujk;4p8v!w&Ef6mnQMeGk6rJIEcri(Mm!Ka4oLO84DB-{I1xc9-9E8+q>| z|2pbx{I2wmQQ$z>eH(?>QC94}4*xwAO&1iqK7cXp^t+OG;kkp|KYhhX+YdgdxyjL8 zT&mz#F&(l?poH^Yg)uZ>g8RTQANwhLrc#Uzs6ZX|!i^GyQO~97VxMu=H?n_PT8u0x zt7>LRscmbbV^HZRd@y-x_VTFXBIrmhAa8J4<6s43neC znf(or%i9|-iTwTHShi^{E_~T&kjEcCdmf`a{586l^mxLrH{+K5rSHT`9Al!Y(7%XV z<v&bS&#zJ67WOO*UL;+^bg~syA7k=deSb*{z!D=T=hd>t9;M z&OeJs-(ddER?us^W`8sa0{`#6cx3<1))k#dL~WZL=l_v`9dJ|MObpnI{a2#Iv3H2W O`*mnMlJn;gvHKsW&7PhB diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index 5049937263bc38db18ddd3a2d142e3f0d86881ed..ce30ba8ab061bc1a1e57a982ffaeea02ad9cb21f 100644 GIT binary patch delta 428 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 diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index db108dde70c9a04dcc1d5eb7468ba40659daec95..6ea5dee81a9fef485994cf2c6831b836dd543c7d 100644 GIT binary patch delta 3167 zcma);YfN0n703Ux3(W4_yDV?8F$LS;1sekf>|HPqFAFRfuNOBqHaNC}F$O=tu-J~B zrUCM(+qg-LN68n`R*jNAKE>`zb)>e6`cS3zOR83?+PZ2JRn3<=s??~eZKb9EnFT9r z(xg|KJ7@1bXU^F{efQxR!OIX1?bLnYq;&(R1R8^PP-r3Xy-@8~Ct@ zk?Rpu?}-iSS}<3=YWV_(Eo7k0LOXU@2%$qF>_VqRmxXRbETo~wg7A*8h?2(8{ z>{T}#s}dg1%fgj59FLa^JApHWjgHmNReJeQU+iGD6E zv5{^h_NiZbYcu<8d>)VRmyP{6pymTrsxGtAGhpK&4%x`Vpc=_MDTdT!FrXf*+K|}j z`>hZ!tNU4ho_!WxY{E8_VLfbQA&L#y2siT4gK|_bRPMj z%H6ZdqIJK%?X&d8S$fwb23$BOamd0Th9nNV8R(-HZ%5n=|ER^=F^R`4WMWvG9e1JD zgAtsN81*0*C-uWIeH(Y-l*DNd|H~PPvle%3LSjCAf_p2r!vt_#J|j2%B(2gT;$d6Ph(_ zly)-RgpE=wfg)^_+PDf~qr^kVL}lYHPht&2$-_Ui6nKJ2mRZ7*wzOV^a-S&-PT!9SqEACNfc(g(uEpbJC#1Q0!* ziEJE^I4aF~Fl8*GV*E2{PL?qey@r;<636LMqFQ2vKIw^Z5bE~K<2FuUl#gwk#F+Y{ zzcXXp#wncEKwCD>;GB(OOsRvF0p~R0YN2wAa|Y+h;#OxdE+qb5`Gyb|)%coktClT) zb$_@FWRyTwBx2QtB1z?`t9a8B&OG)lR_-$#ye)I?^BL^&%_wWd;(Vk;>km0}&M zRE?oBN`Tf=A0lcB8hN2q&pM{5j2fafl~EF1ZK#Zr=b)xiw2jZ-vCt8V&4FDm3+)!qSV+^Lqhl;C zeO$UNI_S}@kbtFQx68CTi`_*xJ0>@AvvJ`6ha{IK8cHs_((5`+&1(x(c-ZGywv)~7 z#`=8qOkgl;rP&o=(8drBt2=?Nv_}P+)O4^^O*p0UwdW_Mg13eEj@r|F$27iCX1Zcy!SExO{Vt+lj&!Mo9?5W{m(~sl8N;) zk)PE5693w{l$QLW*%kDrd}pb)(DqrKU@r0C(ycmqW#NO+&nTXYkJa|~2}hoj|C%2? z4_kOw42Z-Bq4$?9CN7PPvw4hus%buZ=<=m)vxWL*PGR+@Is4p-zH!!R4Ah+PZ2sTz z=`)?Yw2wJ$vR>Wju+65t-BIlLk$$wv_mEqa9WHh(nOCZ=%$J$E18O>4EMn@taMdT- z3B@+{pvq>%s9t+Ki{ zl&<;=UD4$H`g~aJ>xz_Vos=)16rGznTyU2<7O{cXz4>dGK delta 2877 zcmai0ZERE58Gf#v09z5<7965Qm131VRTXg#ZDX5SOki zYa0S(tdzpS(WHuWEz*$sYg#w|*q=$2stQ$=s!*w_`lsu<{;NRkv`$6sQ1+bT1ZIXd zOXr@~?|sj6KAz{i?|tK{vGgm$Ju+m^FaZb9G{0@Z?aTJhZ;OTg==b_)`-e|;a)aU5 z{dQxE?q4(7b^oE!t^4aXzkFw7rhKc^D@SZj?faI#TQ-rtHhJAPyz(}z`xbjl^~sm) zOId4a#1^`*HGU-k)q;?J?=P2U%#CfkO=O|nL?Ldz}*hB=qCNj|HKvbaL zgo&8IfWV-@R@oD(N!nb$HsrmkEApRBd2**ak;9im0&$KOs3DTTu>8#3=!sj{hR6BO z!U(oYf3QY&d3>%N7ItEng;eYo>$;1~QZGt4B7^grY(d&KY)R8ftT>9CLatf0 zE_K{hvN1PTzT2NAZ~tH-dZ&c;*+Be27PodUZ|jABe+x09>gWAZWX>k$2KK!OyIb{2?H_` zs!sknC!y$@lJBp}))ZcYGD&S%4$JCsfJc7+LUT&1<5~E zLu(7#m1=15I`FWw@jdTE1Lw-cccihKs_7xnTW~H@l+;RCAR^E!&?gY(-2DPE21S)r z{-y5CT>mmX-bY93c*g3Um!}U9)(6LkZZzr~_k4vD6PWoQ-jTy+Z3(Cy%3*M;{~)DzAVq_X+GLs=j{{ zge4fK(&DS|J?7bO;Yl12n6U5^4$4tqU)CWDlQ^uzXIeOd;}(i=Lf-PV*`LO=G;3<@ zGdQW0RD@ai`{vG+k`hTz?Ipwc$%=~NR8eK}gSvb}OX;ini{3D1j3LaTlxOxjyz+&H z7^M^^>*e$)tCk6cEYqr|M3j``OeZNR#hJ94wUpx6OwmzFMhB%=sib5CwfKZi9DD9d zX^Xya9Ri&KAxc7}VoE8Lk`m8+qO18H)=`0^J+t#Jx>hvs$br;AgzHoq$mZgDY1^o; zW9*d#j*_dXhb8cCJ!S6X%3n>a3Gz1`1Tt3XhvuqiV$(beOy!A;qp* zC70yTH^JmQeX5{PFq!Cg=z?LwtxJYtQdNyapgxWG9Bxf%N#CSY)#xGRVHc|fGh?b` z^lVxun}g$PR!c@6MlFnCw_FTHjXlXPg9SF@qWrP_wyqhIq^*=xStMqRgq6X?eJ@fQ z#q5=}T0It-tWwouk(DM@Jr=QAJr-B0M>Z~!>@uAPE@-+1spdz4su=_q@UNDQ9@dQ( zvKP>0qa{Ti4=L~iDp)$a%sMGn++^WVl_U9n=W>QF;WxuUciQ)cbVUN&6+dbZt3Orc zQol906aI+iOyWr6$dF;nweuFIK3&pAxK{^|$UEV0kf-KRgJq#AKMLX3)ObDpl{zrJ;{Rvh`LzsOt^X<1hSK-u|3vCk8+{N<)E_r6 z_@G9-pNYw1C@rY6LQl<8lAl**%iqOPsGDxyK6`@Pqpe=9mY+ s8}nw12L5ZHP*x43K-XQf|K_&@R4qOD>kb{9I?$Y}gLzqB_b9M`1D;A5Gynhq diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 9daf43639f781789907f1add123c492bbecd73a3..eaf6110dd5bb7767f1dd977ab8ec1a5ff5f8e05c 100644 GIT binary patch delta 592 zcmaKp$uC1u6vn^%UfZWnpVah9~T^H6FYOI=$lmKLH5 z7Iwte-XCDcKS08{6%8A2@qOQY=l;&kJ@?wUHMHJN*`xw-Kt)$iSS!?wt{%^QiucS5 zz#DGvc2sL>i*I;vYIvxudA>Hg!sT`u12yjORiQ-0bGFcrB2r$!DuwkkH(BJAg=8Bw zODeuxKDPts+-0uo<0_J|AY@U&k_s8iDgs!sQd(6IjKi7=1?ytHA!Jj?mXK{BJ3@8^ zvZr8Q@COPG6@()9<_3!_%^8u;_z;tiaLkW2!xFZ^gOkXkcB8O*9!Sk!(IL^*tY}3W zxkw}E0HaQ$w30A}@u*KAlf0DvPf|6{4%a*GY@@wBxnug+J+80)Nw;rbGtt9GhP9 xAMgCbxAJaBiQpFB9!u)L>=+84YGYXkrQ delta 666 zcmdmCu*rZoz?+$ci-CcIfx)QJZz8XTpkbq*yX_{8M+FQF3?M8rIZ;e}Vyv-(884S} zQEFmIYKpE?rImuAo`s%4yqTG9W?o5ZQC?!s#N`@HKqD?HfXL69KytDiqY;P-Vl)R* zo4XnNm<52QZ~3${Wr_d;0|@I(PGFRqe25YY}IIzU=F*%`V(`n%Z~de|9yH}7J# zW83_fyN8jjkD;HDL2a@jpOTj1?Ifa;Ws844MSV2olQqa>Pv(Se~9r~@ch z#!z0&P!ZtG$RxrH59`TXVivq8fj!w@%*+HBK0t%vfCbJHV0i0z7RbvlO4mm=3TVXS zonq29@1b(J70DTidFiR>icpLdLorrrvVgdnJetkYC`$YoCnqw>^CElzvbIrNnyDQm zAq$SdeT;0APl)q^3_^)wxIqjIOB%&l;p+WZxx@mzS=m7H96+ef#K7=X6vP7nB3Ob} diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar index 22aa4b66ced4ede7ea08b6d5cc37718c6367e40b..776d42a13a59543fa1a8937532faf18acffa890f 100644 GIT binary patch delta 315 zcmeC>YT@Dy@MdP=VqoB4V6gG^pUA5rXzlCoepn=ZZaM=40|<*uu4NXV7;7wU!pr4c zl$uzQnxgAeX{BJOXRc=uZ)QGmgE})v>n(XO^+y9lO;%?#1k=%sW*~a=6vlo=uz(t~ z1uu#fle3vk1A$81fp)pd$RxrHcP)wzUKAbACVym>0oy0Q tBF!i`xqwAd8=r1z6y2^s^;%%vbAh_+fIPX$2N)G5e`gV3<6{OX1prOhJkgD1M@MdP=VqoB4U@&U*o5-udYuM=LZo5h2Q2_%3L%~ERKLs;hF6W}u#FEq$ zU8hPb1w%axJ%e~NGu_O*lGLKS#GHxC)tNzhFUo_d&l(_VvK*r!m=0nz1JRqi8T%Q* z0{|d Jn>aH_5CHR4LBRk3 diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 97bdd3944061172815f3267f811233b4f4dce6c9..9637788dea980962faa7693e89d80d6fcd735f66 100644 GIT binary patch delta 1671 zcmZ8hZA_b06h8MB`nE6q7*I-}Q$B=22Ll#1X1cNB%7zFP=*oxF`LXe}3ZoPpAfE-s zU|TTkCPp-3W=M>QbGr8ji7}bUOq|)D{aTDMWSWTa2N9#eKgM{@ZE3~#$9wMixaXep zoaf%}K4;hNFmq#_EM(&QV5L&Nz>bkwyu(gO{YO?MWgb5%Wenhk_zzC@@NWV8oy`;d9ipp>jB*L%?Bk(4v zqoj^1FlK;p6_Q|rHcT2|$^c;snx>!`1!fhvtiYUDFWRqF>$4Nsknrj%wGY+%T*rsY zv~IJ9>8`-M_|#IbUoe3OuHLYoW7o9v);xt(ih29KMmums#|X#4jgnTc!zo~(gC5j4 z^uk3c```(bHnarMn>PUc5Q;A1xXbqK9!_{@u8eMG#zoEY!}6cjEC6fbc4qbYITg~N z*NCYu(yxzxL9+EL5Rw=rfgT1_7>r^>>Lqdv(Q1g|hZPtx5LQ+grNA+Ak1H^tz@!3G z2uP6@cKo1YA?@X?ZRBTdwG*O*o<% zai-kIX0==8XQO4O@60k@c01Gp6P?ZqIf!rWb#8CtAht!=Qg4zaSv>Kx!jMERPX@g1nO%XGZo;G3CAJ)ztO+z|r!|rgToxiG5 zxo!@wh`V)1%_e9Dp91qH1a(1c_G}~~?#F8Pb?-D#4JQ#-!o3~5688?&ICLWNB)cW< z#YoZ%5x4`0yc|G44xsl%U{y$5PBZC)AhLD$Jie-Z6d~zy{i6hVdqYi6?|v`DTGL^9 z?|*A@q<@Xa_Jz7i8|xUi=^~E|y$Lx!2ip*pzP&QXOFjorW@3xk#alj;G_9b?L#C(1 zI+|$DCYq)rrZQD6{%=ZR2%Z%C@?)z#u=&gb+T;}1PpdNZ@@WURaG4s(Vf|ko@jJR( zBJLG#5pI8ESH0iCZ<5(ACjIHMpk*|zMNXy1Y1shEKmGK0X|~!Z#7(06y4;M2gcZs2S%=SBzQHv=#qge+$3&! tlEtsBDe~ZdS{;0&R=SS2Ii)Gk=HPeh(M0H(#6&}?__EEef4hlN{R=-UjzjWSF$Qhv_#RMT zz{I$*`$rSV{%AD*n7UU@{A2v5F`y!)Jv+pgyd^00stnnOwjZ6yZ;y-FGcy-)mtx}rbGi(6>632P9ei| z#$BzxW&BD~&zNh7ZUKulytAHeSrmE6gj!soe_2kE*VHa+zCt{7-m$yE1i}C_z=wm3 z>TsUz68dpL&;jgX)XpS>OfP>3A%qhLO##$D9kr6c!JpYn1P-Io2hR5_0AJ4w96rb~ z)6Fa^y;l5&y6E~=M=fQ2>YdyZMBVpv9+77dBke|4i3D*}LCk~(%+jbQNaoZpJ+CD4 zY}e$;3UgW%qz7jNJ&T+~VR~6To*lwD^d%0O!ZiBVzWZc@VZm1&!=sF@`fPNw(%OB6 z=NwiL(epedo?=F#5AD1U8EAV=&1#){u5g@ok#-BWp@KVhUyz%qf@` zI4o3Uu+~&p55|a^S7VcOm$5+CJ^AzppOb;mfuMp#6JEfQI#v5qswlIAPBf*z`WS*b z)U#y&AA&thz6}D_#RUB?gZNn=OB|j746^3cK%+ivx)<-++s*e<#AALZuwOez=w_fI zz+W|spZrpir*!;MbBA$*k+Y?(M~GzCB}bCR!mP2_qM=~6h<7#UlClV`X?IwkFsJM6 zs+nIsv+c^==8~4h6&o!M;b@GBzKM%IYfBfR+ifo5r2h7N${s-R6Ye#CSEBj5E@l%S zebenO@;>97^lqn#e%_uI_sgUk!tWO;7Mj(u!@X_lCH(2zDhEM!QZ(V^y_1BWzCq;D8HE{l=;+Q$|C6Z$6V6& zLLtsQUM_xIGcPpuj$)zs@A!xZ)I2DSL0=^^C>8H3yE7iJywfGAO+x&kGmS1K#A{6a QdNUI{7_=2~cYyo(2Ybzo)c^nh diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index a0a803090b9de5252a7c55008a75b4e0b5abf322..9ae15ea5c10b56e92ef7597aa9ceff75dd82039b 100644 GIT binary patch delta 4631 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 EU&BcL761SM delta 4413 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 z * @return Redirect target or null */ - public String addItem (final Product product); + String addItem (final Product product); /** * Gets for all added items *

* @return A list of all added items */ - public List allItems (); + List allItems (); /** * Calculates total price (no tax added) of current item. If no current item @@ -51,7 +51,7 @@ public interface BasketWebController extends Serializable { *

* @return Current item's total price */ - public Float calculateCurrentItemPrice (); + Float calculateCurrentItemPrice (); /** * Calculates total price (no tax added) for given item. @@ -60,14 +60,14 @@ public interface BasketWebController extends Serializable { *

* @return Total price */ - public Float calculateItemPrice (final AddableBasketItem item); + Float calculateItemPrice (final AddableBasketItem item); /** * Calculates total sum (no tax added) for all items *

* @return Total price of all items */ - public Float calculateTotalPrice (); + Float calculateTotalPrice (); /** * Changes given item instance's amount in basket and redirects to proper @@ -77,40 +77,40 @@ public interface BasketWebController extends Serializable { *

* @return Page redirection */ - public String changeItem (final AddableBasketItem item); + String changeItem (final AddableBasketItem item); /** * Clears this basket instance */ - public void clear (); + void clear (); /** * Getter for item amount property *

* @return Item amount property */ - public Long getOrderedAmount (); + Long getOrderedAmount (); /** * Setter for item amount property *

* @param amount Item amount property */ - public void setOrderedAmount (final Long amount); + void setOrderedAmount (final Long amount); /** * Getter for current item *

* @return Current item */ - public AddableBasketItem getCurrentItem (); + AddableBasketItem getCurrentItem (); /** * Setter for current item *

* @param currentItem Current item */ - public void setCurrentItem (final AddableBasketItem currentItem); + void setCurrentItem (final AddableBasketItem currentItem); /** * Some getter for item amount of given product. This method requires a full @@ -121,21 +121,21 @@ public interface BasketWebController extends Serializable { *

* @return Item amount of given product */ - public Long getItemAmount (final Product product); + Long getItemAmount (final Product product); /** * Getter for last entry *

* @return Last added item in basket */ - public AddableBasketItem getLast (); + AddableBasketItem getLast (); /** * Getter for last num rows *

* @return Last num rows */ - public int getLastNumRows (); + int getLastNumRows (); /** * Checks whether the basket has items in it. This method is wrapper to @@ -143,14 +143,14 @@ public interface BasketWebController extends Serializable { *

* @return Whether the basket is empty */ - public boolean hasItems (); + boolean hasItems (); /** * Checks whether the basket is empty *

* @return Whether the basket is empty */ - public boolean isEmpty (); + boolean isEmpty (); /** * Checks whether the currently set product is added in basked @@ -159,12 +159,12 @@ public interface BasketWebController extends Serializable { *

* @return Whether the product is added */ - public boolean isProductAdded (final Product product); + boolean isProductAdded (final Product product); /** * Outputs last added item in the basket. *

* @return Last added item */ - public String outputLastAddedItem (); + String outputLastAddedItem (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java index c8f5358a..4cef66d8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java @@ -32,33 +32,33 @@ public interface AdminCategoryWebController { * @throws javax.faces.view.facelets.FaceletException If something * unexpected happened */ - public void addCategory () throws FaceletException; + void addCategory () throws FaceletException; /** * Getter for parent id *

* @return Parent id */ - public Category getParentCategory (); + Category getParentCategory (); /** * Setter for parent category *

* @param parentCategory Parent category to set */ - public void setParentCategory (final Category parentCategory); + void setParentCategory (final Category parentCategory); /** * Getter for category title *

* @return the title */ - public String getCategoryTitle (); + String getCategoryTitle (); /** * Setter for category title *

* @param categoryTitle the title to set */ - public void setCategoryTitle (final String categoryTitle); + void setCategoryTitle (final String categoryTitle); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java index 465ea404..dcfafb9c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java @@ -55,25 +55,29 @@ public class CheckoutWebBean implements CheckoutWebController { */ private static final long serialVersionUID = 51_987_348_347_183L; + ////////////////////// Bean injections /////////////////////// /** - * Connection + * Basket bean */ - private Connection connection; + @Inject + private BasketWebController basketController; /** - * Message producer + * Connection */ - private MessageProducer messageProducer; + private Connection connection; /** - * Queue instance + * Customer instance */ - private Queue queue; + private Customer customer; /** - * Session instance + * Customer bean */ - private Session session; + @Inject + private CustomerWebController customerController; + /** * Object message @@ -81,22 +85,15 @@ public class CheckoutWebBean implements CheckoutWebController { private ObjectMessage message; /** - * Customer instance + * Message producer */ - private Customer customer; + private MessageProducer messageProducer; - ////////////////////// Bean injections /////////////////////// /** - * Basket bean + * Queue instance */ - @Inject - private BasketWebController basketController; + private Queue queue; - /** - * Customer bean - */ - @Inject - private CustomerWebController customerController; /** * Receipt bean @@ -104,6 +101,27 @@ public class CheckoutWebBean implements CheckoutWebController { @Inject private ReceiptWebController receiptController; + /** + * Session instance + */ + private Session session; + + /** + * Destructor + */ + @PreDestroy + public void destroy () { + try { + // Try to close all + this.messageProducer.close(); + this.session.close(); + this.connection.close(); + } catch (final JMSException ex) { + // TODO: Continue to throw is fine? + throw new FacesException(ex); + } + } + @Override public String doCheckout () { // Trace message @@ -188,43 +206,22 @@ public class CheckoutWebBean implements CheckoutWebController { try { // Get initial context Context context = new InitialContext(); - // Get factory from JMS resource QueueConnectionFactory connectionFactory = (QueueConnectionFactory) context.lookup("jms/shopConnectionFactory"); //NOI18N - // Lookup queue this.queue = (Queue) context.lookup("jms/shopCheckoutQueue"); //NOI18N // Create connection this.connection = connectionFactory.createConnection(); - // Init session instance this.session = this.connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - // And message producer - this.messageProducer = session.createProducer(queue); - + this.messageProducer = this.session.createProducer(this.queue); // Finally the message instance itself this.message = this.session.createObjectMessage(); - } catch (final NamingException | JMSException e) { + }catch (final NamingException | JMSException e) { // Continued to throw throw new FacesException(e); } } - - /** - * Destructor - */ - @PreDestroy - public void destroy () { - try { - // Try to close all - this.messageProducer.close(); - this.session.close(); - this.connection.close(); - } catch (final JMSException ex) { - // TODO: Continue to throw is fine? - throw new FacesException(ex); - } - } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java index 395e5439..513ed541 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java @@ -31,19 +31,19 @@ public interface CheckoutWebController extends Serializable { *

* @return Page redirection target */ - public String doCheckout (); + String doCheckout (); /** * Getter for customer instance *

* @return Customer instance */ - public Customer getCustomer (); + Customer getCustomer (); /** * Setter for customer instance *

* @param customer Customer instance */ - public void setCustomer (final Customer customer); + void setCustomer (final Customer customer); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java index 666fab67..b9fac8c8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java @@ -32,5 +32,5 @@ public interface CountryWebController extends Serializable { *

* @return All countries */ - public List allCountries (); + List allCountries (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java index bb57d7f1..13d3fa72 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java @@ -36,180 +36,180 @@ public interface CustomerWebController extends Serializable { *

* @return A Customer instance */ - public Customer createCustomerInstance (); + Customer createCustomerInstance (); /** * Cellphone number *

* @return the cellphoneNumber */ - public DialableCellphoneNumber getCellphoneNumber (); + DialableCellphoneNumber getCellphoneNumber (); /** * Cellphone number *

* @param cellphoneNumber the cellphoneNumber to set */ - public void setCellphoneNumber (final DialableCellphoneNumber cellphoneNumber); + void setCellphoneNumber (final DialableCellphoneNumber cellphoneNumber); /** * City *

* @return the city */ - public String getCity (); + String getCity (); /** * City *

* @param city the city to set */ - public void setCity (final String city); + void setCity (final String city); /** * Getter for country instance *

* @return Country instance */ - public Country getCountry (); + Country getCountry (); /** * Setter for country instance *

* @param country Country instance */ - public void setCountry (final Country country); + void setCountry (final Country country); /** * Email address *

* @return the emailAddress */ - public String getEmailAddress (); + String getEmailAddress (); /** * Email address *

* @param emailAddress the emailAddress to set */ - public void setEmailAddress (final String emailAddress); + void setEmailAddress (final String emailAddress); /** * Family name *

* @return the familyName */ - public String getFamilyName (); + String getFamilyName (); /** * Family name *

* @param familyName the familyName to set */ - public void setFamilyName (final String familyName); + void setFamilyName (final String familyName); /** * Fax number *

* @return the faxNumber */ - public DialableFaxNumber getFaxNumber (); + DialableFaxNumber getFaxNumber (); /** * Fax number *

* @param faxNumber the faxNumber to set */ - public void setFaxNumber (final DialableFaxNumber faxNumber); + void setFaxNumber (final DialableFaxNumber faxNumber); /** * First name *

* @return the first name */ - public String getFirstName (); + String getFirstName (); /** * First name *

* @param firstName the first name to set */ - public void setFirstName (final String firstName); + void setFirstName (final String firstName); /** * Gender of the contact *

* @return the gender */ - public Gender getGender (); + Gender getGender (); /** * Gender of the contact *

* @param gender the gender to set */ - public void setGender (final Gender gender); + void setGender (final Gender gender); /** * House number *

* @return the houseNumber */ - public Short getHouseNumber (); + Short getHouseNumber (); /** * House number *

* @param houseNumber the houseNumber to set */ - public void setHouseNumber (final Short houseNumber); + void setHouseNumber (final Short houseNumber); /** * Phone number *

* @return the phoneNumber */ - public DialableLandLineNumber getPhoneNumber (); + DialableLandLineNumber getPhoneNumber (); /** * Phone number *

* @param phoneNumber the phoneNumber to set */ - public void setPhoneNumber (final DialableLandLineNumber phoneNumber); + void setPhoneNumber (final DialableLandLineNumber phoneNumber); /** * Street *

* @return the street */ - public String getStreet (); + String getStreet (); /** * Street *

* @param street the street to set */ - public void setStreet (final String street); + void setStreet (final String street); /** * ZIP code *

* @return the zipCode */ - public Integer getZipCode (); + Integer getZipCode (); /** * ZIP code *

* @param zipCode the zipCode to set */ - public void setZipCode (final Integer zipCode); + void setZipCode (final Integer zipCode); /** * Checks whether all required personal data is set *

* @return Whether the required personal data is set */ - public boolean isRequiredPersonalDataSet (); + boolean isRequiredPersonalDataSet (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java index 722033d1..5618aa6b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java @@ -32,12 +32,12 @@ public interface GenderWebController extends Serializable { *

* @return All genders as array */ - public Gender[] getAllGenders (); + Gender[] getAllGenders (); /** * Getter for only selectable genders as array, UNKNOWN is not selectable *

* @return All genders as array */ - public List getSelectableGenders (); + List getSelectableGenders (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java index 3d2b74c5..8c7c9b02 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java @@ -144,7 +144,7 @@ public class AdminProductWebBean implements AdminProductWebController { @Override public Category getProductCategory () { - return productCategory; + return this.productCategory; } @Override diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java index 2da2b11a..ac384d77 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java @@ -34,7 +34,7 @@ public interface AdminProductWebController { * @throws javax.faces.view.facelets.FaceletException If something * unexpected happened */ - public void addProduct () throws FaceletException; + void addProduct () throws FaceletException; /** * Some "getter" for a linked list of all products @@ -43,61 +43,61 @@ public interface AdminProductWebController { *

* @throws javax.faces.view.facelets.FaceletException If anything went wrong */ - public List getAllProducts () throws FaceletException; + List getAllProducts () throws FaceletException; /** * Getter for product's available property *

* @return Product's available property */ - public Boolean getProductAvailability (); + Boolean getProductAvailability (); /** * Setter for product's available property *

* @param available Product's available property */ - public void setProductAvailability (final Boolean available); + void setProductAvailability (final Boolean available); /** * Getter for product's category *

* @return Product's category */ - public Category getProductCategory (); + Category getProductCategory (); /** * Setter for product's category instance *

* @param productCategory Product's category instance */ - public void setProductCategory (final Category productCategory); + void setProductCategory (final Category productCategory); /** * Getter for product's price property *

* @return Product's price property */ - public Float getProductPrice (); + Float getProductPrice (); /** * Setter for product's price property *

* @param price Product's price property */ - public void setProductPrice (final Float price); + void setProductPrice (final Float price); /** * Getter for product's title property *

* @return Product's title */ - public String getProductTitle (); + String getProductTitle (); /** * Setter for product's title property *

* @param title Product's title */ - public void setProductTitle (final String title); + void setProductTitle (final String title); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java index ff5998b6..85e85e98 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java @@ -31,19 +31,19 @@ public interface ReceiptWebController extends Serializable { *

* @return Access key to receipt */ - public String fetchAccessKey (); + String fetchAccessKey (); /** * Getter for customer instamce *

* @return Customer instance */ - public Customer getCustomer (); + Customer getCustomer (); /** * Setter for customer instamce *

* @param customer Customer instance */ - public void setCustomer (final Customer customer); + void setCustomer (final Customer customer); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java index cfc888dd..24a51d58 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java @@ -34,14 +34,14 @@ public interface ShopWebController extends Serializable { *

* @param category Category instance */ - public void addCategory (final Category category); + void addCategory (final Category category); /** * Adds given product to the "cached" instance *

* @param product Product instance */ - public void addProduct (final Product product); + void addProduct (final Product product); /** * Some "getter" for a linked list of all categories @@ -50,7 +50,7 @@ public interface ShopWebController extends Serializable { *

* @throws javax.faces.view.facelets.FaceletException If anything went wrong */ - public List getAllCategories () throws FaceletException; + List getAllCategories () throws FaceletException; /** * Some "getter" for a linked list of all categories including "Has no @@ -60,7 +60,7 @@ public interface ShopWebController extends Serializable { *

* @throws javax.faces.view.facelets.FaceletException If anything went wrong */ - public List getAllCategoriesParent () throws FaceletException; + List getAllCategoriesParent () throws FaceletException; /** * Some "getter" for a linked list of only available products @@ -69,5 +69,5 @@ public interface ShopWebController extends Serializable { *

* @throws javax.faces.view.facelets.FaceletException If anything went wrong */ - public List getAvailableProducts () throws FaceletException; + List getAvailableProducts () throws FaceletException; } -- 2.39.5