From 022d87d2e17ae400de4d452bf2af6340735e025c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 1 Oct 2015 10:19:07 +0200 Subject: [PATCH] Merges from rewrites/jpa MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- build.xml | 2 +- lib/jcore-swing.jar | Bin 0 -> 6826 bytes lib/jcore.jar | Bin 29624 -> 30691 bytes lib/jcoreee.jar | Bin 19254 -> 17631 bytes lib/jshop-ee-lib.jar | Bin 7239 -> 7249 bytes lib/jswingcore.jar | Bin 7781 -> 0 bytes nbproject/build-impl.xml | 2864 ++++++++--------- nbproject/project.properties | 6 +- nbproject/project.xml | 50 +- .../application/PizzaApplication.java | 71 +- .../application/PizzaServiceApplication.java | 270 +- 11 files changed, 1634 insertions(+), 1629 deletions(-) create mode 100644 lib/jcore-swing.jar delete mode 100644 lib/jswingcore.jar diff --git a/build.xml b/build.xml index 8202baa..7f99c19 100644 --- a/build.xml +++ b/build.xml @@ -69,5 +69,5 @@ properties which you can use, check the target you are overriding in the nbproject/build-impl.xml file. - --> + --> diff --git a/lib/jcore-swing.jar b/lib/jcore-swing.jar new file mode 100644 index 0000000000000000000000000000000000000000..bcf9b93079c88d93034bb5b39be2ae8e5c77b143 GIT binary patch literal 6826 zcmb_g&2!t<5noW0K*6MJQ?~pWo3>?J-?SSgj=$tejAXO=Y-BrCE*+SJB{(3!0YS^| zp);B3shysB>7}z&reSb7nTDm0UyjjOz5l zOP0SebM5CJ-k5%J?RsHs-PJ3WQ7AcX-Enmfh~qger-hEi$B>3&j=Np#E|K#kYA-4~ zy1i}m5Iq?eeO7T?qp@q+y$qc1p;fU=!}fZZytKdacGK(uaIObH&8Zqz58csyb@vX&S7>T%e1+2_NCGjlMH!%$b0z8IZH2U|v$@mss?M&hP~X`2 zV}*_ww*JI2R&~?<)U@#nq#B0TtP5Whx;&O-!1r8weVcK##TON$&Y9g%>6Aig(>6Vo zPAil%8)ZD3x@G>ts0zEEDU`LG?LbALlVdB-^yhlfLMj&@?zqk_dnJ&E8@|i)^}1zN z#Oi^)O{eKrj3v`DFohMwbWNe7 z#>`6|>#C+7!rKo4yWB*E4kApIEK-$n6|OjtUWQ@hn!Xl z=Ec@>rp(GMU@mjf;ug&RG616&g(# zVuudqb`u5X^Hsg>JAE7;h(|F8p%3FpK6DBSFRmn*P7qaS#5HQpb0h8+maqJwQz^Dk zhr(>(HIpSIq(YbYxjkAPlbhunR_I)~O4pi}wc(h&41-03W!#Er!E6+4h_H?83SI29 z5g$gDenjtMB042I$CX84hwRk@t__8*bV?RE7(qSRe2IjwAsC&4(d-k`tkCgjz1;L% zY~^Aq`;ZO_O-Fw%@pf`sme;0dTI~x*Xbs5eOJBe$&7mv|;mXURfyJ8US;CuP)Pe<+ zBL(*(6MLjgyr$IF9`$`i=|77?!sTR06s)Vz8VAAz9ml(@)S(eNfp16`I_2Y4A&p&< z&M1?Aq}*%j-^vf{k@{xhFO(jp%;YN?WavIosqz3ND#E4ffc}6^(}x0nL_+xR0K+e5 zVBoCKR1V|uJvw(Fi&~P!+pu^S7UzMx(ADDkc8i5~7~`S%81KVk85UPzajmPx*cdOo z!x%d(Zo=XtSloie&$?QSjqxG^oT5wZ+eiLiv)}v@Il|XC1P+kTv905Vc z3j6=4k3YEVX>x<)!gA0B{=Ml)8*fNs@9*Rdl1B{s8~}$XOyZ&TNgR3b*7-foR(zHA zokUrnVtg|!nz8BK(vV-bRJxs^JG}Yd)v&tfRJy0qk25r{!LPe2Eok61w=z`X`^Wrm zF+)pyzn`H8d@pC{Cn_zgw4&0gN^6nreN5GsP&+AW94yK@CBciI{+AAMF^Gcs__Es zvaHbHrnznFUeg69I+37sXJQVXM(~}c4LXLS1C(=t*)<$ncu#7x>hDT03%O66-ICPR z@a?f~HH~=yjf|DsbR_eJ$qY^azMn&8qhwgtV%78{dFy8-93l9e5+I$3Zh1Zo#Beg{ zf6msJ^M%|Yu+w&o81YX^k<4Y4EcUC715l5{{*;Bx<0SnwOP}y@XsojeCZE!f4WXNl z>_)SWjscnq>vcmm4kBD9|Hys{zT4O_s)d^2?KssLOk=1nXJDaeT2;fvcDUwvg#fVd z((q;qtuWus(k4CRe~&P+Q;|f$FOTU{g-#`Ci^vMqpJ6(t0x*T{c8>QQR>!*#tAp{S zvmBKc#T0o|3}-p{q}RCsTgQrSRn{2PBE4QW>^K=~QME`ew#^b!|7_AS@+Xm3 zhUZ8PUgptN?nB4epP%WSf-OY4fa-f3WmuB43|Ne$XQxs2U7wzvV!G#3wA5C40iTk2&YuK zs1mo0z`y~M0uLej2;Z0P0%F% zGukXh!S3W=N+Y^T0 z>uUIsFgziF0>jfdAl!f%?ql$fIhCe`3!Dfa;aiGsZY(RQV}0FQ$&kY52>pAW??Ja% zHkL!xq}DPk@aM}fCh|d#Q4dSbkXb zC}P&8+SV}+2OV!)bI&+Lx!(iDZ^QL+iHku9_N)EDWJkHXcidAB0sr0uu;zD|yJL;E zphRXU$gFPhl2~&0>or{NIm-{vK{A*5 literal 0 HcmV?d00001 diff --git a/lib/jcore.jar b/lib/jcore.jar index 12190beef63bed67f80a91b64eeee71aede608fc..848bebf4503c8caeeb9557874ffa4a124337d3fb 100644 GIT binary patch literal 30691 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 YpzQ=^P{gQZLl0gcxUoRaj4}5A0SBs!5C8xG literal 29624 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 II>B%M4@w6QLI3~& diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 93d401de39c53a2d93aaa31e42cad7b2ccac7bb9..86cfb5e64f414b3a527931ab80670253d42288e7 100644 GIT binary patch delta 3533 zcmZ`+d2E!&75{y^UeE65Z+&8Hyar=q@O^^q^|8K>^@Yu0z+A?}ivz`A3^YgE7?ZXM zq#S0Tag_@s0#Vcy=&GQqN<-C3L~0_nDx_-FHfjHj(om&G>ZWmjGiy7nNf*AE_s#d_ z&71dr?>FO{-!j4)OOJiTu~)K%JZm#&b-HKA8+2b{Z;PYNww>jJiDm?#o-FxiD_LHQ zu!3*cZH8Rx$cu^_4jkzY96mfa9FXe@O67p*k#0w<^gFuT9+X;$M}h?pQspH_wXsZ& z$E}j~$SEU2z8JYBJr5BmfE$HK=FTk`Y@@LRDeP@})^U+JUjD#W$L!Y#EX6YFFQ(=I z?9>KQa&N(L2kxIBvOiwjg7YmkkarWV>-=g*65D9@Km!Dt5QjExd2wj=tYz9k8kW;` zx}IfZ#8J+mY{QDM%(eNC|2)5zS*(?RwEV3DCSu`pqSizm>P;@v=tPr1vl3fW(<;zr zA_jgFF0`BIP$Qit1JEVVEwEOgN8TvU37&VKH)M_XjO<&zSl&+d%GB731S<3jtfN7J zd|DD%FZaYYMz6E50UP;dp%0tn&Dd<`W^A;u1^x0@OLC&NVw=UiZx`4hW2*`xld#i3 zsk~I1CSR^f3{J#V8xN&%CjLF+lzcDYZ{vGlA{P}{flMX{m_jN;uYOZliB&pfQ^-QL z4&oGYsI5Xgg*@aly>?t+iVNXj$R|-mE0Nsqb10@H7_etif>M^kYR)NwV}|A}fi(hU z0_6f-6#`y?N`Wf=H~3-@B>zG4r*NdjFiqeZ1}z$>rffq^c#6d1IgYLLTRpXeZw3n? zO@2`88oyw2cDHKQn&?5ViFH^nu)(Qf*{9w%sb;fDG;9&*cOeQ}O*Y$H+{|{9%?^Q` zD(TF84|X|G8ihgZ7I-8Ii5OCY0oCkrV%Wr^*etL&im2Wv@D+5jY@lP-p$x zVy6)sGZr{>bnjSTXs)W_Vv-^q`v-Ri_RBN%N%C&eN+M&gyqp}T(eX>~hQ%~8DsYHy z3-|=a=q)!QODa=k*OFDyhb$b%5sq6pim%FJOPbt|;fRID@q~pZ@im2##INI+#WYS> zIF2$4Pve^gmdcXM z&!`HWx5ECBE2PDu0)R_!TgNa5>p-%0NdLw~0DguoM zx7VSHk^~xsE>(}+PEDaKNx93tCRma!zPz5KHz$3bURgj1Bvn=PI^0D9n`l{A&rfq# zME6Vb^T70A#h9MzP{+i@eXbbgp`Y97(?L26LR^4Q#pa;{}&b50teuA*-R=A*3pOzP2( zaeeerV)0}nN1>TgE=z=Hrlhd0*!>nWTBOnZnr3o^=2tb7M`|YTP)x4TJkR7`5IG&u zEUv*^IgQF$>`}Ej#QG2D5_^i+74~B3L=9ydD-}ERIQpClO_o}2kHdsooHYosJAB7@VMpa9fwwvD-wPV z_?;Sj>L~Bz5yi7Rc%yvh7bmuY6i3x@t}7~^MrnkQYKZEw$WlDA*OQ>n<|oQ?mHEz% zYCxUc3Qh!@#cN5wMdsQjKdWpqwg>C0`WC{dRL;aF%lp+AjoWgv=FOJ>51C%F%mA-D z0kmq!93y1TF#Q+k!wbARyh^B~GMt2pl)fBR^%Z@&;t-{|GyV!e5<26r5Er2{{>tnb zAA{$Kiws64p5&{L5lK{l>&&5`M4(h)^#ccc1yN8IqBO>)d>TcwD5&@{T}IkVg9-&P zd@3p1P!+~F!LzmhjnG%uvrXRc8@0UGRHnbUn>|VIa_+&g;iBG7!?wsie+`#)%^u@p zxve=>Yd*=h6#283Wch<;D@|R5Ic@%zHZR5EqlRwkW#lce7p9*Xrhk(9SuqRrWq+&3 zc!ys?*Y6+mEmfwshWu9FcJVDo-d}CW*IO;^qtdy~QQm2Y>d$9K-EAJ@@3W(Bxuwlo z{?Ijk-W%ZZM6F%kNK8_@iUMtVvYk9X-VW0b5o;W3_oX&e=f*kROl*4XVbDHcg zPo&3Exn92S54oUDgdg#*2=(-ZDgHK*-( Je&bUL{{vOWruhH> delta 4766 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 B$1wl^ diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index 6506266fda2670bff7f67138d709ff8339038a25..3248b432fa622ce4a2b75d3fcd40666ddf6e966a 100644 GIT binary patch delta 1269 zcmb7DO-NKx6h8Moo%iNBFK0&Q#~F1dQhXxLj8ZmeQvRW&<$%(nMKaYSlQNo)QbJJe z6fMU?1!*J{L~WF25l9PLwJ1s3q^x$&t{qA?q`R=*jdlg&> zs-adfLjjNh5~H;VRZ}NNYnyAIX>0ue(4VM3>8(p9ywoLf2G=6;S2f#T~$@( z(O5h(5DWJv9+!ypP-4Zy!*`7ZEF_gYc90;CH_1^Rmr31D^y4pwf+qx-ucrkchMWpc zrq{<9p8O#62o|PEtenoO6ad&bj$z`(En>u2UJ(XFBhF{;7tU%JRtq`2F3Cbo>E0!& zNoE@62*2Kg=AMlS0x*FurFfB5D{Z?N9uE75;?Z7zTXZm9L%`S(?T&@xLjw^4jan&w z5q-OfllNp3;gY647JP1{a@c6%l0q(x$x(77$dAz}vDUZuJavE`2mGGA86wa_-`Uq>GFZo_wNHtEpWcxZ!8#j)# z*~9;xI5}dLiOfX*v~A5K$1GlgE7oFsVlBbyoCe&qHYTs;*a?64JGl}OsU>mN7SwwZ zKiLj(%M{q%jwRZczJYFksFeu0V#>(00=C=TWCMHb`J6dscMC3p70x_dw3|5emO||e z@?e%D1-Tqok zfb*b-H6jhuiJo(pa=iG^naedSINfBGBPOv3yWA!(JFWXA_N01ry(M!;uT1}t04JwS zPv5UeM_!ZC delta 1424 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 TyQr1dLF&Z!CZ@0dF#r1>LJe)y diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index fe0d44c..a7fc149 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -18,1437 +18,1437 @@ is divided into following sections: - applet - cleanup - --> +--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - Must select one file in the IDE or set profile.class - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - Must select some files in the IDE or set test.includes - - - - - Must select one file in the IDE or set run.class - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/project.properties b/nbproject/project.properties index 344d53c..849d818 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,11 +30,11 @@ dist.jar=${dist.dir}/PizzaService-swing.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= +file.reference.jcore-swing.jar=lib/jcore-swing.jar file.reference.jcore.jar=lib/jcore.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jshop-core.jar=lib/jshop-core.jar file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar -file.reference.jswingcore.jar=lib/jswingcore.jar file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar includes=** @@ -44,9 +44,9 @@ jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcore.jar}:\ ${file.reference.jcoreee.jar}:\ - ${file.reference.jswingcore.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ + ${file.reference.jcore-swing.jar}:\ ${reference.PizzaService-lib.jar}:\ ${file.reference.log4j-api-2.3.jar}:\ ${file.reference.log4j-core-2.3.jar} @@ -105,10 +105,10 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 +source.reference.jcore-swing.jar=../jcore-swing/src/ source.reference.jcore.jar=../jcore/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jshop-core.jar=../jshop-core/src/ source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/ -source.reference.jswingcore.jar=../jswingcore/src/ src.dir=src test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 1dc5238..7aa35cf 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,28 +1,28 @@ - org.netbeans.modules.java.j2seproject - - - PizzaService-swing - - - - - - - - - ./lib/nblibraries.properties - - - - PizzaService-lib - jar - - jar - clean - jar - - - + org.netbeans.modules.java.j2seproject + + + PizzaService-swing + + + + + + + + + ./lib/nblibraries.properties + + + + PizzaService-lib + jar + + jar + clean + jar + + + diff --git a/src/org/mxchange/pizzaapplication/application/PizzaApplication.java b/src/org/mxchange/pizzaapplication/application/PizzaApplication.java index 5fe0ae6..f7b2262 100644 --- a/src/org/mxchange/pizzaapplication/application/PizzaApplication.java +++ b/src/org/mxchange/pizzaapplication/application/PizzaApplication.java @@ -31,69 +31,74 @@ import org.mxchange.jshopcore.model.product.Product; * @author Roland Haeder */ public interface PizzaApplication extends Application { + /** - * Some "getter" for a linked list of only available products - * - * @return Only available products + * Adds given category data from request to database + *

