From 41fceee4732f757e045650dbaab3908940e90ac4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 1 Sep 2015 15:26:42 +0200 Subject: [PATCH] Refacturing towards JSF: - Well, this sucks a bit: getAvailableProducts() needs to return something that is Collection and not Iterator (which worked in JSP) - Added initial index.xhtml and CSS layout for upcoming rewrite (origin: NetBeans) - updated jcore/jshop MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by:Roland Häder --- lib/jcore.jar | Bin 120581 -> 120623 bytes lib/jshop.jar | Bin 77372 -> 81778 bytes nbproject/faces-config.NavData | 0 nbproject/project.properties | 1 + .../application/PizzaApplication.java | 31 +++- .../application/PizzaServiceApplication.java | 55 +++++-- .../beans/controller/PizzaBean.java | 37 ++++- .../beans/controller/PizzaServiceBean.java | 66 +++------ .../servlet/basket/BasketItemAddedFilter.java | 95 ++++++------ .../tags/basket/MiniBasketTag.java | 6 +- web/WEB-INF/faces-config.xml | 7 + web/WEB-INF/templates/base.tpl | 43 ++++++ web/WEB-INF/templates/guest/guest_footer.tpl | 16 +++ web/WEB-INF/templates/guest/guest_menu.tpl | 19 +++ web/WEB-INF/web.xml | 4 +- web/admin/category.jsp | 2 +- web/admin/product.jsp | 2 +- web/index.jsp | 3 +- web/index.xhtml | 135 +++++++++++++++++ web/resources/css/cssLayout.css | 136 ++++++++++++++++++ web/resources/css/default.css | 28 ++++ .../admin/admin_category_selection_box.jsp | 2 +- .../admin_parent_category_selection_box.jsp | 2 +- 23 files changed, 561 insertions(+), 129 deletions(-) create mode 100644 nbproject/faces-config.NavData create mode 100644 web/WEB-INF/faces-config.xml create mode 100644 web/WEB-INF/templates/base.tpl create mode 100644 web/WEB-INF/templates/guest/guest_footer.tpl create mode 100644 web/WEB-INF/templates/guest/guest_menu.tpl create mode 100644 web/index.xhtml create mode 100644 web/resources/css/cssLayout.css create mode 100644 web/resources/css/default.css diff --git a/lib/jcore.jar b/lib/jcore.jar index 8b05d574954f3d02853e6d4a7108c1987006d686..f2672bd2d64abe828581866c58440a7f7c591b5c 100644 GIT binary patch delta 2170 zcmaJ@eNa?Y6u-ay*xXJk~c6iFEZMid7UQ7J7jL# zbH-SG#^{rptkro5;UPpwMww5TCOD%kiZpWW3g+vtVe)DlhX{rgL^FJh84MMAi*09~ zx7!M~K}0bZtF_n$8a&;(aYhTdI$?JA)@l+s;<0A78u$i-l-dTgW?Qw^i_JQ1B7;ts z%&<^5m!Vu2!||qKgksY~o@`5k zjhD8MT7(50YhRg$FfN?^lN|h^Glyh^Bp$EmDhc!vf=3jYLowdge9cJ9UW1>#BM)b_ zQ^!mUduwf0QC5VtFn3+V;{1Zb>{W}i3!@?CJ(san-j1~Q<>RI{KES$Reg3N4oZPGx z>#~Ovv|jOft_(W9}MbfL0bzBKwnIJB}*l(P;KUi_cB z#B9RXd`#>=ZpQn{GnuyyQ~1H#i+5tCGC8*k%2Bc(+5?lKIaLaOg{s?!0mXCV0FwB4 z*zXaX%7W+0k)cdXhjGlnRBa_@E1o}(p-hR|UxhYLrqZgh-d9ejwH`C&%YvTNgIj{) z8Zecyph5a2o^Aj)Bt2*VH!Vdsg1eSdS`kD?8xhV%Pb0XoDYIERr#E3T8&e$8*xrQc zY}7V^n})oav3N+yt*VL~&8q0HW-MW6+C`)@p1p{77(H7spK)mm7BYU*B9F5~Wrwk? zYOqWwiJdZ+AiB^B?g>>fIHZWYgr)5K^pcvb%q55(T~gk3tW0HchXZpM<^2ZH9f$J5 z@V!O0my_>u3YTTP0YAHVJP)l*I z1MjhJPNy1oq!Y{7{<{--jJcPwnz8q?YR6tdF59QBAe+(L1uNs;E^KDhbz>uAQ8zLf zZ+0VxF}6pI|F#FKm18{8`4r;9l3@3vEkuME`JE`aUrfLBA;1==H`#jn43y)-C?({| zZx3&pWH<15eI!DhC^2kNLu#BaQET^*eC@QDcYlyl9+7VHoNYrptPi3!z2Ns0eR&l@ zn$LGWCA@8ozrQj}di6@uwQHE9!QBX^XXzb3(I5nmShp?0$$T9tT#&5ma*f`~XV&1a8~s#?KQ0eF!l0H?X((=3KPt8>@_@yR8^Mdy2e+VjLRYCQz%0TiX PXrZ5Pz+~vJhfMDu^bV>E delta 2147 zcmZvd2~3nn6vyYk7c9r(g4$Z~0K`C4pbf?~Td3dpr69-xA@^`Z@pX;Z6d(l%PHoj0Eb*OX-TH}Adwd-J~eWO2^8XDl+l&?{6kJiaiBYs9>5ApQOkDt?uI2q#QIG+`%35=!;Kyt4-0 z9^D0$7l@+JIBl@fS#5MFuJm)0PG!Hwmo%p}352Jbcr{}bL29&Sr9$gL=2>kbL8r42 zl64aa#kv^6ce*%2U;Q`&B~~_@T~{pCkD=HL1oPNNxVr{L26_EnZ-0hi5+&?2$ftO! z3Fc{g(eur`Skk1qjUY@BwX>Y?a@A0#@b*?r?(RZW^|t$->BP#^ARVz|-fj?W^SdOc zE;udydfRjj`DbUIlJr@&eh}FOyJx!*e=YvkQ}WRF(r!B5S4;L!m4Q-ksH&oUt2$eq z(1VDpdD6e7ZJ&wk;QP&b;_qFpLj)bQJrHN6i6#(hLTHjZ848tl_)f!A%5{7^9ijBX z9G_+2FP%9uJ|OXjpthvvo{Z6m;^sgM;FT-Ti+|AugQGPQUugr)A))Utw&qyF?b)^^ z;VJ3a(O~0Ud^}*e_0tFY30B-61` z%!fs@ci32-lZ{2@Ny24e0c;8z!jf48o5mky!>UhZo@@@EVaG&d@De*>^jS>LR`7dv zSdhcxR>P0S|)%nI8jK*euCI@l)?aavXRk!bIAt|8wI4C@CH4+fSox}+7~2TNYUsl&O5x|Q6ybBZ%AI1Q z%E_3$IAEYv?v){4dVq~HdJ7#x0vvU=P+7)Ab3bM=nnA3)rcULR13f0 zt!mI^7)NUnNyfce&~4!{ zPT@>CFFz?Hr@N^tADvf~!F8BP&JA^#O}t%)4~fI;@d0sjJ(7tX_2MuK%4NnksL7%s zfBt0y!YCrT^5>lmpld<0Bw|`4W)aUcsx8Zg`ZuW!$y%$L)LO@yFoBff$>~!?t)~!o zJJkxmIn_odG$WP#<;|E!)L&2=o^t`y$Ub>NeGt<{HE+>Hbt`Hvs`dO@@Db^jx2So| zEto_0;7iCPDwnX3`0S-^y9^uI?U#{GjJ^Up@zfQpC5Bx^7IFVoq!H1I45F=7t#`8( z3*~9*zVh7ChM5CgPP{nv;jH`bVBTe3*M|3G!E5l>-dPJ?R*!x>b{%?~k}S~l)V}(k z!>yzkn+v5bwWkuh)Sp*ggRiWA^nj`Owx~^Ge0O9J5$ht_we{7)p1kWi!eq@|Ps&@q7K_qIbdi_xcW-%9?RqJ;%A$|Ks<>ygHdOR-CpSoQSSPA@~jT@p~y~(94%8LJf=i^ksoxZ{rp3rhX-CR zom7s1VXm(sAhF9-baJziF&ZH*9c(%z^Lp{emC$paBQWwKH`TglZ;HB;D!Su?xZf@G LHhgnVJO}#^?1Xx1 diff --git a/lib/jshop.jar b/lib/jshop.jar index e6c9d7bd41193690feb057d1bf14c9ba02cd19f0..26abcd4cd3482e53d79dfe3a2a43deee8acff6f4 100644 GIT binary patch delta 15142 zcmb_@349b)w)Z*Rom8c}vUNxx0kS}Vtb~0@2qc7^up<~jA&{tH3nT$iga%YxQS=He zD2vD{C`*(OQNV2&H`J#xIxeHma~XN#!i+uzl<$A4sym&i^Ue3Y2fx& z?WaF*o%_XQj34cExrub5);HX1WI7UVxVNw0f%i93<#{d>Pt~6DBpJ(nBw51+l0477 zB{|OnB^- zd_@SG zbz<_AS5!={9$a2Kx3W&1Y@f+f)PoVz>WB18cBs=O*-oZpb?@1D_1C|(auRve=7JQT zi4ma-u1wMNTYvTja!1s}?!&lz>i|T2mWxG>t%s7|T&iNhoSd z?OHTyPsu1|N|8#G8Y=X(;p6*%H!KdF%3m*as7E`0w=Ue)7v#{N+*CkIHM-u7wo4-@ zpKfsDu}r5MJ+z!wc*sX9HCm<7YK?Bv=w^*>(P)iEw`z2o8m$oUY+jK=?V`iy5CLfX@gFFNgvRBw9yTEH@WFSddNeYX^YffDT8g5$2OfF zmYnVKctmn`XtYzKU2e*z+vR(MJa)@tk39Cu<579+(`mn(9;3&F`~%W{t4;?cJ*3lN zjp{XeLUYiQYDLGM_3spp;v`4qQl|LQIps^r^X8Q=xF&Dt(%F>@>#C|3r~_U4sWU%B zL1m8oT4nrWo!mSJi^5I(1{0 zfz*p^Dr8iUID>}KasLS?=Z2p!=p;R>K7P5QzrBmSeTLD~20cg5GkI$&7cH)=txK({ zOMbN4XVOzz-o=vsrSXpTYiXud%UsM?@~vCGlo2(o*0^-CQXb}e?8wrEm%5O zO&iuRp-o1Jd?sI8Q+-|eta+8HYixyjKD(Rh{`an0IA&TtuU1Xi-&z%3)=EX5al_zw zMT%PcuBKE>uBtwlroPYWr4A44p-P4iQQL>NQvH@Cs`rM+_0ESGFb#kaBvBy^#QPxA zoQhzzkP*IznBPN9+lL%cbA(D8k>eYQd@no!(MUW8Q8bN4AEh)3IpQY>COaD6L}T#h zMx87?Bj80?#4G(Ee;+yVpQugN6XeQnB;7%~DRRs)iYd!!px6_KNHbeUqNVf_i9a*- zp(889u+vC8jk42dbSy+BP#B&Q(QpcyPlC(3431{1NoXqSM4{{PGyw#G44Y(mn~1th zlaZ^DV~j?ZMVK=Y-v=M(LvK^e$?z zqm?wGiZ7&^n(kr$s2K!`F3C z(4{5^vMkDj^In8nWtie%%A+f28fI9I=?X8LCNDhX>J)R4Qhgc*3uTDdip`I$s4GH^ zw}qPSpo2{!wI%AYCF-#y>ahhXtBeTN17TUIB~TAE%$jPHbnb(j^Uw-ZUKy065hBU> z;Edw!8HpsriAO_{&FF@CW4@w{gFwG%fybu16X?dL!&Dq++m=ioHrI;+0gy zE2)TA(q`ht0_moQ&}K`Ja#0wuQ=z;S`7GaJ3w2aWp~5HI)V5T{t`6G&zo3l1=H%`K zsk<<>J^xo_Y;r5VrHoicZ1pj@EK{|ZoX2!9l*yuh!nOYymk*+cLm<8WcewofO!mdt zE5lp}1nXX?ZZuKdtp(NpD?}dy(NBy2KmPwrwQNqYKI18h+zY8_liOl(cjz&`Le2d} za|CNSbKBO!vbdAav;`gu3lZ0UD~$IyT)%XTRjr4E3Srb^#Yl3+NX*(jt%ai9QR-#+ zg5C~lw~^AbvX4-ov1XONR+Zdfxp@74QsndYZ`mA6O}qUtzXVF7bSQ?Ey6x0sr-q$I z+G&)X2K3olNM1qif1sZ;=;!yaAG~cyv^7-m6MDkZ^)7(~#->v%} z&*TIl*N1>&F1_ouJ&k1G059v|uS7mYr4(+%%3erDc}R*&65Qoa@Fe2PAft zaq@KT=H~9)L+744_wsOW?xS;Go%@-uN%HLP;e7fT9nrfQ7w9~|L$kS19s@m;!Gm-z z(zw{ogSkZGAsP==F%>ga?Z(Sp!!#bQRvjx)?oAhXgv!187T3q%x4P%S__(-cdNM=; z8MS6}Zw*tdt*fq4yt%K_QI)QuA4*iuJUDW!6TwX|kZYk^Okow$0aI*HAg9eWm377Q=9QG!RbEqFQ&m|zvaYhGT&Dc- zvBW4VW-`A46sVaGwF=LYR*CA~7vdcQvec%B=KCi&xx1>`oE)z4Bxs)6{Nj!EC0qOs z_3^gt>D9E*;K_VhNX*Go44%rD8(b!jD`=tG^>DxNX$DW{D-l=r98xX$S4qPeJQE}= zEU&3tP&cx|;BuY?Sfr-1cJaJAGmzuid^z}S`-%##)c9%x-f^K?_evlA8ot)xDxRZG zzcQ+LF3$t=3_8y9K@8+49Wb>rV{uc2rBw^&R#uc&)z*Q<20c!Xfyo9h;A(>x@*@9) zHrzeZ5PgtLa6zy6^Q4J#A(pBsXSTe7#;OLudxq@U_qjQ$Hjx;OErW z+e^}G4X)$GOi_VWBh4t*z(T(Oyft_UU#G6CZLew`=`^UCmqHy3zMgL|cp2Xa-)ZqB z1Knm8F6+MB;N?6=;}r(`cqLP$5MCLiyw8rRq*Vs57B(-G8Q#PD zYQ9YfzFnp5T#x&bO|Z%*g9CXoaz1jZKKlxy0O%G=wT z^VF(N$?A0Ui|Xi}SUZY;t$ygEhq?9dxPJBR{_dI+h#XS~H6gi!O4|RPN_*^&(BTQ* zWHr7jR;4`tQ~N5odf8)fOdDZ8*2GABLz}T8E>gV@WRI&so)zZy#crfOw$cLtMh$}3 zE;83pYXg&n&~GtnF2SFKCf6YZWV)VikbaQ&H+wHLOC7u=NsYN9TD^N}nH@rtMe zLb#RK>#jns&}ZeWM$S#haS~^mgvJV`OX+6RfGG*3>cpRu)X9Ub2MJ{s0#S{{tp-8C zVoblKm-RNox_;eljNrc+oq~GFlYlk z0FF2@>;tq3WVuZB5fsO&wHku3YCROJwHdWUrP9fH31fw8v_+$>8g0|)VU4zH^ax?& zf(UZQPf%Pj4lfA3nNoIw#$A}}9_(E9V!jd@>;pmjF-wS1wLe_qM$8~Pb%(cyN?p}D zM4e89Wp9FIZ-cTwfn|RNT_1vFABU*Zq~K(Wf^+R1oNF6+{q-0~3fmK zyNS|(MD>ffe>1f?M*YjY`5~1WsNlpgN`~^LjLr29$Z4cPC*=Yb80aAMm;ilFbx^(_ z91iawpdg~TE?^*usN*YQpuok!!5Dgv?7^b;OP_Nq`a37Gi`$vv909(bqRt4TMW4apfS25qZJ6)tAjgI~zhY*(bHZ~LgE@*2&SDBuI z9m2<9s<}wT^E$l)EHF#BV1ii;7cAb|S{Z=?yphA&B=?eI>t^a#pUWGPUY%hp(smD42cd_k8u zj}o{CC39~|=YD{z@)1-NK(z+YcpgN)g*+J29!l$Z1a0P#w2e#YIUX03Y=5k3B0DGW z@GH!f%mpB73P=DfGg11<9*;$Y*o(W0KhNP~hELBSoCInBvB5drZtpLWu~U*o!$JKaA!~mzkJ`gF7hsscPQxk->@*_D z@iSFfHifAKJ!%%DurtK}Ggh&eY`b{KX4e^$U00Z%beio+r;7~$?#DuWr7XT?m8)#i zX`~s=xdo${$<#>Y@W01s9L#CfSg_h$_~pf1_h;MQvm)R<8wnwm?Lx1{8w|3O=?`H@ zX4y$flsA+$(lr2-FC8$+xE704yw76zKNt4Q7GWj1`q zE8!8LP*d9QvoFOzXFvhvZ%6>1@uy~)(2VY(9-0_*CyhF*jAMN}K!irgxYEnUjGZxg zH`WBDzF9Hli5@vb@;Azy^~WcQ ze2=-o%+K6dEr2V1;Q<^dc#?ddmB)YS^mmQEc4LhV;z=I*hi;-tx}Zsm=)ZMZDd~?o zt=0ulS|eZQb-EzkUDO3(Swz2h=#qdufEgS*I{`zn%T2xr4g;p7u_g%AXHrK;ZH@r2 zKvyDs?-&gIi3^b0bD7b+qkiw1J#M=w(@A_=JuQ{Zz*oH zPt`e1;|@4Z=Z-q3OV^!r?(Fg5rHh+0I8!rmBsUdfcAO)_<;tV0ZX!uKch|XxhkN4W zoO|os$Bk$T75hq77kL0y>d%Ip*MqQpE|A9njSF?blBVz=c@%kImBl&_*11IIAs!w& zfrrT`!-XI;@ko;q7Br*tXg3xv3{tA|7%3a8oA8VvhZtjmFlVC9lRScnXgo#ZsTyCd zzRMV;2v{J^_?qg9#k1>b5r_W@*{M`dJy@Fa zuYjk%zkx5Qb#XD>1zMV}@s%21rSS|+AeT@SssFFW5)?^VwiPHSp*d}#@R9oVg#iKe zFBJ6$hGf+)UQ%8)PoRjVDYcW5mf6AHHoy3e3+}q+zAZ&6d0sE|{+21K=u`pEs=x8n zE_Tg^1OPY9QR`mXo&u&;KpeP`fG$m_U|3D{{D~%L#5B+h^ViLdni+}=o7F&{iS`L$ za78+e%kbZNO@Xz451XCS6+NQLmQu0={&M&;)$R;M@3ijqfn{PQJ_FwS2e17GNYfK>8J~mEi4u z^`}>_PN?JcxY%LOTwpVSkNkk8k|GU$fH!KqNh&|63U*fLtN9^=H}e+t`D>%Yw;H?+ zXqF&zSDns@dziOt{D{W04c;L{tl^ykQ0?NK2Je=~9^f(hAmvHAC~-l>{tqcYZU?4D#q?C5V<6o7#3jj>2ETX2C;f~< zSWm#Ol5s565ywusz_5DYTEqb0SjE`akH!K11Yi==fMU&nU%p9h}T^T8mC$0p?^*{JHxenT!Q{$qk5=fW2-)2y$}>LsDBX z#OmW7gelnHs=W87n+&mT3#_qD4J+f6bFD)&>-2e^fGyhFcaa8;6f5y2T&6!yA#~A z$^;h@MG=f=EoQr%wj|M3Ou3XErtK(j01skFc_%6^0mhT4JRfAav1PMxo=g+x5gAw% zp8~}%gW}il{RZfG3pmdiDAIc&6i*6LTok0Zw@q;YC>D?@lwv6pimkFezovLd3ySxG z;ztqpSb)%nHp{OJWw`|}mS%es4pUYmWjjg5evsBe2pzx_qQ78DpJGa%VM<>D>pcrb ze@#Q_JJ`lQL#B0Qa9X46X=MflG4xl0u*zgwR#^){B#R_kOiKi@&lbctAEbu|=}!MG zd051s2k}2s9PBWeorKd}8pIJaj18I&@J5`5rPo&li60##J|L4}zmiENus2I4R#^*~ z$YrFK#EVP>DYQb$CKSd*Cj@*CpfK?!RRIu2;CRGkP52(4MA$F4Jiai+nQKRq!65n= zbuIHXP@bSLxNdaKL=sByoU6Vxn%*h?+Tx zI$%M8Zz{|h1B39*API+yFv73k8)4931c1aH5Tka2I5Pm>WCOm*1t!oH@J$}zn{IR^ zcPHN*?nU=-UwRnW&QUI;lROaDK#S=!9%6ELIyl%L{`a7`W577eO=m4I&O*~!hr#jB zHl1}i0@W#|uLe8}zbf#l7{wR1zQ|iWKt1s~FWEMHhg`-H0a{t23)*SYnUUtK0?^L&K2vD~+i3*y zC)f@y(t-*&U~UfW*br(chG(8TjLGqOp*lk?%x9Ph-L{1S;R>AP_l8>{voRlAY$gy0 z`T79*Aj{PP^ci8zLqMN?L46H?J~9~#^eKaUr$fFofOgCR22lz5UJJ};E-;@3z`S@fVus|PKTb+O!+5^Nq4vq&_Spj{-f~~bG0Q#KJ=*c1uSrC@X zrR<;^67cz1%d2v8%x7dXGgObQiS&)K0ie+~090D$9n(N#EdXeoUB3}JYifLebzu4g zL1}Pa4ge^>tbry8?lW0Bkr$j+pQI@^05sJSf-P!{*|A?$;dOfBz%&p`FX10KhQG%BP`?pYA-=d;6_k5FJhbWHaM1xrOz^*F=zqP@j=;Zz+~}yO}1kd z25ctB^e(ddjuVniDK3GyL2k1+$=E7^92T9ZS5#Ijd=2;f=J=JSn|f6@SR1L!-c#L!O{XW|0uZc71NRi;_u9AsP&g%E!lX<^3#%r`) zucUbL(Bb1Img%y?X#u8o2S|0TioP#==I;YKzkyK|Xw*xi-Wv7MsINx-G%Py*Cf1ZA z=+UomuzvwQ1%RiH7Vz}1;iZA6^6Hm-@s>mN+t5x`el=dL{VG-K0ARKw0NJ~~N}DS0 z=`d@6N)U_0F|Dv!m!D20B9_DNq)^_Ox`dR=53WMWQIcT_HZv60u6LbXYF?dO@pYXu zQm#%GJn_S$2cfA4Rkw~w`0ZLkecri~4!NoL-9NiUnmWa$iT3Z? zH2*>uyBn@@@JSbHH>7I3PA+FQ9FFHI8KR+mB0n647yrp*?vJ16`7b21{Kn2-n8Mv8 ztxiEc(nnKRejn#Qo5I5+{jMXo^N&k4f4b*inaV>Y^HeIAN_r>_h27IQM?Pkx@pwB^ zewydMkj4`v9ovB~mvm1DzCu!0M=q0eMn{(4?)mq14D{D9J5boe?55d0*=F6$x*9dR`cGzXhEVgBw7z+LATM04 zjMV*mvTSOaU0rR~&4&-7Nf*`anOM2S+QA&O*-1*X+DD$ZYbW}<1^RAw0@18?`b$>r z=ThWCuf>;UUa48_kst4$k<9}oZ>!|(xfICrsFmNOs?%SG zM~xrNj#fB9H#BT)2N`j>YQ*QrI@!Ds20GR8I58X~UZ= zh=8Uv{oAo>Oq{eT6jD-hxt()V8}@hCIM+Wn*XsLv$^D?SncGgSi_rYXa@i~OUzd{M WSyqWZI*Akfsa-iC{7d*$qW=TBU0P!R delta 11384 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 YeP88pm~UJfhx(=t;mF|o getAvailableProducts () throws ServletException; + + /** + * Some "getter" for a linked list of all products + * + * @return All products + * @throws javax.servlet.ServletException If anything went wrong + */ + public Deque getAllProducts () throws ServletException; + + /** + * Some "getter" for a linked list of all categories + * + * @return All categories + * @throws javax.servlet.ServletException If anything went wrong + */ + public Deque getAllCategories () throws ServletException; + /** * Initializes this instance with given ServletContext * @@ -98,7 +123,7 @@ public interface PizzaApplication extends Application { * @return Only available products * @throws javax.servlet.ServletException If anything went wrong */ - public Iterator getAvailableProducts () throws ServletException; + public Iterator getAvailableProductsIterator () throws ServletException; /** * Some "getter" for a an array of all products @@ -106,7 +131,7 @@ public interface PizzaApplication extends Application { * @return All products * @throws javax.servlet.ServletException If anything went wrong */ - public Iterator getAllProducts () throws ServletException; + public Iterator getAllProductsIterator () throws ServletException; /** * Some "getter" for a an array of all categories @@ -114,7 +139,7 @@ public interface PizzaApplication extends Application { * @return All categories * @throws javax.servlet.ServletException If anything went wrong */ - public Iterator getAllCategories () throws ServletException; + public Iterator getAllCategoriesIterator () throws ServletException; /** * Checks if given Product instance is available and returns a printable diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index a5e35eb3..9bf32b49 100644 --- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -21,6 +21,7 @@ import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.sql.SQLException; import java.text.MessageFormat; +import java.util.Deque; import java.util.Iterator; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -50,12 +51,12 @@ import org.mxchange.pizzaapplication.BasePizzaServiceSystem; */ public class PizzaServiceApplication extends BasePizzaServiceSystem implements PizzaApplication { /** - * Frontend for products + * Database frontend for products */ private ProductFrontend productFrontend; /** - * Frontend for categories + * Database frontend for categories */ private CategoryFrontend categoryFrontend; @@ -67,6 +68,39 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P this.getLogger().trace("CALLED!"); //NOI18N } + @Override + public Deque getAllCategories () throws ServletException { + try { + // Deligate to frontend + return this.categoryFrontend.getAllCategories(); + } catch (final IOException | BadTokenException | SQLException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) { + // Continue to throw + throw new ServletException(ex); + } + } + + @Override + public Deque getAllProducts () throws ServletException { + try { + // Deligate to frontend + return this.productFrontend.getAllProducts(); + } catch (final IOException | BadTokenException | SQLException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) { + // Continue to throw + throw new ServletException(ex); + } + } + + @Override + public Deque getAvailableProducts () throws ServletException { + try { + // Deligate to frontend + return this.productFrontend.getAllAvailableProducts(); + } catch (final IOException | BadTokenException | SQLException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) { + // Continue to throw + throw new ServletException(ex); + } + } + @Override public void init (final ServletContext context) throws UnsupportedDatabaseBackendException, SQLException { // Trace message @@ -119,7 +153,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P // Init/declare total price and iterator int totalAmount = 0; - Iterator iterator = this.getAvailableProducts(); + Iterator iterator = this.getAvailableProductsIterator(); // "Walk" over all products while (iterator.hasNext()) { @@ -295,7 +329,8 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P } @Override - public Iterator getAvailableProducts () throws ServletException { + @SuppressWarnings ("unchecked") + public Iterator getAvailableProductsIterator () throws ServletException { // categoryFrontend must be set if (null == this.productFrontend) { // Abort here @@ -304,14 +339,15 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P try { // Ask frontend for a list of products - return this.productFrontend.getAvailableProducts(); + return (Iterator) this.productFrontend.getAvailableProductsIterator(); } catch (final IOException | BadTokenException | SQLException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { throw new ServletException(ex); } } @Override - public Iterator getAllProducts () throws ServletException { + @SuppressWarnings ("unchecked") + public Iterator getAllProductsIterator () throws ServletException { // Trace message this.getLogger().trace("CALLED!"); //NOI18N @@ -323,14 +359,15 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P try { // Ask frontend for a list of products - return this.productFrontend.getAllProducts(); + return (Iterator) this.productFrontend.getAllProductsIterator(); } catch (final IOException | BadTokenException | SQLException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { throw new ServletException(ex); } } @Override - public Iterator getAllCategories () throws ServletException { + @SuppressWarnings ("unchecked") + public Iterator getAllCategoriesIterator () throws ServletException { // Trace message this.getLogger().trace("CALLED!"); //NOI18N @@ -342,7 +379,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P try { // Ask frontend for a list of categories - return this.categoryFrontend.getAllCategories(); + return (Iterator) this.categoryFrontend.getAllCategoriesIterator(); } catch (final IOException | BadTokenException | SQLException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { throw new ServletException(ex); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java index 1a7eda3f..18bed800 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.pizzaapplication.beans.controller; +import java.util.Deque; import java.util.Iterator; import javax.faces.FacesException; import javax.servlet.ServletException; @@ -70,28 +71,52 @@ public interface PizzaBean extends FrameworkBean { public void setValueInSession (final HttpSession session, final String key, final Object value); /** - * Some "getter" for a an array of only available products + * Some "getter" for an iterator of only available products * * @return Only available products * @throws javax.servlet.ServletException If anything went wrong */ - public Iterator getAvailableProducts () throws ServletException; + public Iterator getAvailableProductsIterator () throws ServletException; /** - * Some "getter" for a an array of all products + * Some "getter" for an iterator of all products * * @return All products * @throws javax.servlet.ServletException If anything went wrong */ - public Iterator getAllProducts () throws ServletException; + public Iterator getAllProductsIterator () throws ServletException; /** - * Some "getter" for a an array of all categories + * Some "getter" for an iterator of all categories * * @return All categories * @throws javax.servlet.ServletException If anything went wrong */ - public Iterator getAllCategories () throws ServletException; + public Iterator getAllCategoriesIterator () throws ServletException; + + /** + * Some "getter" for a linked list of only available products + * + * @return Only available products + * @throws javax.servlet.ServletException If anything went wrong + */ + public Deque getAvailableProducts () throws ServletException; + + /** + * Some "getter" for a linked list of all products + * + * @return All products + * @throws javax.servlet.ServletException If anything went wrong + */ + public Deque getAllProducts () throws ServletException; + + /** + * Some "getter" for a linked list of all categories + * + * @return All categories + * @throws javax.servlet.ServletException If anything went wrong + */ + public Deque getAllCategories () throws ServletException; /** * Checks if given Product instance is available and returns a printable diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java index 86b10097..a61838d6 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java @@ -19,6 +19,7 @@ package org.mxchange.pizzaapplication.beans.controller; import java.io.IOException; import java.sql.SQLException; import java.text.MessageFormat; +import java.util.Deque; import java.util.Iterator; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; @@ -93,80 +94,51 @@ public class PizzaServiceBean extends BaseFrameworkBean implements PizzaBean { } } - /** - * Some "getter" for HTML code 'checked="checked"' if the product is choosen - * - * @param product Product instance - * @param request Request instance - * @param session Session instance - * @return Whether the product is choosen - */ @Override public String getCheckedHtmlFromProduct (final Product product, final ServletRequest request, final HttpSession session) { return this.app.getCheckedHtmlFromProduct(product, request, session); } - /** - * Some "getter" for HTML code 'disabled="disabled"' for e.g. submit buttons - * - * @param request Request instance - * @param session Session instance - * @return Whether the product is choosen - */ @Override public String getDisabledHtmlFromSession (final ServletRequest request, final HttpSession session) throws ServletException { return this.app.getDisabledHtmlFromSession(request, session); } - /** - * Checks if given Product instance is available and returns a printable - * (human-readable) string. - * - * @param product Product instance to check - * @return Human-readable version of product availability - */ @Override public String getPrintableProduktAvailability (final Product product) { return this.app.getPrintableProduktAvailability(product); } - /** - * Some "getter" for a an array of only available products - * - * @return All products - */ @Override - public Iterator getAvailableProducts () throws ServletException { + public Iterator getAvailableProductsIterator () throws ServletException { + return this.app.getAvailableProductsIterator(); + } + + @Override + public Iterator getAllProductsIterator () throws ServletException { + return this.app.getAllProductsIterator(); + } + + @Override + public Deque getAvailableProducts () throws ServletException { return this.app.getAvailableProducts(); } - /** - * Some "getter" for a an array of all products - * - * @return All products - */ @Override - public Iterator getAllProducts () throws ServletException { + public Deque getAllProducts () throws ServletException { return this.app.getAllProducts(); } - /** - * Some "getter" for a an array of all categories - * - * @return All categories - */ @Override - public Iterator getAllCategories () throws ServletException { + public Iterator getAllCategoriesIterator () throws ServletException { + return this.app.getAllCategoriesIterator(); + } + + @Override + public Deque getAllCategories () throws ServletException { return this.app.getAllCategories(); } - /** - * Somewhat setter in session - * - * @param session Session instance - * @param key Session key to set - * @param value Value to set - */ @Override public void setValueInSession (final HttpSession session, final String key, final Object value) { this.app.setValueInSession(session, key, value); diff --git a/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java b/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java index 66089c88..c2475b4c 100644 --- a/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java +++ b/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java @@ -17,8 +17,6 @@ package org.mxchange.pizzaapplication.filter.servlet.basket; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.sql.SQLException; import java.text.MessageFormat; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -28,8 +26,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.mxchange.jcore.exceptions.BadTokenException; -import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException; import org.mxchange.jshop.beans.basket.BasketBean; import org.mxchange.jshop.item.AddableBasketItem; import org.mxchange.pizzaapplication.filter.servlet.BaseServletFilter; @@ -83,60 +79,55 @@ public class BasketItemAddedFilter extends BaseServletFilter implements Filter { // Debug message this.getLogger().debug(MessageFormat.format("item.id={0},item.itemId={1},item.itemType={2},item.amount={3}", item.getId(), item.getItemId(), item.getItemType(), item.getAmount())); //NOI18N - try { - // Cast to servlet request - HttpServletRequest servletRequest = (HttpServletRequest) request; + // Cast to servlet request + HttpServletRequest servletRequest = (HttpServletRequest) request; - // Get session instance - HttpSession session = servletRequest.getSession(); + // Get session instance + HttpSession session = servletRequest.getSession(); - // Debug message - this.getLogger().debug(MessageFormat.format("session={0}", session)); //NOI18N + // Debug message + this.getLogger().debug(MessageFormat.format("session={0}", session)); //NOI18N - // Should not be null - if (null == session) { - // session is null - throw new NullPointerException("session is null"); //NOI18N - } + // Should not be null + if (null == session) { + // session is null + throw new NullPointerException("session is null"); //NOI18N + } - // Get basket instance - BasketBean basket = (BasketBean) session.getAttribute("basket"); //NOI18N + // Get basket instance + BasketBean basket = (BasketBean) session.getAttribute("basket"); //NOI18N + // Debug message + this.getLogger().debug(MessageFormat.format("basket={0}", basket)); //NOI18N + + // Is the item already added? + if (item.getItemId() == null) { + // Item id is not set + throw new NullPointerException(MessageFormat.format("item id of item={0} is null", item)); //NOI18N + } else if (item.getItemType() == null) { + // Item type is not set + throw new NullPointerException(MessageFormat.format("item type of item={0} is null", item)); //NOI18N + } else if ((item.getAmount() == null) || (item.getAmount() == 0)) { // Debug message - this.getLogger().debug(MessageFormat.format("basket={0}", basket)); //NOI18N - - // Is the item already added? - if (item.getItemId() == null) { - // Item id is not set - throw new NullPointerException(MessageFormat.format("item id of item={0} is null", item)); //NOI18N - } else if (item.getItemType() == null) { - // Item type is not set - throw new NullPointerException(MessageFormat.format("item type of item={0} is null", item)); //NOI18N - } else if ((item.getAmount() == null) || (item.getAmount() == 0)) { - // Debug message - this.getLogger().debug(MessageFormat.format("Amount for item {0} is null - EXIT!", item)); //NOI18N - - // Amount is not entered - return; - } else if (basket.isItemAdded(item)) { - // Yes, then throw exception here - throw new ServletException(MessageFormat.format("item id={0} has already been added.", item.getItemId())); //NOI18N - } - - // Register item with it - basket.addItem(item); - - // Is amount null or zero? - if ((item.getAmount() == null) || (item.getAmount() == 0)) { - // Then redirect to added=0 - ((HttpServletResponse) response).sendRedirect(servletRequest.getContextPath() + "/?add=0"); //NOI18N - } else { - // Redirect to proper URL - ((HttpServletResponse) response).sendRedirect(servletRequest.getContextPath() + "/?add=1"); //NOI18N - } - } catch (final SQLException | BadTokenException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { - // Continue to throw - throw new ServletException(ex); + this.getLogger().debug(MessageFormat.format("Amount for item {0} is null - EXIT!", item)); //NOI18N + + // Amount is not entered + return; + } else if (basket.isItemAdded(item)) { + // Yes, then throw exception here + throw new ServletException(MessageFormat.format("item id={0} has already been added.", item.getItemId())); //NOI18N + } + + // Register item with it + basket.addItem(item); + + // Is amount null or zero? + if ((item.getAmount() == null) || (item.getAmount() == 0)) { + // Then redirect to added=0 + ((HttpServletResponse) response).sendRedirect(servletRequest.getContextPath() + "/?add=0"); //NOI18N + } else { + // Redirect to proper URL + ((HttpServletResponse) response).sendRedirect(servletRequest.getContextPath() + "/?add=1"); //NOI18N } // Trace message diff --git a/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java b/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java index 9cdd3cd2..0154ed8e 100644 --- a/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java +++ b/src/java/org/mxchange/pizzaapplication/tags/basket/MiniBasketTag.java @@ -17,16 +17,12 @@ package org.mxchange.pizzaapplication.tags.basket; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.sql.SQLException; import java.text.MessageFormat; import javax.servlet.ServletException; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.mxchange.jcore.exceptions.BadTokenException; -import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException; import org.mxchange.jshop.beans.basket.BasketBean; import org.mxchange.jshop.item.AddableBasketItem; import org.mxchange.jshop.product.Product; @@ -138,7 +134,7 @@ public class MiniBasketTag extends BodyTagSupport implements BasketTag { out.append(" \n"); //NOI18N out.append("\n"); //NOI18N } - } catch (final ServletException | IOException | SQLException | BadTokenException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) { + } catch (final ServletException ex) { // Continue to throw throw new JspException(ex); } diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml new file mode 100644 index 00000000..eef85cfe --- /dev/null +++ b/web/WEB-INF/faces-config.xml @@ -0,0 +1,7 @@ + + + + diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl new file mode 100644 index 00000000..07d3cf50 --- /dev/null +++ b/web/WEB-INF/templates/base.tpl @@ -0,0 +1,43 @@ + + + + + + + + + Pizza-Service - <ui:insert name="title">Default title</ui:insert> + + + +
+ + + +
+ +
+
+ Default menu +
+ +
+ Default content header + Default content +
+ +
+
+ + + + diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl new file mode 100644 index 00000000..a3c9ec7e --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -0,0 +1,16 @@ + +
+ +
+ +
+ diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl new file mode 100644 index 00000000..cf2ebcf8 --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -0,0 +1,19 @@ + +
+ + + +
+ diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 0851cde8..6ddf5b86 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -76,7 +76,7 @@ - - index.jsp + faces/index.xhtml + diff --git a/web/admin/category.jsp b/web/admin/category.jsp index 47da4f06..8aefece3 100644 --- a/web/admin/category.jsp +++ b/web/admin/category.jsp @@ -63,7 +63,7 @@ - + ${category.categoryId}: diff --git a/web/admin/product.jsp b/web/admin/product.jsp index 67d48d0d..49af00a1 100644 --- a/web/admin/product.jsp +++ b/web/admin/product.jsp @@ -68,7 +68,7 @@ - + ${product.itemId}: diff --git a/web/index.jsp b/web/index.jsp index 7d3dbe81..ec70c2df 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -45,6 +45,7 @@
+ @@ -74,7 +75,7 @@
- + diff --git a/web/index.xhtml b/web/index.xhtml new file mode 100644 index 00000000..958400df --- /dev/null +++ b/web/index.xhtml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + Willkommen! + + + + + + + Eingangsseite (dummy) + + + + + + + + + + + + + + + + + + + + +
+ Folgendes kann bestellt werden: +
+ Bestellen? + + Anzahl: + + Produkt: + + Einzelpreis: +
+ + + + + + + + + + + + + + + + + +
+ Warenkorb + + #{controller.basket.item.amount} + + #{product.title} + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + #{product.title} + + + + +
+ + + + + + + + + + diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css new file mode 100644 index 00000000..3d3b2cb1 --- /dev/null +++ b/web/resources/css/cssLayout.css @@ -0,0 +1,136 @@ +#top { + position: relative; + background-color: #036fab; + color: white; + padding: 5px; + margin: 0px 0px 10px 0px; +} + +#footer { + position: relative; + background-color: #c2dfef; + padding: 5px; + margin: 10px 0px 0px 0px; +} + +#left { + float: left; + background-color: #ece3a5; + padding: 5px; + width: 150px; +} + +#right { + float: right; + background-color: #ece3a5; + padding: 5px; + width: 150px; +} + +.center_content { + position: relative; + background-color: #dddddd; + padding: 5px; +} + +.left_content { + background-color: #dddddd; + padding: 5px; + margin-left: 170px; +} + +.right_content { + background-color: #dddddd; + padding: 5px; + margin: 0px 170px 0px 170px; +} + +#top a:link, #top a:visited { + color: white; + font-weight : bold; + text-decoration: none; +} + +#top a:link:hover, #top a:visited:hover { + color: black; + font-weight : bold; + text-decoration : underline; +} + +/** +div { + border: 1px solid #ff0000; +} +/**/ + +table, .table { + margin: 0px; + padding: 0px; +} + +.table { + width: 500px; +} + +.table_row { + width: 100%; +} + +.table_left { + width: 250px; + float: left; +} + +.table_right { + width: 200px; + float: right; +} + +.table_left25 { + width: 20px; + float: left; +} + +.table_right75 { + width: 430px; + float: right; +} + +.para { + padding: 5px 5px 5px 5px; +} + +.clear { + clear: both; +} + +ul.footer_nav { + text-align: center; + width : 500px; + list-style: none; + margin: 0px; +} + +ul.footer_nav li { + float: left; + width: 100px; +} + +.menu ul { + list-style: none; + padding-left: 5px; +} + +.table_header { + text-align: center; + font-weight: bold; + font-size: 20px; +} + +.table_header_column { + width: 100px; +} + +.table_data_column { + width: 100px; +} diff --git a/web/resources/css/default.css b/web/resources/css/default.css new file mode 100644 index 00000000..c658b11b --- /dev/null +++ b/web/resources/css/default.css @@ -0,0 +1,28 @@ +body { + background-color: #ffffff; + font-size: 12px; + font-family: lucida; + color: #000000; + margin: 10px; +} + +h1 { + border-bottom: 1px solid #AFAFAF; + font-size: 16px; + font-weight: bold; + margin: 0px; + padding: 0px; + color: #D20005; +} + +a:link, a:visited { + color: #045491; + font-weight : bold; + text-decoration: none; +} + +a:link:hover, a:visited:hover { + color: #045491; + font-weight : bold; + text-decoration : underline; +} diff --git a/web/static/admin/admin_category_selection_box.jsp b/web/static/admin/admin_category_selection_box.jsp index 920de9f4..e1d2bece 100644 --- a/web/static/admin/admin_category_selection_box.jsp +++ b/web/static/admin/admin_category_selection_box.jsp @@ -10,7 +10,7 @@ diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp index eb98e8de..c00a925e 100644 --- a/web/static/admin/admin_parent_category_selection_box.jsp +++ b/web/static/admin/admin_parent_category_selection_box.jsp @@ -11,7 +11,7 @@ -- 2.39.5