From 222663debde749e21f40aceaff10c56e32529723 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 10 Sep 2015 22:11:53 +0200 Subject: [PATCH] =?utf8?q?renamed=20fields=20+=20their=20setters/getter=20?= =?utf8?q?+=20updated=20jars=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore-ee-logger.jar | Bin 8032 -> 8006 bytes lib/jcore.jar | Bin 28103 -> 27933 bytes lib/jcoreee.jar | Bin 13934 -> 13784 bytes .../model/category/BaseCategory.java | 40 +++++++++--------- .../jshopcore/model/category/Category.java | 4 +- .../jshopcore/model/item/BasketItem.java | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar index c65212243809f11f3ffb24a9b60a199155e03c07..6160458d2a2ce3da276e245a39698c4b05cd18cb 100644 GIT binary patch delta 786 zcmZ8e-)qxQ6u$Y@uCdcnS7m9MwsTU7xcXQ9z(O>Jq`2xf8 z2=yS;ZZ(2Ky-q7NotIzqR}n(hMs8ux(e%i|*qBl_>xOL>D~%@yX{Xh25@i2Agm;Kh z8VP5qED4XPJl$@=IyK{Joxf1fWC|e}M(J_5P9K6MeH=d0*I6lm-e++}m{iXFtrXLbT)ZXB*~I?jG`0<3Uh zd|KmjAoxzQyrSr^=#zT+KxVR9HO$L~UDE-4X;|@1WcffKqvkEMW>pLwQ`G+)oXuLL z5}^~;Y0Ii7D#lHtk{zhq#Y@J34k!G|VON0^-FC0TRb4EXZrH_o*)qGI=(Luf`bTLz zr{(v7A3Y?#4Qp<`E3(Ov`TY`(ZTA9l(IaHOx1-{|RcwxBm(=+JMfWj(?Zc&KQIXn& zH&HQ8T*Mr2MZHr9eVr8Gn<(wx(X5Ihbp{s(p(+N+MfWi92m`6%Zf1Lja(bKc8s=x+ z+dbd0_hFBNP;==3%*K*&qT{)YoyL#wR&(hNJc#ut$Sa0Vt#5q58syVF2GP0ihb?gg ze#RnXUO`EuUj|%6(3KH}dMxTfOp*%R!eu93%=%+pxEkyRhOg!X!ClKvF2@>2{ delta 906 zcmX?R_rQ)Pz?+$ci-CcIfuXf}B9A6-OSP8!VUhH?=?n}E=@Xse+069};?2w_Zct|e zD!8ctB7bWF$;oPr<{&Db(H2C_V{`^lj~TsqTY*N@=1OzxF)}ddO}1jPXXKq+$z%j1 zS2I}w$)`-Y0lZwC3JMBIsfl^IDVfE|`DLj^mAbk4DXF$fi8(n+cD!6R`XJe2APd=v zTJHDeOfevTL$xk=QGMenqq{R-@q^PUQJNX>5A~P=+@8l26u0ZQdSwLhJ zixZIC!=eI~dC1}byw|J4%P%x z7?hu1qL7nXmYQR$R8o|foC@^qWIc9W3y3iwX^0sJU0}o0GSf?o5=%1k^U%U%b3eNw z6EN^MAL9JN0it&ZnS=QsMc%W5BIS{kC2G7*){r&@NyJObh#dijVSZ7%et>-|*@~d$q zV_d~4)_7LIgo+<)h{b6IXH-1L#%Eddyz0p{RjJ~y31MP5B24Vkw@WcXO0{`P0!w5i z86lA1@H`nj0`WvQ@Q+odG2%^F9W_MEVe%8a8U4@rzC7kp;mW41{X zudD5ihWv#XFaJ_WbCNBcuH$#laS;c5w zkhqm?7LLr|m7i+J#L)mO#!~?>;h2J_6+EL6dEAV7IIfZ81TTN2;UvbHXHW+36faMa zo!FLH*{Z;!U{b};HALgQhL>=Gt$)FOUsmvnii;ZJ@v0fW#3cq(3|>?5I{UxOzAm%X zuQa@YUo-EDhBxt+f~yMN_BgWKvheS}pA)DUMa z(OHHB2(^fGSAtz%AwecTAoxQZHt>;e4~l2Vb;1*FFgj^e8 zs#ox^XHjjriBZYl=fhHg+iZu8y4;RxqMt6l0{Q;}JZn<1q~BaG^rHUROKv zI4kc`uv^C-d{4(p?A4J7CsX@$EJcz|gO(y8sI0WAq;zfDx++)In))i1m+3Ty>J?~sVGLttS3M18w4pRmB`oEG*U93TdZnyIaX0T zek`0MV>cGg6jiC5xH49g56<$-jTymSU5WNv#k&wcz1J#2nab4q zv@Kb9pN@Jo=rlKLbu=PQ=iyOMq0{Izi_>idwpIxt{baU$N7~Nlpnr8J(6g* z+md{BeIqUMi8N(67lUr|odN9KHu=9^=?$kUn!Al4ZsKOkydiPJ8Fr`5C6W$#rK5HJ z;;U{w`p(qYeZrrcQ4adQd*(jyKAg`RGe+U!c#l5!&vLHED(Cnad;3#QoDq3EXKP8G zOkZ(&m(KVgJTdmP)leLcu!z+gEu6pBjW&5bEBPg7WLZX zBR0;lXy~;WA-3ne|DOnQ&u_d>h)O#tCWwn(XIIJeY>W|e4{Wf{fH7ogvD^Tq3_qv+<2=my@ oJriTW)zb!1qGZ5g#GSnn=~m2})1}IEH_a-a9*FX9xu2!~1FR%}^8f$< delta 2988 zcmZuzYj9Q775>h-m%C5SJ%JEHAmKt1$U8T0o(XveLP!XKgpdc1+}zw;^5B9YAOax? z$U|%y$fim~@IfrJ)mG;sVwHlGidGbD5f$o;Kb-26vF%JdoepZ-wN4(xMbFIMYwxwb z_3eGuUTdFo@|JS-wqjIQSgbmr0oRL<8cD(L7blm!8Rk9d1>ikeyxul1Eo1%Mc}HJN zPzms9H22>mQ7_|_bQY_XTo%Waxh$?JIV?1F9*ZKigvEY!4vULw9*b|)Qtdjevb%K3 zX}QEwmF>jtAUM&-T|ajNI(2(=q+l^~FUud+;v7*tqZjQqlsryb|4Ja33;H0>|X8rGkP z3o+*}BwRId+mhCp@<#H>Uc898* z^q-jfn8l)Q&yeXkmz4M9-*dXH?;E%-J-M%2KM?p(#w}bD@<#)I!VLo-ad#6pWbeXh zVIK>8V&GHUGH?V(1#TPov;X;pgQ{{-78GS&L_Uh1 z{4~oBJHTzW9B9gvP1O_n4s*cjbgV|bK!!krj+toG(S$X2ti?Jz)}xs_7sseYz^$QG zz@wuLUL70IuEUNFX6a<&Zi+(!zOmy%<~5{#B1p0;T8=E8hU6r30pNJYS_l= z2L-kZJmmkj`i^2#+hY}k$-{Nw4#llN@hS+e>2bL`m$^3Ax>~wCv{!*0eoIZcV%dpZ zGNw6G_Safx^$P4Z(1(730Rwxmmrw>C#y$i4vCF_RRLL{7HGKyRisnIqM+_XoqXw4X zM+TCR%%dM0RAEj7sYp{0RqWd0DcR(s#e34c9$%}cJ8i44)3@nCUs{i6dk;I58&sNc z3LHOx-RSD_i~!>qGsDCb1`@V;?tvvR?1z?hZ`!!o<$K6v^KV^sM77VMgXfg6Q$kFr zkDYACe5BDl2n&!ymTVfoE0@$CTAoZ1o`GQGA`TWhvsqY(JTv8%A)oFNPN51EkX1n; z%|c-P4t9Yef#RsUP#wgXgpv`?H{_It{xartLLcFbpi&&>9FI(tBH3g~$095qjw&n{sP-qWu_?mU-A$>R zDVv+K$6LERKAI@yRHp5*GG*-{>k5Gc`Rdx&X0Jqz0#Q;_S-Ge*MxfT<%BP&~aBXv? zZ|!OCO0R79b$VJW+qd)xtTs@O26=Yf%$bb_m#0DHS!ZA!;tZ})ffWW^Xf`kv5%TNY z=`v`2q@zVaNEi9%?ab(nPK{nvUtUW~xec_!BQGbW$d2_B<>xbc{Ii;0Qk0eQBi9#w z`LGdd3?)be-I7k!aB9;*Pp4{+M*Ob_`sFqWukGaWJyWBH*SGDhzKBhfZ^eTIpbtin?c`o zxu(sbo;8*7NLvJJeo2}yhczKO@4*vs9qo8r)+!%d^22w3%?4|`zl4agdrfTv! z)WL95d)ONr#SxuY@~t*w81*GNG!P~~^cI*=zg>2*?iks*%?`kvjWo$9>hf=q zlfM`F^LPIJSDzK&##hzoGc<5m9^J5jw{&fTLoJPwipL>;t=Xi}Zf-QX-Jw1`%jD(* zS=XLrZe+@n2Od2~o8VSBN=9;MV1L{QIQ70m8SHSV#}mjnUFLR7=M@`C<4Q6${ZYDn zsw314gfge4WtR=$RuI5_Nq*2##h%ff#Fa^&N%F;%$#Pd`sJW}LKQQ_W<5C-ah6X;% zA~2n9u#C*L%ZzNB%k+Ps}oK!Z3+e9lP{tv8Ug~|W` diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 935a2c95c4a2c3876bdb5fbc0aa3c28141edb024..3186bb61c16482959c3c7ad77a27adedc3b145e0 100644 GIT binary patch delta 2127 zcmaJ?du)?c6#so+*WLEpZM(Is+n{?eM!T-Cb+7KhV042$VRXDvaDW0b=9oMb6`3f4 zLj>pj%S6MB2nmT3X(UFX|CpHYhY66F5JOCikr)j4z(066@SLx1tZHm}?>YC}bIv{Y zob$Wi&Auz!WUSMYVgNSa^60P(IxdZtv^E!?%^3hNFx=GRsx1xoL?W}d_V3!Xqklu+ z@Tq`)X>|Bv0nfh&X;!&fIg^-H!(>RC!{jS%J`O}XC0^m`r-peag(kP6sGT=gu4Yda9P;X!k8f=&=Fpt?rf%yiUh#C}olYwTI zEHEIkP@qMiRiI6UJuUH1j8;ueFBnqyXQnEP^eUIXR{bh#Jfzev&_VtL{NzobQ`I|~ zoE;L2u$Wd7U09+HJBlqabStMf;E-5~WfB=!F0evA0sENm%5nVf|4y9io z+zbOHs6sCCC>~%KUSttvE*}NZOl~>~p_|+c6v1M0GvP-H@kbFrF{}_cj39YQg#!o3 zXC6t?u^%DKqHE74n=)7*zy~Q%Do`d67RV?Us1T?WsG`3{3zhHADXb=K9g&9x=geO_ z@7r@O4d5}4G9OT*)2FEGA=luW21VM&Q@eo{5j-leHVq!EW8q^w_1Li9zy>T8*qDYKJZ>j1Pq3>^0-Fs7 zWp9hXlLA`>dgEbFFIRD^3TI}RRg7jX^U~%vfj){wpjO~13QeF(oz84>_DS?(JIN#l z@U*&{**kRyc1rBRZb^B6M&en7CHCMs4Y}%4QFc~)|G@5D63=71#0%If@S?;%45|;k z(;P2hzr@RUg`FNy-*`jXt4hoAI}YNI#A`UhF5lpOurYU3qbB}1l&|)>bK=LdvMt)N z_@`6XX!Z)KnUkt8ralU0#>;%`G|K?e)Un*)APLQq(=Krps5F~ojGCz0Y?3iVsN~!v zW2iwbHHiy12^OW4a5sKNJwYNB4YVJH{Q>ofAxx+U6DR^vfhK`wVl?W$KhZ$z`wWr= z=EmIlLf*x++i>58)rp1VCxs%&rL$Xz*U^gCi5esuqH_+zKDmwJZ{=M}F@b!c`<7J^ zhfL~cTdIZHBLmeuMGU?LcT1f>y$y2&8hDjJcRCsk*csneLo+synero%2U6i>XHl%`S;0h)GIc zw~1>N4m4}aRZr=>_}Rc8n)aDG6})2>==~Bd&kdY29?}Ft0<#2WPl9ea;kztRAxcH~E@nL-dm#|{FJ0<^3UbJm za?+?IUPo0@WsZlwNYO8ks-AFN^3$$92v_ryd^POzeocnkcWfz(b!z$)OX6!lTh4Ny z_KOOY`&h4?7E{%5MYh^kE?IDd1dCZvzH!rr{+<6YE@>s76TkckE*&?b2g#~1lzdpS zeo>PCm!u!~UwzI(;>Z52>bHtQRi|eLCtoM|1pl}JJ*PLKE6BpkMscN2dz%(P)fh?r z*O96BPJVlio@^e02?xN5{XdXRwsKh9>O!R~;D`0z$%2~GgjXI9!(-j=C_ZbI3RWc) zlfHdPPOsQWF-x7%4Eh}AsAGQ{Bt6+l1|Ii>!PTk|7s+1j(`V*QNbB?|YHf9?8DJ7r iliWCFOc;!#cc{wE?(UGgv64x<1!{F9J@tGU+y4dKNvs(F delta 2240 zcmah~Sx}Q#6#ni{lAHYe2_#@pHbKLd011S!2nK>k*klzI*HX18Dw|T5sz6I^>w@6* zwKH_azVxBfHV^Ie!H&~Dw9^Ni&UCbWaM~Bg(bg^x9XF)s{wmMT;p>IcN*~}+73Mu}S zA@_%Qw2N$3BuNh|ljH)clw^+8NMcu7CFxaaCHYWkAQJgQxvxli+juX=Rz>mLf$Yg- z${^V+{K+!agVh%q? z2}gjVl%tHJoc@dsj3Pcn=pKwIaY!a31LdI6svus$su$rCRUf*w1l*V?ZBCw4i>YLH`ylGIByOgVFOioPYawjm88ILI-q;Sff}=S%vNU&mn$M{rc5 z_8rsk27DTh;{-#RxZ-p!>uziu7#cmK;Uo@f7{fTngoZcqmgsk;SSRtehEsS)x_wt% zaC+E#VmfD;xaPE4PveY+vzV5SXK1>->_Q|nsVjzw$Y^p8W9^Z-lw&Mr3O3P_mN(|a zH59{7ElcmFxGB>$j0(?G}!Djxcd@d>)~S&X47}L4Q!kwFgMK z2M0}+4UObS4pkb(ZX#Zxi*TN(O0shlX9|`Vhb&T*e$!x=FcCc6I`J(Bj2A zMJ%km_5a90!;(N25^u=AjvPUP5b<|bD7HnzIuLxcp_!EOmVmFlGsaBw)l5uy_arWM`+S>jhNtLb7g>*pQA`4ljp~qi7K%=(b9f zpuzGlww6j-@&Ne@*#>@4OY(s1J^a^94#| zugU1y&+v?k$M2zU=rlOe=WTChN@C2@PnS62ORc*3)i$OQ46LLI { /** * Id number of category */ - private Long categoryId; + private Long id; /** - * Parent category categoryId + * Parent category id */ private Long parentId; @@ -47,13 +47,13 @@ public abstract class BaseCategory implements Category, Comparable { /** * Constructor which accepts all database fields * - * @param categoryId Id number of database record + * @param id Id number of database record * @param title Category title - * @param parentId Parent categoryId + * @param parentId Parent id */ - protected BaseCategory (final Long categoryId, final String title, final Long parentId) { + protected BaseCategory (final Long id, final String title, final Long parentId) { // Set all here - this.categoryId = categoryId; + this.id = id; this.title = title; this.parentId = parentId; } @@ -77,41 +77,41 @@ public abstract class BaseCategory implements Category, Comparable { throw new NullPointerException("category is null"); //NOI18N } - // Is the categoryId the same? - if (Objects.equals(this.getCategoryId(), category.getCategoryId())) { - // Same categoryId, means same category + // Is the id the same? + if (Objects.equals(this.getId(), category.getId())) { + // Same id, means same category return 0; - } else if (this.getCategoryId() > category.getCategoryId()) { - // This categoryId is larger than compared to + } else if (this.getId() > category.getId()) { + // This id is larger than compared to return -1; } - // The other categoryId is larger + // The other id is larger return 1; } /** * Id number of category * - * @return the categoryId + * @return the id */ @Override - public Long getCategoryId () { - return this.categoryId; + public Long getId () { + return this.id; } /** * Id number of category * - * @param categoryId the categoryId to set + * @param id the id to set */ @Override - public void setCategoryId (final Long categoryId) { - this.categoryId = categoryId; + public void setId (final Long id) { + this.id = id; } /** - * Parent category categoryId + * Parent category id * * @return the parentId */ @@ -121,7 +121,7 @@ public abstract class BaseCategory implements Category, Comparable { } /** - * Parent category categoryId + * Parent category id * * @param parentId the parentId to set */ diff --git a/src/org/mxchange/jshopcore/model/category/Category.java b/src/org/mxchange/jshopcore/model/category/Category.java index a1c4962..f91422b 100644 --- a/src/org/mxchange/jshopcore/model/category/Category.java +++ b/src/org/mxchange/jshopcore/model/category/Category.java @@ -29,13 +29,13 @@ public interface Category extends Serializable { * Id number of category * @return the id */ - public Long getCategoryId (); + public Long getId (); /** * Id number of category * @param id the id to set */ - public void setCategoryId (final Long id); + public void setId (final Long id); /** * Parent category id diff --git a/src/org/mxchange/jshopcore/model/item/BasketItem.java b/src/org/mxchange/jshopcore/model/item/BasketItem.java index 0e19354..52d6d9e 100644 --- a/src/org/mxchange/jshopcore/model/item/BasketItem.java +++ b/src/org/mxchange/jshopcore/model/item/BasketItem.java @@ -53,7 +53,7 @@ public class BasketItem extends BaseItem implements AddableBasketItem { // Copy all neccessary values this.setItemId(product.getId()); - this.setItemType("Product"); //NOI18N + this.setItemType("product"); //NOI18N // Copy instance this.setProduct(product); -- 2.39.5