+ * @param category Category instance + * @throws + * org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException If + * the category's title has been used */ - public Deque getAvailableProducts (); + public void doAdminAddCategory (final Category category) throws CategoryTitleAlreadyUsedException; /** - * Some "getter" for a linked list of all products - * - * @return All products + * Adds given product data from request to database + *

+ * @param product Product instance + * @throws + * org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the + * * product's title has been used */ - public Deque getAllProducts (); + public void doAdminAddProduct (final Product product) throws ProductTitleAlreadyUsedException; /** * Some "getter" for a linked list of all categories - * + *

* @return All categories */ public Deque getAllCategories (); /** - * Initializes this instance with given ServletContext - * - * @throws java.sql.SQLException If an SQL error occurs - * @throws java.io.IOException If an IO error occurs + * Some "getter" for a an array of all categories + *

+ * @return All categories */ - public void init () throws SQLException, IOException; + public Iterator getAllCategoriesIterator (); /** - * Some "getter" for a an array of only available products - * - * @return Only available products + * Some "getter" for a linked list of all products + *

+ * @return All products */ - public Iterator getAvailableProductsIterator (); + public Deque getAllProducts (); /** * Some "getter" for a an array of all products - * + *

* @return All products */ public Iterator getAllProductsIterator (); /** - * Some "getter" for a an array of all categories - * - * @return All categories + * Some "getter" for a linked list of only available products + *

+ * @return Only available products */ - public Iterator getAllCategoriesIterator (); + public Deque getAvailableProducts (); /** - * Adds given category data from request to database - * - * @param category Category instance - * @throws org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException If the category's title has been used + * Some "getter" for a an array of only available products + *

+ * @return Only available products */ - public void doAdminAddCategory (final Category category) throws CategoryTitleAlreadyUsedException; + public Iterator getAvailableProductsIterator (); /** - * Adds given product data from request to database - * - * @param product Product instance - * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the product's title has been used + * Initializes this instance with given ServletContext + *

+ * @throws java.sql.SQLException If an SQL error occurs + * @throws java.io.IOException If an IO error occurs */ - public void doAdminAddProduct (final Product product) throws ProductTitleAlreadyUsedException; + public void init () throws SQLException, IOException; } diff --git a/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index 235f307..a34807e 100644 --- a/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -28,115 +28,23 @@ import org.mxchange.jshopcore.model.product.Product; /** * Main application class - * + *

* @author Roland Haeder */ public class PizzaServiceApplication extends BaseFrameworkSystem implements PizzaApplication { + /** * Default constructor */ public PizzaServiceApplication () { // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - } - - @Override - public Deque getAllCategories () { - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); - } - - @Override - public Deque getAllProducts () { - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); - } - - @Override - public Deque getAvailableProducts () { - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); - } - - @Override - public void init () throws SQLException { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - - // Is the bundle initialized? - if (!BaseFrameworkSystem.isBundledInitialized()) { - // Temporary initialize default bundle - // TODO The enum Gender uses this - this.initBundle(); - } - - // Trace message - this.getLogger().trace("EXIT!"); //NOI18N - } - - @Override - public void doBootstrap () { - throw new UnsupportedOperationException("Not supported yet."); //NOI18N - } - - @Override - public void doMainLoop () { - throw new UnsupportedOperationException("Not supported yet."); //NOI18N - } - - @Override - public void doShutdown () { - throw new UnsupportedOperationException("Not supported yet."); //NOI18N - } - - @Override - @SuppressWarnings ("unchecked") - public Iterator getAvailableProductsIterator () { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); - } - - @Override - @SuppressWarnings ("unchecked") - public Iterator getAllProductsIterator () { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); - } - - @Override - @SuppressWarnings ("unchecked") - public Iterator getAllCategoriesIterator () { - // Trace message - this.getLogger().trace("CALLED!"); //NOI18N - - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); - } - - /** - * Checks whether given category title is already used - * - * @param title Title of category to check - * @return Whether it has been found - */ - private boolean isCategoryTitleUsed(final String title) { - // Trace message - this.getLogger().trace(MessageFormat.format("title={0} - CALLED!", title)); //NOI18N - - // Unfinished - throw new UnsupportedOperationException("Unfinished method."); + this.getLogger().logTrace("CALLED!"); //NOI18N } @Override public void doAdminAddCategory (final Category category) throws CategoryTitleAlreadyUsedException { // Trace message - this.getLogger().trace(MessageFormat.format("category={0} - CALLED!", category)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("category={0} - CALLED!", category)); //NOI18N // category must not be null if (null == category) { @@ -145,11 +53,11 @@ public class PizzaServiceApplication extends BaseFrameworkSystem implements Pizz } // Get all fields - String title = category.getTitle(); - Long parentId = category.getParentId(); + String title = category.getCategoryTitle(); + Category parentCategory = category.getParentCategory(); // Debug message - this.getLogger().debug(MessageFormat.format("title={0},parentId={1}", title, parentId)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("title={0},parentCategory={1}", title, parentCategory)); //NOI18N // Init variables for casting Integer id = 0; @@ -161,9 +69,9 @@ public class PizzaServiceApplication extends BaseFrameworkSystem implements Pizz } else if (title.isEmpty()) { // Is left empty throw new IllegalArgumentException("title is empty."); //NOI18N - } else if ((parentId == null) || (parentId == 0)) { + } else if (null == parentCategory) { // Is left empty - throw new IllegalArgumentException("parentId is empty."); //NOI18N + throw new IllegalArgumentException("parentCategory is null."); //NOI18N } // Try to check if title is used already @@ -176,13 +84,13 @@ public class PizzaServiceApplication extends BaseFrameworkSystem implements Pizz throw new UnsupportedOperationException("Unfinished method."); // Trace message - //this.getLogger().trace("EXIT!"); //NOI18N + //this.getLogger().logTrace("EXIT!"); //NOI18N } @Override public void doAdminAddProduct (final Product product) throws ProductTitleAlreadyUsedException { // Trace message - this.getLogger().trace(MessageFormat.format("product={0} - CALLED!", product)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("product={0} - CALLED!", product)); //NOI18N // product must not be null if (null == product) { @@ -191,13 +99,13 @@ public class PizzaServiceApplication extends BaseFrameworkSystem implements Pizz } // Get title, price and category id - String title = product.getTitle(); - Float price = product.getPrice(); - Long id = product.getId(); - Boolean available = product.getAvailable(); + String title = product.getProductTitle(); + Float price = product.getProductPrice(); + Long id = product.getProductId(); + Boolean available = product.getProductAvailability(); // Debug message - this.getLogger().debug(MessageFormat.format("title={0},price={1},id={2},available={3}", title, price, id, available)); //NOI18N + this.getLogger().logDebug(MessageFormat.format("title={0},price={1},id={2},available={3}", title, price, id, available)); //NOI18N // Check all fields if (null == title) { @@ -230,77 +138,169 @@ public class PizzaServiceApplication extends BaseFrameworkSystem implements Pizz throw new UnsupportedOperationException("Unfinished method."); // Trace message - //this.getLogger().trace("EXIT!"); //NOI18N + //this.getLogger().logTrace("EXIT!"); //NOI18N + } + + @Override + public void doBootstrap () { + throw new UnsupportedOperationException("Not supported yet."); //NOI18N + } + + @Override + public void doMainLoop () { + throw new UnsupportedOperationException("Not supported yet."); //NOI18N + } + + @Override + public void doShutdown () { + throw new UnsupportedOperationException("Not supported yet."); //NOI18N + } + + @Override + public Deque getAllCategories () { + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + @Override + @SuppressWarnings ("unchecked") + public Iterator getAllCategoriesIterator () { + // Trace message + this.getLogger().logTrace("CALLED!"); //NOI18N + + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + @Override + public Deque getAllProducts () { + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + @Override + @SuppressWarnings ("unchecked") + public Iterator getAllProductsIterator () { + // Trace message + this.getLogger().logTrace("CALLED!"); //NOI18N + + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + @Override + public Deque getAvailableProducts () { + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + @Override + @SuppressWarnings ("unchecked") + public Iterator getAvailableProductsIterator () { + // Trace message + this.getLogger().logTrace("CALLED!"); //NOI18N + + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + @Override + public void init () throws SQLException { + // Trace message + this.getLogger().logTrace("CALLED!"); //NOI18N + + // Is the bundle initialized? + if (!BaseFrameworkSystem.isBundledInitialized()) { + // Temporary initialize default bundle + // TODO The enum Gender uses this + this.initBundle(); + } + + // Trace message + this.getLogger().logTrace("EXIT!"); //NOI18N } /** - * Checks if product's title is already used. - * - * @param product Product instance + * Checks whether given category title is already used + *

+ * @param title Title of category to check + * @return Whether it has been found + */ + private boolean isCategoryTitleUsed (final String title) { + // Trace message + this.getLogger().logTrace(MessageFormat.format("title={0} - CALLED!", title)); //NOI18N + + // Unfinished + throw new UnsupportedOperationException("Unfinished method."); + } + + /** + * Checks if category's title is already used. + *

+ * @param category Category instance * @return Whether the product title is already used */ - private boolean isProductTitleUsed (final Product product) { + private boolean isCategoryTitleUsed (final Category category) { // Trace message - this.getLogger().trace(MessageFormat.format("category={0} - CALLED!", product)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("category={0} - CALLED!", category)); //NOI18N // Init title - String title = product.getTitle(); + String title = category.getCategoryTitle(); // category must not be null and "title" must be found and non-empty - if (null == product) { + if (null == category) { // Abort here throw new NullPointerException("category is null"); //NOI18N } else if (null == title) { // title is not set - throw new IllegalArgumentException("product title is not set"); //NOI18N + throw new IllegalArgumentException("category title is not set."); //NOI18N } else if (title.isEmpty()) { // Is left empty - throw new IllegalArgumentException("product title is empty"); //NOI18N + throw new IllegalArgumentException("category title is empty."); //NOI18N } // Default is not used - // TODO Call backend - throw new UnsupportedOperationException("not finished yet."); + boolean isUsed = this.isCategoryTitleUsed(title); // Trace message - //this.getLogger().trace(MessageFormat.format("isUsed={0} - EXIT!", isUsed)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("isUsed={0} - EXIT!", isUsed)); //NOI18N // Return it - //return isUsed; + return isUsed; } /** - * Checks if category's title is already used. - * - * @param category Category instance + * Checks if product's title is already used. + *

+ * @param product Product instance * @return Whether the product title is already used */ - private boolean isCategoryTitleUsed (final Category category) { + private boolean isProductTitleUsed (final Product product) { // Trace message - this.getLogger().trace(MessageFormat.format("category={0} - CALLED!", category)); //NOI18N + this.getLogger().logTrace(MessageFormat.format("category={0} - CALLED!", product)); //NOI18N // Init title - String title = category.getTitle(); + String title = product.getProductTitle(); // category must not be null and "title" must be found and non-empty - if (null == category) { + if (null == product) { // Abort here throw new NullPointerException("category is null"); //NOI18N } else if (null == title) { // title is not set - throw new IllegalArgumentException("category title is not set."); //NOI18N + throw new IllegalArgumentException("product title is not set"); //NOI18N } else if (title.isEmpty()) { // Is left empty - throw new IllegalArgumentException("category title is empty."); //NOI18N + throw new IllegalArgumentException("product title is empty"); //NOI18N } // Default is not used - boolean isUsed = this.isCategoryTitleUsed(title); + // TODO Call backend + throw new UnsupportedOperationException("not finished yet."); // Trace message - this.getLogger().trace(MessageFormat.format("isUsed={0} - EXIT!", isUsed)); //NOI18N - + //this.getLogger().logTrace(MessageFormat.format("isUsed={0} - EXIT!", isUsed)); //NOI18N // Return it - return isUsed; + //return isUsed; } } -- 2.39.5