From b27f3915e36b6d06ea98abf8b4436886415f82df Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 24 Sep 2015 15:32:07 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20auto-reformatted=20many=20files?= =?utf8?q?=20-=20some=20getter=20names=20have=20changed,=20fixed=20here=20?= =?utf8?q?-=20parentId=20is=20no=20longer=20in=20Category=20objects,=20nee?= =?utf8?q?d=20to=20get=20parentCategory.categoryId=20-=20updated=20jars=20?= =?utf8?q?Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore-logger-lib.jar | Bin 2469 -> 2469 bytes lib/jcore.jar | Bin 31729 -> 32092 bytes lib/jcoreee.jar | Bin 17745 -> 17745 bytes lib/jshop-core.jar | Bin 47272 -> 45594 bytes lib/jshop-ee-lib.jar | Bin 7308 -> 7308 bytes .../beans/basket/BasketWebController.java | 108 ++++++------- .../beans/category/AdminCategoryWebBean.java | 17 ++- .../category/AdminCategoryWebController.java | 28 ++-- .../beans/checkout/CheckoutWebBean.java | 2 +- .../beans/checkout/CheckoutWebController.java | 3 +- .../beans/customer/CustomerWebBean.java | 125 ++++++++------- .../beans/customer/CustomerWebController.java | 144 +++++++++--------- .../product/AdminProductWebController.java | 59 +++---- .../beans/receipt/ReceiptWebController.java | 13 +- .../beans/shop/ShopWebBean.java | 50 +++--- .../beans/shop/ShopWebController.java | 16 +- .../servlet/receipt/PdfReceiptServlet.java | 10 +- .../admin/admin_category_selection_box.tpl | 2 +- .../admin_parent_category_selection_box.tpl | 4 +- web/WEB-INF/templates/basket/total_sum.tpl | 10 +- web/admin/category.xhtml | 60 ++++---- web/admin/product.xhtml | 104 ++++++------- web/errorHandler.xhtml | 8 +- web/index.xhtml | 2 +- 24 files changed, 384 insertions(+), 381 deletions(-) diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index ca19891b4bbe2d8a1ad1f9a199727023c9fd0812..ccc4dab72ddc6458cad72726cde8399e9067e11c 100644 GIT binary patch delta 317 zcmZ1~yi}Msz?+$ci-CcIfg!WfVj`~wa|V#In8pm^U6cn?pEW?#WI0ANFdfcl1E!}j zI)UlijGiERvpSOj69%9E{FbtfNS(NlLzEJ@5^WMI$9Pxs7A z%V%WZ0J1`g5|dLI8MuJV@Wi6L%)Io;sjU0FnHg9a7+4q?*cjNsGzS9glP|E@gZV=2`e53H-2zP4v%7)m6YM@mzkH&$N*B|mRORQGx;Hl{^WGlJ>IMgYzz!6Kn+lu14?s3X)d@tH&`79 z1B7OU(wtD5i-CJ`9-9i-rBm4~K;D~tfz2Mw7h=~3(=O~5V7i{&4NRY4_W{%596?|@ Qha(aq&XI)hpb=*=0JlC!uK)l5 diff --git a/lib/jcore.jar b/lib/jcore.jar index 57dc0a07e9ad739e6f82121851bb5ecdf7291de2..c0bdbee1e02a1d6bf6ef6af3c07a3bd7c43e06fe 100644 GIT binary patch delta 8715 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 delta 8587 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 E2VHT`9smFU diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 884b0d96ea6bf9165d0544762c053be8168aa340..d550fe018c1a514bef85d93ba1e622042048b6e6 100644 GIT binary patch delta 630 zcmY+BO=uHQ5Xb*-v)fI|nhz`3ny;>hYDua|sY#cZY`)ZD)h@Us2?Gqo3`ML1`&2vJ6KQ7>lCJcq`5^l1g=FmnBEhmxql1u9V>{ zJ+15XMd@bQwlWsUw?|L?eDM59SOs_?ZEtwjYndc1E0y#NddX*KlWfTW5z613H21#IZ3Ac7N=(Dw(E z=$ATEDtr(T>gfCY{G;^`8Pi?W-|3NQOk)P~Xkihzu!32-6M8Q{?>58BhNm@uUw-EP zjjgGH6v8+n9~`E2bCNaY!LSB}v{CCA?R%A}VrH;X=3 p&hFNUj#s_YtJQ0}^`KyFmJi*nU1j{L-S$G9KDFvi_HET${{Vr)sNetq delta 634 zcmY+BO-xfk5Xb+!edV>}Nn4vV2*th{gSMsWL#?gQ_Vu*{3@Q~8<b&Z4^1m$JrxDb=w> zuWLGeldT-KD~BTKMt<<>{MVtd2Cy8XolHBe`VDu|Ck1K8tMpmR(0wH#|HT6)dJP;z z)PRX3-SGEmaiI+1B;9p?ryx`BJ(GiuJR;~vJAfFZ(j7RYgjWZ;a2Ns!W&0o^(7aUJ zEl0%w2|Y@W^=N>9^+wxSbyxH)J#rg&a2K<ULVYEyWCiIDrsO zs`^f&N0pGnc@$L{b(Amx2Tcs9e+*&<7w}BQJjWHhz$jkfnmdx0f}a^H{LvI?tW;3r zqo*ZrJR7A`?3CpKqgbvmX3E2icjY=GVP9uV+oOBCIQ_7_VNTm|8mZ*iJ6jp|%H@I4 qm&&F6K2g8p-Cl8S?e~M)s*m{6eDx;dSM`B+#O2det;xRa+SEVm=AiZf diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index 90365fe70f990fc5a9e3fae53e46f57c1d9163a5..3e77fa799e8b8ef8e53f83888d9832a67c5aa1b1 100644 GIT binary patch literal 45594 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 literal 47272 zcmeHwd32oDb>E%A00RsL1PFitNpS&pVj;j)Ttx}oBv1rbkQ6D2y0X;Y z@4fe}^UVSfvYa%OX6E}oyyd?4?z`{a-@EUA2k$J4#6&7ZR-M{(ySV;UNkn>g_jRx8 z*}tdjy>~Z zwzRD2TwN3E9&tVC9!>P0OSa${{G}S2 zrcj1C!5N0r1IeKR^(-ostv@|7mgpZVki9u4d-hy}fvrQb>fKn{zTNF4hcXO@y7M zKX>Yh(b+$g$Y$Sp?@zvi%;0ZVPx!FDjSlu`zU~H@uFo$!6s}CN$f~^Jky`tlVa(O{wAJJ+@FX` zmBd1_da{Lwq@!q-9f@qxbf+wmFnUlVBy+JIl;gJocVUU*DnuIaU5zJQ>RzP0?KKJg zYn3F9?+QE?nJpBvadllTGo%)G7!7=fWu{j)C%^jhZEvAMez+WYiM1t}ODKU_h=(4` z?d~D090L>G0|Uu{-ImnyF~sspxhX31VlrPA#6aG{sI)|7QOUgV(?gB(|N8p}T)eSm zrEi37BK0U6@dc{L91gWxr_542^Ho@SuYkuQockZ7U!4s^`ZQ# zBdNiW#MpQSEWBe|-XqiZlw+yGU*_N?%3nubVODe0FXl3iIU<{VjH3a3L>%iIb$^NmZ zERM?(SsDjNFAGWc4YO!S8k{<8#tlicdODW8Jl55l%w`jV$vx@JaAFM1cb~b~ymFtD z^~hKzH8QyMZr3AC@zz$?Baa_;S96>*J_^N2#%1mif)4fUOzXUwZzUkwd^!eL}`B>hc7|&uZ&T{dB zLzi!QEzDn3CmGHxKih7k--Fq{xBuJz;E0Rc))moiY?H_mt5cV7yGvrkBE15Jth8u?dYrFF zqkvoXoK3t>3@*3+kbe{?4Y5?J1WM6JIeG@t- zK+MBJ!;=F>J!y8-lQ*O+B+yYJuSvN!QD}nb^%~A~(_MAInfTd@1bO<|J%+|&HIw>qaxj%0OJ?#MxCy?%Rr6zdYO zUepkTB{W}wdJXjx?vpgjiq)kQ;Azq%cHB5Ow9Xe)pTFeuAmY zPibc7q48v9Vt;yU_vK{&IQGl(nVoAZWj-u{m@JeQel3bo_2kvk81$!QQCS|P_E{=8 ze%I@_?ah42HKQ%0BYSbE>&T&f#}k;g#oSTw>qYjUcjHQN?$5Po80G)24N@^<-)it@G6(-%DE&dD!Tp+t0?h_%$#0josC2|-m2}1dy|0c#OV2JJq=W`E#IIL(!v8sKX7Xb^6QtIdtc864C#WKL2AgVMUt zi+>DT9E3ip{@17_xfTmQ)Eqpy%h(w$Sp3WN;(uMrj$r-2E)f_T<@l|5O`>|?=R&U+ z{x(d&b}aVR!r!9I4BSc!mi=awUIzG+HO_%a&wn@J!~K+b?yY$4ct8H5PyhVOFk1N8 zibMq^^jW=|nzJ3@LqV}GGB2tG2k>9?ZTD~*e4j@>tI9eF8r*%X)He!(auh-Bt{f@( z8^^s_5Y;UnyKc!j1n&E=r;wk$Sd^V87|hm;YD$K+0M01bIio)11Nj}wLNXQIr6!d% z_3PGPEAb?RXY%5BVu%vT-CY)1j|7$2uQ;do8`JA(j;Kx3)D_~_71T$=iaAAUpw@Cvkm{{6%JExi?yG2|<348YtIa*34n9|#fcPaA z%X{Mf{H3kUUrqu3&Q|z8_aZnIZu08DYmPtrH$T9%^(BFI1akHzSnlRxvegVrj^qMq zB8x#iJKVL-WH5Up9kR+2%Vr=(E+hvyhzb!3$pR&^)mHWX@u8uE>C_0u-{vbUyJTJL zZUd(p8j4GYT!{lHJvbek*evbls5}st2j!u-+#=iK^00gaEEJckytyWigk);#6Id}0 zaP^TmwvmB#&32mEZHcVinM@kPIYUW7wlK+AL!usy%VV-XF1N~Uarr1|JHmb}42b8* zkf=N!myZd2fpYu-Lef^ss*B;oP=iE8y*-mKlbr|FboJ>4MpdOERqG^H(j9XIQq7m% ztw&(Ql>~r1^~_?cDonp9bdCM+GJuR2Q9oY5-;|c84$u_IrmkS+v2_|vqhiCI^u|Kf z1IcU(2)8|4Gz!MEkwsVt7ebq8fwDUnJHLx@y+p0_OQ8_}<;49;b>CVyn}d&Q`lVtf z;4huH>qE{Ee(UIW)b=g7A-pDKuUb9`UHHokq=0uTa&^HI8P6V{f*-A_V=a!*ZO; zKI;>-ivCg?ph9d!?VF(0Y(Z(y7=KooY8yu@f7m?AP=T+!K}C-{nrq9sdUkt7fM6aB4RlFppVm@KTY%!{#X$hIH8y2d=BXVeupS!QioZhnS z7|OZmtH>Pij~d*?ywan)rF;&t?VG|F^UBEf7o_5a_kTR!p|1^nDKY}q9|h}=p|>xA zrLTaN2QjV>W8^-9@wx^#zeg4Q+d;^B=);FF#^u=IYE@%QX6rF+;+38rjhIp#?J!DQ zhvu}S8JsfY6J5q;l%aF7?K&qXkIuOpIoTgGB~tsI%m537zyr&Eg~xh)4kIbn34C*W z_TtwyljenlGhC0o9)>3{2cL8eL;l%R37KV;yFrx-Kd1(oe_a+lC(+0Y5-IyP(xBl2 zN)SC$7bQn_G_jRlOF7eSx6`El>C&P4O-`l$kagdIX;w;=`rtF_p#pd`&uXoz81!>e%1wZB z6o?~ChsNo_BBBupM@;#!l4e{J_1;}rs_+*ActjJ3J`kheq?v(x!gzd6e?;qf1Mc;X zzfRYL`(^{h=_eYH%RwXlw(r!l-^G%|4`og%)9wh4W|-dg?!L{T7b0B{qtYCudq>Q?sr(TI~mee}!Huf2~ z49msjhP}iLpxt!Rq^u3&Ov$N12#t=toET((I`-;`p^@!%>fYnPPp5sox-CHgOQA_y znsd3HIVc9`9ljNMhu=o;LiD+>|NB)}Pzpbrkg$}lp@o|5VtZks4Eq+O2V+?8&qO6r zDQ8Jpe+)zcM5~p77(uugj-#Ec!m|{=fWXa=3;Y`5*KkxuqLOCnQRc%}QZDjJgKskg zuHD4nN}g=TuD<(M?=Moa;Qhnx z$q|}y$pLjl1&JyW29TcPMo=v^uzz7@`V{@vSoWHX--90r_^OhsK9TkTEin z7=}d`GwDyWc@;y+k-@QZEUFPjbDT7yUGKs^Z0GVS{{8fr0`PBO3w?e7m3^7SNH&Fi zGK7h2vSO@P01y+UB;mfPNE9w_>t1O9mbJt8)K|2*6 z6Yrn4wXw#Q-_$pQh0ShkqmNB&jRS&NH+krCt@OlU|J{nck~qw0Le+8DmVh4@%Yryy zC44RC7oZ}wMUGAQ$uB=s1uWyhUT!DQc!Id)ojHf@Y}ejEubDWYj4gpcqt>N0vSyDO z)K>=-)QkwoZAHMwqHE9%!*VZD1CsW#1&$kn*PU8u6av2&Fx?CVM%6+Qu7DoFO*wl@ z4$Cll8}~fx$wj#Zzl-n*b12Mn?w>EgXX#16GGUI4`2)AnSK!IYES(v9V919Jy2s+? z;Lgrwl66|i;P+q(p;og7$ype<3E$Me1CAtaz+-JsFIA^Yts{v96}Uj6-%aLELE|C3 zwAtVy;S=>d+Vm!%8G;_LJzkgSvr=C65}yDG)DLm-%R(L`sWxBjJtql+@lE5P~T>SZXgQ?*$VuNU>-CwDXX1H59IBDP5e!JMXCrxg;AQ- zv_xRjZUdU4GrJDXyed^1Xkc!w>fML>23<5&*fdp`@x*byKtf`ELM{XnvNM>Fn4geQ z5OOgOA)4Xf^%_V>wV#mjKtgs06H@Ib#0wGW5AwTptp)uf6`q^j~=Ss9hXx6u$f0#r^n{S;Dg<}aw+ zRyY5qbDFODGu91=!p%*jM^CzXND7g!;_d}Z?-${o^GB|(Szzc0<2m6v)^!{cU)Qx( z-2;|JEe+q3MyFIQrM}@Brb=B>T{nco36uX8Lu*xAJ9_fE%<>no#6?P#-6d6WQgun0 z+^w2%kKC(%PbnErS$!HGh~%wad+w)oe{s1Vuqr=9PbamYnnT(?i*82@oz_YttTifa zmC{b!qoW!KX(u0cRnl{DhOFk-8h*i@aUFlxM`c5lJB}MmHrKv2*!cMJufH=rR>RFD zDPFeKU|J8mVJc2UH()_|jRVzbn}EJe(hJ+AIoLj3wh3xn3TzExYZS|-7gFSAw#5Kc zR^rennoH37YK;Zz>{&O-mZ)rsb1Iu%=38Y;TyB&3EOS288EqLmIl8%PyM8LX`Ww|5 zC#fU`=xrV|!nJ2?Io|~yt%y4gZiEGb-S?_JzIGm;ILG%7N)5fbFdgxkYcN%KbwNg9 zqYclrTO*ws1HdL8^VS;3QV7&#D8K=maPA3rEMPvqS-_JhkV3i@+rD9=qLrPfkKkk% zHfGg=a$TZr^_ABJvhlho?V?Qil4*6U6P2vN`mqjvXB$!MCg_=4v8}RARjk#qRvx%Q zC8!2UoZhDvw(xyq3hSd+_#^3}l1jR+f-WvUb9pGaI@F=IKS5Yr5!P{C)LNlU02bahs7ZfM3?M<9KI8=h?qaQ6`)cp*DtAIX!8_hv2$1am~JJ~n}fXh76{LC z3mLHRrvRAC3raodVi=RTux@0HOP4)dt`bT{qjF237prF@bEZdr6@{X3xI+=*h2E8W zCSa;g*${{Hy~&)|ZjqZx&|m5-DjjvCQ}!suB`V3d+^2ko<8TE&ABQ=*Jr3I%ZfbCC zh|6v`B^23CvP!pmG7fzo3UOhm%g*KQo*TuRY}|BufhX=Pg|S#PV!fVgPDEOPUe>v&bl+Ey8#v#g>o8a&oI(*YzssEW5BEnR$w z{9p?3Lt3^Yn?|py2x-MENDGQnHS{Pv#DxdaVx?M#x*O~KJgr{5TpBE!!mRv)J?9i2_aTW zCWO7EobvpHMErz26-Wp~LJ%PlKOtYlcs%Rs5jP=vHXz0XFf-jKcaN0$3HgISLLiZX z2r2Uu@)8JnIS(Of;sM0CSs`ZZ5f6w_cU@*`5QC$who{9=6g773(8YO0+^h`qio{GwJN@Z@u6MENS&Tmpk6fe9g@hi`aedo212tP&rHEfx=)94C5br`N1c9_9`%Bq5A zeXX%OL$9rceIIhVu)vbz^H2(O^`YaAbLELiH~g)J*yXS1xDnW)PO*qD=3v8f zXDa^yvWK6d=jZHJm{VPL7kK@55Thd^aN@zL6;%-jOE+s89^3bqiyJ;HrM<|pmVC{J z>Xpw4qM(gap-m%8>-Vr%qrZzaas)SM@0=jtO-;|QGy)v+Q-8X*n1sI9^6qkYiKp#FCxJ1X&Q~_xwAp`xT zs*~fym`n`PkgW2fl|gY}b^KSI83vP`xg+ObQi0q!d%634H+XCiDH zeHQ5qNbWJITv%MayLcVw8u*dtWX8?}JZ%ONJhN5rF5ODqY;1USgv3tF!y)dlD+tbs z!$ElFDkA8a6`sYN*Lv3MBK9B-a$G_*n>&;*L$j+??_b>I=u;kE8mwm}#eJ!9Rg)i` z^aza_Yc!1eYLPX`&wNu{lV)PA$vp~dtx1maDc7Xjqpyfph35@)ro(TeIU+mDIIT9B z-)8fCwz;2U?x|xkA7Z{?io+;X6Mdm~qW_N{M*aeD93eSq;l=Pjf3FK#zoKKKWh>h$ju8XXy+Hi$45}tOmKMCaPo3U+5-RyofnZm z_TWgq6ZV5EF#X6D<;`MMM`+A6qc}9?Z!fBuVdb`(=!S@F$p|-lMIg){IGL1VogYJp z3dY-3*K7R{8xBdU(TAJnDJ*yPsl_bZHkD}89+2Jr{fLFDL~>FK!a_Y;1c=IMTwtKP z7#t1oSiD4=Wd}qWYE9>vW*D8m*3v7KOX4oK~)ow6cLg9FQ|V z!1c?rTh#yRWGauPUW>~k@@P~Z-;Tm4I?hTQhJgvIb1x8y~cViZSrtFz}48`fBNO)Kx-;qF139>qX`MV?KKB=Bkra?{Q0p?ac!P?f&5T3MAH zKbuui#;LUS^aNA^LkS=&S8kXsVYOKaw#8ile#xCmjiD`v_OwEsYO~B1cmv|ERd5LG zKrtvF#7H}g$n$WhO>L{%E_rWAc}UcG$%+&8(buH%&CtG3Z)AJb#z@u1iuun<@9R?4 zD6tE#OMGKQUDv4Viu&5}Z%f^YvL-y8iI_c275s&VPj6d;G{6z5u}r>;C{i!H|EF6j z%eKGp{;M6|goZUB8OX#YG>|RW56#Ve#CJA)V-^GNTME=~IpDUHK=RvxoOJ@OS__zJ zJAkUaz@!G?a+JZ|=r|mME);d1#qk zdY6L2covYpggma?4mT#cG7>gE2sLjLdW?QL3#7cZ{(Y#86;Xk6#gU<)=htN} z`nK(e3Wa!6h#^?(d3f}?%zK^Z9`U`PtZv}CEZmQ7Z^0p9)$NOVUy#Zz6=gR^UU>h- zRqXc*=%WYie&3AU~^ur_QosS~tlgRrNa(@DS`ANA3 z|Fy^Db9P@pjNW5kS0HseK+^TF@zHYA>%7vvz7#QmOg5Cd%SKn(r`4>E!*z8;c?dG!%KyUMF;yn2LJkMimoi zeLa0Aa7L?N!x`{{^r^4~!HWd}y8m880kIGEl#gl6wbGQ2wWcv+t%d_S*?x8Qr@`v| z(*$LLkx3$q08 z5raT=;3}vS`Vff(Zz~%D<>gAj2}w&pUs=fvFI4sQ^x`FI-Mt9TQfHBNy5GWpY!l3a zbZqiZ4;kRcPGYGYPLdH7r5G)=3id)cP1fVnqXzUjtxvGnMOq+^Q)E^J^q3wKyqMoe zki0|h-YDdFV@5F}A{rirEigIE@rJ<8|1SVbcCHzAi=ExTruFO}BVakxvux7>D|lWC zqSWe%U|D4OtH7f@E~n^V_xU)qM!4LbmHs%iPPm;6@oJb?BfLuUYLr(OjZ;b-F-1~w zIWL28=uWs=Eo)2&CFPrPCmmFJ>8f&oUx)Yw#eYhszsD5S7S|MjfRzE3v3a?HUOBqV z>;#=Wz#oDtQ-xomrZ#2@O^oJ?4nnjPy4_MN4$JVnJWKP0J|XIiQU{W(N^RBGb(M zu4aZgx~3SO3Rs2@@-lV|M%?_tMekvqm$4M|d5WW`-|;iBcf%O9L~rf4!tQbWeBmdG zyAWMP@y*P?gQ~*#-G>7bVYq{og#^*m!$Q{(7<~w>%Bv`^u;FI>RbsrtQT*!?=T!}_ zX7CDeYpzS3-jO2>i$m4kk(F`1-M_T|P4SqtN3?u|XCx{Re4Tt@yd*o>l@~J$8 z=(!T2>H(ND-TfrLQj1rgHd?-9650eK(~TfRRQk5rf`7y@qv4b3b+A-@|)2!wPH zA+!91{2>T=J`W*!o`)#w1A3&%PsodbgkX&bBBaSr$jcz)>v;&#(j>&CCV-G;KOuh{ zNC=jwAVQk`guvq-4sF3hqor2}(>ohL$ZS6$e;P;#g0%(_GTTqc_dv*7c?i*~O<3*+ z2Ze!MP+)WC|1wI3q@4hip)T(6;scky@(+J@tW1O-I-YsgzAQj#mzk)MY8!g?ApU<}Yp+PVeU?sp(4 zS^~Gzl}c|}TzU8CmGW+-%D*>Xi@sH3kW?{fVR+k~;L5@@u~^;lbMExG1u(&l9MG>t zk9Y~Nyv?2Z+3J06_ktU%RCS_zk86g*g<8?=m<;CzDvE*Or9A#(vB-_=%>&y-ejO01 zNzKw`-0KtY`d;gjoWJwDv-IGf|EJU-_S^X>ahB2+P<`Z^rP%VWl)D*J`yPJX%db=X zI?b;$h=`-l&!CG+JUlb=7gtZ6{geD&TOVBLnj3({Zp=gv^6s~g8yla3M5PKE6nI9# zS=c|DfP5(#Y0Cqz8K|+^l3fa2voS~P6uW>nXV(})LxWP@gF*#C&6wVECe-CYF#)Q2 z5xl64F6BYKJ{WXMMG~T%0q?pHw*YzAiz>=jBVC4u5v+QM5FZJ%?hat@cs?}y1zDt6m_;cqS%OFW z+Y)|Rd*3X03GVEi-0MbK;7L6IfmDXJlh}0(W2bwSsfy>2>#u#+%tbHsfTzD=@PT zG{ejuRKs{GGq<+k??vaGQYBcXv#y?`@rX0wl^sC7{H=IJ%xM*ekh6h=aGzFZ_7GxD zt2l%Vf{=502(iMd==d)F9*Jl}(II3gkPv-NC8tNs`5lLliy$PEhY-z$R(uyfA?1ET z?hhnH$9Ksgq+DC94j~$F;!%j)p`klDhlcT8!afFjMJoJ+Tn!*Z^Xx$satOQQx)5TD z1p0vIy{g}mSf;kqHLqykDVQJ~@aYKhYBsLG%;1?hT}vNIC6E}##y;l=jqBt1D<&Y3 z8g+5ftG54S%cH+O1X}nhy7{gbaUJGE37j6dU-^`GypOp|MRCRZneiUil6Caod9UN> zpYQ!O#OenhkxnH)H+`j3Y?fZ7&5yBbJm zu}o+6JFoO8LE~4UMT;FDF`05g=RwGaF`l$3u~CC5OG!#UnMuY})hH{vrZ zD@|TD{p`rgGvS~~Cru^w3tG}9jEeH^GN)>MOsd>JXh=GtRcAA_YLo45jnJyRO~tSv zp63-pK+KjQUg6zFv-xhLCcfKfwv1Nc>mt80{L1ocj9-kd$^@6Jm&;r!c`{&eyfyhh zAD|EI{fU%`a?s$ihIXXWc%=)Ymlop6ARWi{j)+-DhVprwsOr34CHV|U+rTsD1p|UV zxXeA}a-v_&+jj;04Svov_9wAh6qBTRxuH+}l=Eb_M??8M`) zxnEM)35)-X{B!&HmK=1#Uq(*Ii8?MXriN0?szR$|rKt_}l#1$5^z}};(Xwuqqj79k z_E;}wips-rymsR%W2f#mQA(knswkz5qk15Y-Q7cRp4^GUJr$W-WRbDtI{D^txIxD0 zcUsKf-Pchn;sp+yOm>k9H2x+L1@!}pNWD^9}ubO|(x)+}6|+k0sJ@e$v%L+giW8SQ}Y09lQXE=Rke@^92+ zUFEAH$$p)Ql29oH=5Y%v;y=!}mo<;(x7g)D63@j6o0UL;q>bDFr zvp=ka?Us#zj@WYt6kjM(YUHIbkNcM?OG1a0*ae+xH|*&igq64xUAYfL?}tHqSP`Nv z5*;5E8Ie!#Ja^;T4lAMUMp8G7J_zHtb#mSTY`zZSaTm1G6X@)d7`VGJJomV$XoYdZ z?qGm0YyVqYo!(xxJp!CwJrmfg+RS8TkI8C00+?IdLrFCCJ{KVsHX#*;`{-EA=m>s7 zj7NY&$oW7*_~s*>*+Yo&2yh5VgOJfYgjhyA#7_Vr#v{NXWGs-7-e5wEM}R}f1PHm3 zhY&rVtdOMs9x)yP4j~T*5~72M<_wMT2yh5_6ofpMhY&q^LzJ!oJz_ip96~-GNC>2I z(9jr<0EduIf{>^35TaxRf^ggdt5^@SCkRK=b!q0T)TX%>1G8L3RoU!T1!J1QOv{vK zOjvpDFyB2&d{IQvPX-e1R$x8q;qf&)4u)1&=R$mM*wY zr=*M&hMld73|~U=h8|7bJyGP=OpRI%3v!M$Ez+(%V+y{pf9TBG3}rcoe8Y zgODuSiO{(kE}Cng1+7IL>!5S3hf1(P)yJ2`p-e2yv+&C+jgaz+?wwro8S`i!L=&&( z19gCi!4)HUmP-g%6jY16;%IZ~rT=~odHE^2W$znrAD}WHP@fh0#c@raie+ipZ-FLY z5gvo7XM+Fb@#ZOo3vb+B^jotzY>O(o9jo|8jc1QUiJSRo%&|$%;hf{nz~j_0*+L7p^1rg$ z?ItyyZUNH)gXMkId7j?K>i%1@y{_KotvoSoQRDcAg=Bj7#-msqwcCfaJUVp|V){__ z#2fuHgHt_@P2q+(OyHV0gSX^AoRDXL13`?gJesam2B#)BuPuVGWHZ1Fv{0;QbM57u zYZ%vJ73d7VRs?Q7pQ+L_f+nR%;0bIlo_Z0eOiJAI5@#8RuDxN zpbdoeftfWn!pt5+((DF1)o%u^TT}_wmZPqorR%pg5@8{B;wQxH20Mgo4W>w1)T=Copf{c2F^sC=^ zZrPnsEcn@g1e4?dpOkKl%1j+}@E?o(a0~6Bp0_l4qe>hbR?yNg_XDHlQhR297u z{d>CJdk1sJm9+y|-)rVYc^K+v z-QPzEoGOKKFaVzZ#~eS!rDt*#%F5sk`X95-4EeI2SDy5R3YcT%SJdtZE-qH|Gi!LJ{W_^0WMfBro?T)w?FM1&4_kxl`UM z$U)CAowtc9-d&WiPEoYi3KnH{^9wb$%_>lhf~~i-@PcJ>gF*iz$6P5^ruM`r)bLiTJk_D!Dy_ic{khCjY#73#VB2jg-6gX8 z0*CLK)Bo7?-T8~Ov@?IR=j>@d^%ABBKXk#f{yl%~k(|O@M{^K{fI$uHgDd8Us$S{+ zbtJ#~^KEaT6Zvt=YSaNNBu^i>CMI?!%`14ihj3nHU;?f!Nhf|>aHTVjfBzT1LZkTE zVYLds&tLl^EF8rv-I*8}NspnXoo1Wb4l5O0->n;mCJ_5W`04i4R|XkBiTaGuU!=Oa zue?{4MSt?snuFqX?c>q}qYRrn~CE82s$@RJ#t#Q3=(Wv+$2;EkElkwU)v)_~V^BHT>^mrPg31LE(!0(WRY= zesQ8$MOKg(>(ohbXZge0IyLa(|3f8}&nBokg3I?iPCMn7KT%Toda|n;dTcl9oU!ovy*jnL z^ob(1SgIf=p<&?QmiTw2ojNjKEU^yXHfEqe@$WV{)r7uOVl@Su;olW-%75ec@|JI@ txEAn8cmsO|!5!s?w454FeWhp(IlzhOq;jaU0xzge`8*J{cVFP${{wC{nNa`$ diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index deaa0afb02ad1cf83efb7868e15b8f70c4236913..287302188b7c28bb7c37d5345bad592da56eb884 100644 GIT binary patch delta 328 zcmeCN?6Kqt@MdP=VqoB4V7Qz#kw=s1Qqn~8=}bWO1qBfKNfSs;mSr>sQ9+EBAgY(q z0Ysf=bOTY*Oa_xLaBxiaXX1izoj}xlCPxURKY4*52Z}A5Rhe^`fRdXhvu1+nf9&rV zLHu`|Yry7PhKF%fnv*MRpuNfpycMsteIf?ANxB- z5dR(L8Zdtj&oeOH!v7j9UMR@V43cjW;Q;X`_lQ~oojLiqDA*aCVg?{VYca6f%EX*O zyxn4+Ac{>q07ONIhk>XK;z1BfX0n2W8Hl-BLS}M_geim>2%`Q; allItems (); /** - * Checks whether the basket has items in it. This method is wrapper to - * isEmpty() + * Calculates total price (no tax added) of current item. If no current item + * is set and no amount, a NPE is thrown. * - * @return Whether the basket is empty + * @return Current item's total price */ - public boolean hasItems (); + public Float calculateCurrentItemPrice (); /** - * Checks whether the currently set product is added in basked + * Calculates total price (no tax added) for given item. * - * @param product Product instance - * @return Whether the product is added + * @param item Item instance to calculate total price for + * @return Total price */ - public boolean isProductAdded (final Product product); + public Float calculateItemPrice (final AddableBasketItem item); /** - * Adds given product instance to basket by adding amount from form data to - * it. + * Calculates total sum (no tax added) for all items * - * @param product Product instance to add - * @return Redirect target or null + * @return Total price of all items */ - public String addItem (final Product product); + public Float calculateTotalPrice (); + + /** + * Changes given item instance's amount in basket and redirects to proper + * page. If the item is not found, another "error" page is called. + * + * @param item Item instance to change + * @return Page redirection + */ + public String changeItem (final AddableBasketItem item); + + /** + * Clears this basket instance + */ + public void clear (); /** * Getter for item amount property @@ -94,27 +110,14 @@ public interface BasketWebController extends Serializable { public void setCurrentItem (final AddableBasketItem currentItem); /** - * Calculates total price (no tax added) of current item. If no current item - * is set and no amount, a NPE is thrown. - * - * @return Current item's total price - */ - public Float calculateCurrentItemPrice (); - - /** - * Calculates total price (no tax added) for given item. - * - * @param item Item instance to calculate total price for - * @return Total price - */ - public Float calculateItemPrice (final AddableBasketItem item); - - /** - * Calculates total sum (no tax added) for all items + * Some getter for item amount of given product. This method requires a full + * iteration over all items in the basket to look for proper product + * instance. * - * @return Total price of all items + * @param product Product instance + * @return Item amount of given product */ - public Float calculateTotalPrice (); + public Long getItemAmount (final Product product); /** * Getter for last entry @@ -131,35 +134,32 @@ public interface BasketWebController extends Serializable { public int getLastNumRows (); /** - * Gets for all added items + * Checks whether the basket has items in it. This method is wrapper to + * isEmpty() * - * @return A list of all added items + * @return Whether the basket is empty */ - public List allItems (); + public boolean hasItems (); /** - * Some getter for item amount of given product. This method requires a full - * iteration over all items in the basket to look for proper product - * instance. - * - * @param product Product instance - * @return Item amount of given product + * Checks whether the basket is empty + * + * @return Whether the basket is empty */ - public Long getItemAmount (final Product product); + public boolean isEmpty (); /** - * Changes given item instance's amount in basket and redirects to proper - * page. If the item is not found, another "error" page is called. + * Checks whether the currently set product is added in basked * - * @param item Item instance to change - * @return Page redirection + * @param product Product instance + * @return Whether the product is added */ - public String changeItem (final AddableBasketItem item); + public boolean isProductAdded (final Product product); /** * Outputs last added item in the basket. - * + * * @return Last added item */ - public String outputLastAddedItem(); + public String outputLastAddedItem (); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java index 687ada65..2db3a58e 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java @@ -35,9 +35,10 @@ import org.mxchange.pizzaapplication.beans.shop.ShopWebController; * * @author Roland Haeder */ -@Named("admin_category") +@Named ("admin_category") @RequestScoped public class AdminCategoryWebBean implements AdminCategoryWebController { + /** * Serial number */ @@ -62,9 +63,9 @@ public class AdminCategoryWebBean implements AdminCategoryWebController { private String title; /** - * Parent id + * Parent category */ - private Long parentId; + private Category parentCategory; /** * Default constructor @@ -88,7 +89,7 @@ public class AdminCategoryWebBean implements AdminCategoryWebController { try { // Create category Category category = new ProductCategory(); - category.setParentId(this.getParentId()); + category.setParentCategory(this.getParentCategory()); category.setTitle(this.getTitle()); // Deligate to remote bean @@ -113,12 +114,12 @@ public class AdminCategoryWebBean implements AdminCategoryWebController { } @Override - public Long getParentId () { - return this.parentId; + public Category getParentCategory () { + return this.parentCategory; } @Override - public void setParentId (final Long parentId) { - this.parentId = parentId; + public void setParentCategory (final Category parentCategory) { + this.parentCategory = parentCategory; } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java index 545550ad..8ea0703d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java @@ -17,6 +17,7 @@ package org.mxchange.pizzaapplication.beans.category; import javax.faces.view.facelets.FaceletException; +import org.mxchange.jshopcore.model.category.Category; /** * An interface for product controllers for "ADMIN" role @@ -28,35 +29,36 @@ public interface AdminCategoryWebController { /** * Adds given category data from request to database * - * @throws javax.faces.view.facelets.FaceletException If something unexpected happened + * @throws javax.faces.view.facelets.FaceletException If something + * unexpected happened */ public void addCategory () throws FaceletException; /** - * Getter for title + * Getter for parent id * - * @return the title + * @return Parent id */ - public String getTitle (); + public Category getParentCategory (); /** - * Setter for title + * Setter for parent category * - * @param title the title to set + * @param parentCategory Parent category to set */ - public void setTitle (final String title); + public void setParentCategory (final Category parentCategory); /** - * Getter for parent id + * Getter for title * - * @return Parent id + * @return the title */ - public Long getParentId (); + public String getTitle (); /** - * Setter for parent id + * Setter for title * - * @param parentId Parent id to set + * @param title the title to set */ - public void setParentId (final Long parentId); + public void setTitle (final String title); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java index c85fdb0d..726fabed 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java @@ -69,7 +69,7 @@ public class CheckoutWebBean implements CheckoutWebController { * Queue instance */ private Queue queue; - + /** * Session instance */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java index f314f02b..a3250207 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java @@ -25,9 +25,10 @@ import org.mxchange.jshopcore.model.customer.Customer; * @author Roland Haeder */ public interface CheckoutWebController extends Serializable { + /** * Runs the actual checkout and returns a proper page redirection target. - * + * * @return Page redirection target */ public String doCheckout (); diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index 32638065..b9ccd5cc 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -23,7 +23,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcore.model.contact.Contact; -import org.mxchange.jcore.model.contact.CustomerContact; +import org.mxchange.jcore.model.contact.UserContact; import org.mxchange.jcore.model.contact.gender.Gender; import org.mxchange.jshopcore.model.customer.Customer; import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote; @@ -34,18 +34,15 @@ import org.mxchange.jshopcore.model.customer.ShopCustomer; * * @author Roland Haeder */ -@Named("customerController") +@Named ("customerController") @SessionScoped public class CustomerWebBean implements CustomerWebController { + /** * Serial number */ private static final long serialVersionUID = 542_145_347_916L; - /** - * Remote customer bean - */ - private final CustomerSessionBeanRemote customerBean; /////////////////////// Properties ///////////////////// /** @@ -72,16 +69,15 @@ public class CustomerWebBean implements CustomerWebController { * Country code */ private String countryCode; - /** - * Email address + * Remote customer bean */ - private String emailAddress; + private final CustomerSessionBeanRemote customerBean; /** - * Gender instance + * Email address */ - private Gender gender; + private String emailAddress; /** * Family name @@ -98,6 +94,11 @@ public class CustomerWebBean implements CustomerWebController { */ private String firstName; + /** + * Gender instance + */ + private Gender gender; + /** * House number */ @@ -150,11 +151,7 @@ public class CustomerWebBean implements CustomerWebController { Customer customer = new ShopCustomer(); // Create new contact - Contact contact = new CustomerContact(); - contact.setGender(this.getGender()); - contact.setFirstName(this.getFirstName()); - contact.setFamilyName(this.getFamilyName()); - contact.setCompanyName(this.getCompanyName()); + Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName(), this.getCompanyName()); contact.setStreet(this.getStreet()); contact.setHouseNumber(this.getHouseNumber()); contact.setZipCode(this.getZipCode()); @@ -174,103 +171,103 @@ public class CustomerWebBean implements CustomerWebController { } @Override - public Gender getGender () { - return this.gender; + public String getCellphoneNumber () { + return this.cellphoneNumber; } @Override - public void setGender (final Gender gender) { - this.gender = gender; + public void setCellphoneNumber (final String cellphoneNumber) { + this.cellphoneNumber = cellphoneNumber; } @Override - public String getCompanyName () { - return this.companyName; + public String getCity () { + return this.city; } @Override - public void setCompanyName (final String companyName) { - this.companyName = companyName; + public void setCity (final String city) { + this.city = city; } @Override - public String getFirstName () { - return this.firstName; + public String getCompanyName () { + return this.companyName; } @Override - public void setFirstName (final String firstName) { - this.firstName = firstName; + public void setCompanyName (final String companyName) { + this.companyName = companyName; } @Override - public String getFamilyName () { - return this.familyName; + public String getCountryCode () { + return this.countryCode; } @Override - public void setFamilyName (final String familyName) { - this.familyName = familyName; + public void setCountryCode (final String countryCode) { + this.countryCode = countryCode; } @Override - public String getStreet () { - return this.street; + public String getEmailAddress () { + return this.emailAddress; } @Override - public void setStreet (final String street) { - this.street = street; + public void setEmailAddress (final String emailAddress) { + this.emailAddress = emailAddress; } @Override - public Long getHouseNumber () { - return this.houseNumber; + public String getFamilyName () { + return this.familyName; } @Override - public void setHouseNumber (final Long houseNumber) { - this.houseNumber = houseNumber; + public void setFamilyName (final String familyName) { + this.familyName = familyName; } @Override - public Long getZipCode () { - return this.zipCode; + public String getFaxNumber () { + return this.faxNumber; } @Override - public void setZipCode (final Long zipCode) { - this.zipCode = zipCode; + public void setFaxNumber (final String faxNumber) { + this.faxNumber = faxNumber; } @Override - public String getCity () { - return this.city; + public String getFirstName () { + return this.firstName; } @Override - public void setCity (final String city) { - this.city = city; + public void setFirstName (final String firstName) { + this.firstName = firstName; } @Override - public String getCountryCode () { - return this.countryCode; + public Gender getGender () { + return this.gender; } @Override - public void setCountryCode (final String countryCode) { - this.countryCode = countryCode; + public void setGender (final Gender gender) { + this.gender = gender; } @Override - public String getEmailAddress () { - return this.emailAddress; + public Long getHouseNumber () { + return this.houseNumber; } @Override - public void setEmailAddress (final String emailAddress) { - this.emailAddress = emailAddress; + public void setHouseNumber (final Long houseNumber) { + this.houseNumber = houseNumber; } @Override @@ -284,23 +281,23 @@ public class CustomerWebBean implements CustomerWebController { } @Override - public String getFaxNumber () { - return this.faxNumber; + public String getStreet () { + return this.street; } @Override - public void setFaxNumber (final String faxNumber) { - this.faxNumber = faxNumber; + public void setStreet (final String street) { + this.street = street; } @Override - public String getCellphoneNumber () { - return this.cellphoneNumber; + public Long getZipCode () { + return this.zipCode; } @Override - public void setCellphoneNumber (final String cellphoneNumber) { - this.cellphoneNumber = cellphoneNumber; + public void setZipCode (final Long zipCode) { + this.zipCode = zipCode; } @Override diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java index 554e9c1d..cc6c07ea 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java @@ -35,144 +35,144 @@ public interface CustomerWebController extends Serializable { public Customer createCustomerInstance (); /** - * Gender of the contact + * Cellphone number * - * @return the gender + * @return the cellphoneNumber */ - public Gender getGender (); + public String getCellphoneNumber (); /** - * Gender of the contact + * Cellphone number * - * @param gender the gender to set + * @param cellphoneNumber the cellphoneNumber to set */ - public void setGender (final Gender gender); + public void setCellphoneNumber (final String cellphoneNumber); /** - * Company name + * City * - * @return the companyName + * @return the city */ - public String getCompanyName (); + public String getCity (); /** - * Company name + * City * - * @param companyName the companyName to set + * @param city the city to set */ - public void setCompanyName (final String companyName); + public void setCity (final String city); /** - * First name + * Company name * - * @return the first name + * @return the companyName */ - public String getFirstName (); + public String getCompanyName (); /** - * First name + * Company name * - * @param firstName the first name to set + * @param companyName the companyName to set */ - public void setFirstName (final String firstName); + public void setCompanyName (final String companyName); /** - * Family name + * Country code * - * @return the familyName + * @return the countryCode */ - public String getFamilyName (); + public String getCountryCode (); /** - * Family name + * Country code * - * @param familyName the familyName to set + * @param countryCode the countryCode to set */ - public void setFamilyName (final String familyName); + public void setCountryCode (final String countryCode); /** - * Street + * Email address * - * @return the street + * @return the emailAddress */ - public String getStreet (); + public String getEmailAddress (); /** - * Street + * Email address * - * @param street the street to set + * @param emailAddress the emailAddress to set */ - public void setStreet (final String street); + public void setEmailAddress (final String emailAddress); /** - * House number + * Family name * - * @return the houseNumber + * @return the familyName */ - public Long getHouseNumber (); + public String getFamilyName (); /** - * House number + * Family name * - * @param houseNumber the houseNumber to set + * @param familyName the familyName to set */ - public void setHouseNumber (final Long houseNumber); + public void setFamilyName (final String familyName); /** - * ZIP code + * Fax number * - * @return the zipCode + * @return the faxNumber */ - public Long getZipCode (); + public String getFaxNumber (); /** - * ZIP code + * Fax number * - * @param zipCode the zipCode to set + * @param faxNumber the faxNumber to set */ - public void setZipCode (final Long zipCode); + public void setFaxNumber (final String faxNumber); /** - * City + * First name * - * @return the city + * @return the first name */ - public String getCity (); + public String getFirstName (); /** - * City + * First name * - * @param city the city to set + * @param firstName the first name to set */ - public void setCity (final String city); + public void setFirstName (final String firstName); /** - * Country code + * Gender of the contact * - * @return the countryCode + * @return the gender */ - public String getCountryCode (); + public Gender getGender (); /** - * Country code + * Gender of the contact * - * @param countryCode the countryCode to set + * @param gender the gender to set */ - public void setCountryCode (final String countryCode); + public void setGender (final Gender gender); /** - * Email address + * House number * - * @return the emailAddress + * @return the houseNumber */ - public String getEmailAddress (); + public Long getHouseNumber (); /** - * Email address + * House number * - * @param emailAddress the emailAddress to set + * @param houseNumber the houseNumber to set */ - public void setEmailAddress (final String emailAddress); + public void setHouseNumber (final Long houseNumber); /** * Phone number @@ -189,32 +189,32 @@ public interface CustomerWebController extends Serializable { public void setPhoneNumber (final String phoneNumber); /** - * Fax number + * Street * - * @return the faxNumber + * @return the street */ - public String getFaxNumber (); + public String getStreet (); /** - * Fax number + * Street * - * @param faxNumber the faxNumber to set + * @param street the street to set */ - public void setFaxNumber (final String faxNumber); + public void setStreet (final String street); /** - * Cellphone number + * ZIP code * - * @return the cellphoneNumber + * @return the zipCode */ - public String getCellphoneNumber (); + public Long getZipCode (); /** - * Cellphone number + * ZIP code * - * @param cellphoneNumber the cellphoneNumber to set + * @param zipCode the zipCode to set */ - public void setCellphoneNumber (final String cellphoneNumber); + public void setZipCode (final Long zipCode); /** * Checks whether all required personal data is set diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java index 29b26d0f..90fa3dea 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java @@ -30,7 +30,8 @@ public interface AdminProductWebController { /** * Adds given product data from request to database * - * @throws javax.faces.view.facelets.FaceletException If something unexpected happened + * @throws javax.faces.view.facelets.FaceletException If something + * unexpected happened */ public void addProduct () throws FaceletException; @@ -43,58 +44,58 @@ public interface AdminProductWebController { public List getAllProducts () throws FaceletException; /** - * Getter for product's title property + * Getter for product's available property * - * @return Product's title + * @return Product's available property */ - public String getTitle (); + public Boolean getAvailable (); /** - * Setter for product's title property - * - * @param title Product's title + * Setter for product's available property + * + * @param available Product's available property */ - public void setTitle (final String title); + public void setAvailable (final Boolean available); /** - * Getter for product's price property + * Getter for product's category id * - * @return Product's price property + * @return Product's category id */ - public Float getPrice (); + public Long getId (); /** - * Setter for product's price property - * - * @param price Product's price property + * Setter for product's category id + * + * @param id Product's category id */ - public void setPrice (final Float price); + public void setId (final Long id); /** - * Setter for product's available property - * - * @param available Product's available property + * Getter for product's price property + * + * @return Product's price property */ - public void setAvailable (final Boolean available); + public Float getPrice (); /** - * Getter for product's available property - * - * @return Product's available property + * Setter for product's price property + * + * @param price Product's price property */ - public Boolean getAvailable (); + public void setPrice (final Float price); /** - * Getter for product's category id + * Getter for product's title property * - * @return Product's category id + * @return Product's title */ - public Long getId (); + public String getTitle (); /** - * Setter for product's category id + * Setter for product's title property * - * @param id Product's category id + * @param title Product's title */ - public void setId (final Long id); + public void setTitle (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 07f2bd66..a06cda1e 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java @@ -25,6 +25,7 @@ import org.mxchange.jshopcore.model.customer.Customer; * @author Roland Haeder */ public interface ReceiptWebController extends Serializable { + /** * Fetches last access key for given customer instance * @@ -33,16 +34,16 @@ public interface ReceiptWebController extends Serializable { public String fetchAccessKey (); /** - * Setter for customer instamce + * Getter for customer instamce * - * @param customer Customer instance + * @return Customer instance */ - public void setCustomer (final Customer customer); + public Customer getCustomer (); /** - * Getter for customer instamce + * Setter for customer instamce * - * @return Customer instance + * @param customer Customer instance */ - public Customer getCustomer (); + public void setCustomer (final Customer customer); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java index 172c4bc6..9b233a73 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java @@ -39,7 +39,7 @@ import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; * * @author Roland Haeder */ -@Named("controller") +@Named ("controller") @ApplicationScoped public class ShopWebBean extends BaseEeSystem implements ShopWebController { @@ -73,29 +73,6 @@ public class ShopWebBean extends BaseEeSystem implements ShopWebController { } } - @PostConstruct - public void init () { - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the bean - CategorySessionBeanRemote categoryBean = (CategorySessionBeanRemote) context.lookup("ejb/stateless-category"); //NOI18N - - // Get all categories - this.categories = categoryBean.getAllCategories(); - - // Try to lookup the bean - ProductSessionBeanRemote productBean = (ProductSessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N - - // Get available products list - this.availableProducts = productBean.getAvailableProducts(); - } catch (final NamingException e) { - // Continued to throw - throw new FacesException(e); - } - } - @Override public List getAllCategories () throws FacesException { // Return it @@ -109,7 +86,7 @@ public class ShopWebBean extends BaseEeSystem implements ShopWebController { List deque = new LinkedList<>(); // Create fake entry - Category fake = new ProductCategory(0L, this.getMessageStringFromKey("ADMIN_CATEGORY_HAS_NO_PARENT"), 0L); //NOI18N + Category fake = new ProductCategory(0L, this.getMessageStringFromKey("ADMIN_CATEGORY_HAS_NO_PARENT"), null); //NOI18N // Add it deque.add(fake); @@ -127,4 +104,27 @@ public class ShopWebBean extends BaseEeSystem implements ShopWebController { // TODO Find something better here to prevent warning return Collections.unmodifiableList(this.availableProducts); } + + @PostConstruct + public void init () { + try { + // Get initial context + Context context = new InitialContext(); + + // Try to lookup the bean + CategorySessionBeanRemote categoryBean = (CategorySessionBeanRemote) context.lookup("ejb/stateless-category"); //NOI18N + + // Get all categories + this.categories = categoryBean.getAllCategories(); + + // Try to lookup the bean + ProductSessionBeanRemote productBean = (ProductSessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N + + // Get available products list + this.availableProducts = productBean.getAvailableProducts(); + } catch (final NamingException e) { + // Continued to throw + throw new FacesException(e); + } + } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java index efdadb28..4de37aa2 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java @@ -43,14 +43,6 @@ public interface ShopWebController extends Serializable { */ public void addProduct (final Product product); - /** - * Some "getter" for a linked list of only available products - * - * @return Only available products - * @throws javax.faces.view.facelets.FaceletException If anything went wrong - */ - public List getAvailableProducts () throws FaceletException; - /** * Some "getter" for a linked list of all categories * @@ -67,4 +59,12 @@ public interface ShopWebController extends Serializable { * @throws javax.faces.view.facelets.FaceletException If anything went wrong */ public List getAllCategoriesParent () throws FaceletException; + + /** + * Some "getter" for a linked list of only available products + * + * @return Only available products + * @throws javax.faces.view.facelets.FaceletException If anything went wrong + */ + public List getAvailableProducts () throws FaceletException; } diff --git a/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java b/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java index 944bfd0c..9e2cf9db 100644 --- a/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java +++ b/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java @@ -62,6 +62,11 @@ public class PdfReceiptServlet extends HttpServlet { } } + @Override + public String getServletInfo () { + return "Produces an official recipit as PDF file for given access key."; + } + @Override protected void doGet (final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { // Is the key set? @@ -83,9 +88,4 @@ public class PdfReceiptServlet extends HttpServlet { this.doGet(request, response); } - @Override - public String getServletInfo () { - return "Produces an official recipit as PDF file for given access key."; - } - } diff --git a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl index 6841d027..3141b802 100644 --- a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl +++ b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl index 9d87117a..ef9e7100 100644 --- a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl +++ b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> - - + + diff --git a/web/WEB-INF/templates/basket/total_sum.tpl b/web/WEB-INF/templates/basket/total_sum.tpl index c350d77c..274f9a49 100644 --- a/web/WEB-INF/templates/basket/total_sum.tpl +++ b/web/WEB-INF/templates/basket/total_sum.tpl @@ -1,11 +1,11 @@ + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + >
diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml index 8db504cc..021b989a 100644 --- a/web/admin/category.xhtml +++ b/web/admin/category.xhtml @@ -29,12 +29,12 @@ #{msg.ADMIN_ENTER_CATEGORY_TITLE} - #{cat.title} + #{cat.title} #{msg.ADMIN_PARENT_CATEGORY} - #{cat.parentId} + #{cat.parentCategory.categoryId} @@ -48,45 +48,45 @@
-
-
- #{msg.ADMIN_ADD_CATEGORY_TITLE} -
+
+
+ #{msg.ADMIN_ADD_CATEGORY_TITLE} +
-
- #{msg.PLEASE_FILL_ALL_FIELDS} +
+ #{msg.PLEASE_FILL_ALL_FIELDS} -
-
- #{msg.ADMIN_ENTER_CATEGORY_TITLE} -
#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}
-
+
+
+ #{msg.ADMIN_ENTER_CATEGORY_TITLE} +
#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}
+
-
- +
+ +
+ +
-
-
+
+
+ #{msg.ADMIN_PARENT_CATEGORY} +
-
-
- #{msg.ADMIN_PARENT_CATEGORY} -
+
+ +
-
- +
+
-
+ -
- - -
diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml index c1427f2f..33b0a9d7 100644 --- a/web/admin/product.xhtml +++ b/web/admin/product.xhtml @@ -28,22 +28,22 @@ #{msg.ADMIN_ENTER_PRODUCT_TITLE} - #{product.title} + #{product.title} #{msg.SINGLE_ITEM_PRICE} - #{product.price} + #{product.price} #{msg.CATEGORY} - #{product.categoryId} + #{product.categoryId} #{msg.IS_AVAILABLE} - #{product.available} + #{product.available} @@ -57,73 +57,73 @@
-
-
- #{msg.ADMIN_ADD_PRODUCT_TITLE} -
+
+
+ #{msg.ADMIN_ADD_PRODUCT_TITLE} +
-
- #{msg.PLEASE_FILL_ALL_FIELDS} +
+ #{msg.PLEASE_FILL_ALL_FIELDS} -
-
- #{msg.ADMIN_ENTER_PRODUCT_TITLE} -
#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}
-
+
+
+ #{msg.ADMIN_ENTER_PRODUCT_TITLE} +
#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}
+
-
- +
+ +
+ +
-
-
+
+
+ #{msg.SINGLE_ITEM_PRICE} +
(z.B. 50.0)
+
-
-
- #{msg.SINGLE_ITEM_PRICE} -
(z.B. 50.0)
-
+
+ +
-
- +
-
-
+
+
+ #{msg.CATEGORY} +
-
-
- #{msg.CATEGORY} -
+
+ +
-
- +
-
-
+
+
+ #{msg.IS_AVAILABLE} +
-
-
- #{msg.IS_AVAILABLE} -
+
+ + + + +
-
- - - - +
+
-
+ -
- - -
diff --git a/web/errorHandler.xhtml b/web/errorHandler.xhtml index 8d19de41..adb51696 100644 --- a/web/errorHandler.xhtml +++ b/web/errorHandler.xhtml @@ -1,7 +1,7 @@ -<%-- - Document : errorHandler - Created on : 05.08.2015, 12:06:39 - Author : Roland Haeder +<%-- +Document : errorHandler +Created on : 05.08.2015, 12:06:39 +Author : Roland Haeder --%> <%@page import="java.io.PrintWriter"%> diff --git a/web/index.xhtml b/web/index.xhtml index 225b9c29..5e10ffb6 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -34,7 +34,7 @@
- #{product.title} + #{product.title}
-- 2.39.5