From ea2ac9942269d6155aaf6dc62213791c1bb15984 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 8 Sep 2015 22:44:54 +0200 Subject: [PATCH 1/1] =?utf8?q?Continued:=20-=20had=20to=20put=20all=20clas?= =?utf8?q?ses=20and=20interfaces=20in=20one=20package=20jar-wide=20...=20:?= =?utf8?q?-(=20-=20updated=20jcore.jar,=20jcoreee.jar=20Signed-off-by:Rola?= =?utf8?q?nd=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore-ee-logger.jar | Bin 5452 -> 5508 bytes lib/jcore.jar | Bin 28933 -> 28193 bytes lib/jcoreee.jar | Bin 20298 -> 16413 bytes nbproject/build-impl.xml | 16 ++++++++++++++++ nbproject/genfiles.properties | 6 +++--- nbproject/project.properties | 8 ++++---- nbproject/project.xml | 10 ++++++++++ .../{item => basket}/AddableBasketItem.java | 15 +++++++-------- .../jshopcore/model/basket/BaseBasket.java | 3 +-- .../jshopcore/model/basket/Basket.java | 1 - .../{item/ItemBasket.java => ShopBasket.java} | 8 ++++---- .../model/category/BaseCategory.java | 17 +---------------- .../jshopcore/model/category/Category.java | 9 --------- .../{product => }/ProductCategory.java | 3 ++- .../jshopcore/model/item/BaseItem.java | 16 ++-------------- .../model/item/{basket => }/BasketItem.java | 5 ++--- .../jshopcore/model/product/BaseProduct.java | 2 +- .../product/{generic => }/GenericProduct.java | 4 +++- 18 files changed, 56 insertions(+), 67 deletions(-) rename src/org/mxchange/jshopcore/model/{item => basket}/AddableBasketItem.java (90%) rename src/org/mxchange/jshopcore/model/basket/{item/ItemBasket.java => ShopBasket.java} (84%) rename src/org/mxchange/jshopcore/model/category/{product => }/ProductCategory.java (92%) rename src/org/mxchange/jshopcore/model/item/{basket => }/BasketItem.java (91%) rename src/org/mxchange/jshopcore/model/product/{generic => }/GenericProduct.java (92%) diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar index b7c47511b5b9648be05fe5492165f6c845b05077..4869b92756a60045e244336477a35716a2b1553b 100644 GIT binary patch delta 872 zcmX@3)uPQ4;LXg!#lXP9z;J8EL>^7vn=>@rbI+=YUSwckxH!=%rQTFG$=FCi!@npo zIVV-YIlrhNzbLUJGe1w0m&-XPvA9?_Ah9IFN+BmRNk1n)-6Tslu^>~|NY7X=E3pVk zG&#R06^n3rY7#G(0*XXdVp(EpD%covJy8RYIlNrFTqrKRpuhxl?qo_z-7c}3ub)~P}#he>ny|s zWogH}8;lGLAnXjbsD9X2hl*<~y zf*7|pbrfx%!P+cP!yLC}JrvCrOdvb$ku?L8TzYB|nx{3~*J)h-;mE?k0Ky0}7#Nl` zwt&r;93UbO4iA(Fgj)tuD98@7Y!bWj^7bTWt=I3eha`AE@YoBbzsKE5FYH|#tCWvZhG_QXMG!1AF9Ebr~`9p1{=2q6zZsDmU|NUtnN@uq96254q$vr?ay$iktdi4UNel1gkI7*| zrXY!4AsMkFP}2jv8JR?wVJT|zejypAXAG0?3Q2<${t}X56r7wOELV@J3^l?*i39=! z7~VR10iBN3m%w;KwhGk@P@+MYQHO3u5Io(%(hzQ=lwc+?fSj`f-6)tzlg|iCnxm(8 zPy&Jgklr6S^(u-e$b3g^ke!5VWRehI!V)l&gb+Zsm}nM>m=Ge_gAh=oGJ;wc z+>&P%5wX^YR?&h%aA^y;w$fT`-LST{>IdxyKj^2@sy*k<%gp5Y27WpJcka9Qp8q-L z&b{}%+ddbMe=4;4H8#5oZ~~v~AJvMS=l9QE`IWb8e6+GBWHzv?ms?nxkzCC-ZzV{ zX-Wb3Z@&I`e)8CsI6cFk8o=LO@Z;fF%*26M*zt&pgDM_%(c>XEVsOYsZysay7cM-G zUvis#l5J10`UH;~XYnM9!z`X+@idEHv3Q2Xvn-CVc#g&MECRn~d6dO57B8@vP;p$v zi%y(yAsZ)McnL2vjaT^Pt15ou#BW_F!0+5Rh0`p~uz1ah*O}-WOzI6D^`;AN;cagF zy$gT9J1Wkq_@jVlN7weAj{c^u?Gx?gU5a>g;;n_F%EU-Tnegsj+uO0LqpZJUaBJCy z&AnZn!}@zm?(@{+QVoB?Dh(^KN}xoqcI8k2-TJ|$rM=f#d=mZV2ysJd7ggkqWMYn zIH%%04Yy&8#m_WcLT}?M%j@c~S;b#8{1xwO_<+TScwZpCb7*k5qjNaBXGiwn&i;N4 zeIU_{k5qiD;XFRka6d*>{7u8BxJ$o3B}xCLvPLB7qAF2uSax`<>V|+H3dOb@iAci& zEQG)!fZ7(*ANeDn$zh4)vqW-RB6%*6oR>(hOC;|lQUD}U3?xz*BvQO3QbZQY2Xa&* zMMok9NFv1u@T72v+&yc|u0g3~C+ z+*sWk;4x`%klY6q_aGMc!b4H=;sMOSLvnn!oU_#!546(%D`I^LL57=*%*B>byv8%ulPm8 z9}5k4$=2s6S zSm8y${&iXUn=sX1;H;(Dt1a9OkiQ9Le?K55A4Xxq%aECDwPfNoGx^MtNq2~eKC5Hl|MVehEDaBb3{SB; z!)$jg*(XC`!NlBD$*n6e$F znwj)kGP%y0NvfI2FfrK~g$W-v#KZ|Y%9)Bj>WSD6#coT(H_%bSefO-2*bc=VWaiE& zX80^)hi|g{0j8P#9kVpMJM;q#uL0f)(##GYBqonWVM3>=WD=MR{glY3o0%N8WO8#T z@_{fFVv=rVa+H`Hi^7DDagNCzOC}j+Ca+jB3G59~nZhK)%;XJX@@5n!e34)#w^(K; z)6C@E2qp>P!}-==di0@{k*nfkvU@&?UB0-mUAo4RWG7UiSjB4q%4w1RQ5D z^8lv3itJWz&PmKVSJPfXZu_L-IDx#75{Q+r(vQ$oHhHa(w;Aydq=|nb zQ~V1)@i`WWFHkGKj38HM+!HeC7Ii!BAX0pXu|cHKSLJ$!8nks|&<8G+$uy zdKHe&KHP1L-evfhFNzPdV+F0=!jqVNs@V53iWD&Tf>5l0(-`T&e<+;)MZEYC$%=wZ zB?fs)@VE-zbn>MKWFN?(YF~3+} z@oB`Iz&ul;kQp&;Y-rk8=<*utq^qvHMAH-tWT*gdBJ3wH{{U3`Q?T16kQEM`JiKU5 zUNAB9p-ih1Wd7%*DR_|9HRJwph0V3;$!Au5`>-A0zd4h&>FK4ap1sYXm-?M<_*KkR zF;At^b>E^jdc%e>{oC~^?j2pjbv@g646pAP(BJD!pK#aLD`J-3)=(OV2kcbmVVcAQ z1a+^WCmQ;6Lr*gFWV$=?xEY)W!W2VKHS{#2f4b2>!_YGgJ5y8cdM zeBfTLo|{};;K*>cx-bh@xOn-vDP5b~T$Hfr;DVWI$WAA=sOWOxYHW3(8$B*6ntFMb zJ|5c7PXjCloyc=yh=*-s{Te3BfJDezVVwfHivD1m!PVD05YgJsQ;`)j1%VsL} zRuv=qzNS>+)1PcQCR+67=9;8n72Y#c)+kH$o{^5t{ayP0<}7y^uZ6i9==7y(*q^@u zH>udI(PneAiai?k;ue}v!>zbYqYd>&uAtZJsV$9#w`;V7?@)24MqAiEjn3k`HQM2P z{B(~-p)JuUu5)y~CC|AEt2N{yUq987V=Ey1q9xZ>NEq9iS3Dc}0&(H*1SUw>?4Mq%U|uF!);uAAy~UNNz>X)KYme7*6f_UF+4;HTnv4XqTO%SZX+g}#(H+h|4P%2JZIn054>gLx~| zcNx7Es3Oe+`}c6Gs8&%k^8%C%vQmSrZCB)gn9;fq$1nk5l1nqm2vb?+*Z)%lt~^o*AIwOu~HC| z3-monp}emq>DTYNGFNi&l5e2J;hP3J}eog8c{Smb*tI-IA;4B6xp=g1!VBq4aU z8NNlHkBPx;H=LLU<;20n#L&c-@XUf@UT-nlD9ys7A2W^S!A?q60}s}BZQ5DEedT^e zjwaB;n?*tQ6V+Oz%LH+n8s*ln;PS`~WFqgXQm69Ce!X#PMd;h7{=ioGE%V&gx%6F8 zSGp@0D!Z34?CxH}aJIXSA+hHYhO2s3GCbYW$nbs73WnO=bqsp%Wei{UwlFO3Yi2mu z*T!(6ubrW-zlq^^e*=SaU>n28KtID*19Du=pd9zeV4v(VG#EGaOQ(M8P($`l4j2l{ zeebql=L>~kR@4ia3mmyu%K0| zUR% z2i_Dny(^4awHB)bumhJi?>2JmUvAExdTwy@eY-0>wz2ukii&qXlBQAD`4pxXbBM}e zqLA4PQO0bC7{lzG7|-mA7|U#&R?TdSHk#RSt%BJXS`D%8Qp@rf=KJHeY0OjN_Xy_4 z6W&*RU(#_a*Jq_JQ2j^JeC>NOqE!80)-!5cd(I-opLf0%#^VnbSBpWH2>*NUtz0l8 z5#aww`9MaTTs4|^1NeA9%ItYqqEJ`xOm^#*36ULa3aIa0|75pqmf{-W>UCIic`+`tWJ)$w-&AEVX4Rwh$1&A?Sm zu4Yopq>jmCOffK>OEZ|vWbz3<6&Sk0)$VEAIK$QMuGm~8mqesY_{_jR@J}6|8~7L6 z4b0-f*D#sGtIX$81Ct9Z@*=)4(8wJNFi)UBVO=_Vfc&;>WZpu2spFD?J-DBVG%%M3 z4PM^nad&i)z%42HDb-bVb(3pS<>c~F-i2t_@oxkF!B+S2nwe!qgRW06PU_Gug@ITgR8NSx>je&1*#lU^ouL~GL zzUy75XfT*GDE2=wb2h(07h}Z6!IIM6n zHATWgbSrgiLj<;C3Dpc5z;r2G#076Yo+9feuJrPp1cVX29XjqnICde5Tpf+Q7=nA$ z{1mljqd6b6Tbkge6^4*yR-l>e(xTS4hTFeJjSf$xpx%{eWhvBCNSqPaoX0WnC>1oY z*f45r1r7yZwD~c%q1~L#{?K^1Gxu=}Jm#P7P_2)0SW+v*`9}FshVj>=BzO3b$ODye zSv`V*(;?-q^2wENRSr?M@ku#HQl9Qd3hx2dZ*@q02ldq#cp;?NH6hgXlD>n2^?i+y zyxtEI-i3^0ZAc{1!ARZ-iKNqyL|&{K9AJY_N%Cj?NalUdlDk4mjtQ20DWv3ee#yNq zXB)%>+u#apw4Hcof7j>yy)Zv81Fo<@=e zjt4_}(WuBLW*|=ncp>;}#Ql9~)SLCGQ}~JNuE$#~e%k{&zo4w!!dV8{8Gr2DkdZ&OS(n z2P3(kkR0d-2_3Ww$!$H}@b7-9E>;y)fKw4dHFC^c# ze~Ip1uLLX_X>NOi=H6khx$CFrx$k-D!xZq zAQGs!m*54(2{Kq73+cT+L0k!GuOHIQ%{O_M8AHod49yRYp(6J%Yg^FhjV?TiqO-Zq z(eVfS zuBP|;?yR)zC{l*6hGAZ(^>O3{`BO`UO&bxQVUIrr-}y}q&zl;qQ5ufwSHtMhte_e+ z#-@%EDvzyiwC0}1IN^owTq&h0xPGS5#uvw09%L$bE8mVySe!_Lc+UxL4x;I11 zC%Y7pU5d#rqcK$*hxyugG-_pN*DA0|s|v8s8ozzks5`XR=X@J186~k%RixkjrhXM< zBHpFp&fF(qJAv|`Er8(x%ZB@x4aWg>Nw?zxzqLmzTLaNCu%1B0KIqm5VYPH4R#X3gn zC=m$tqLyds5~OSFG?`zwN0yHp*!@9Wizd?KjG6gf8(^guBE3eK)6GlqXtN$;)(4yQ zShF5y)`##;rFlcyGsNS~dV*O`G{+~I2LLvSPg z{h4Mx%dBUc^&GSAH0!y@Q{(d~dBKmeLS@+^zhxsSDV06dHT~$uX%WCQ>77;M-N|{6 zxej{!&DT+=qrrg@XmrqPaA5>F`PvAIK1-M^<=lo#$1*#X>u7S&PFUffms*R19)%uW zWhGB-{t*93tad0|M5JXXI)Op-NoCdqr}42vva zJqitq@0$XW4_O99hRr&zH?Rd;b$AVI!*-IxNs}85y1H!Q#K?4+G`BvB(kY{GvyNK~ zx>(%GNtD|RWFv=5I}Cax=Ne?|e7SdSdY($Kq#<1(X_BkcUF}Ot6f~>+PC>h?&0Wyt z-q2+r1L^X^xoMV6;>Nu6!C5>fa;0m%tFX=0(OfvWV_kdq!g+7gWfS(wc+i>vahj(% z%~PD_kz*ZTccr8vRBx3-^6J`r-lr)r~oMwXNR4CjUjh#Tfg7PB-AJ%UWp`%hq)$q&El1P3w zVp5$*N*_#OU7Lu{ek0Xyp`f$V} z#l#Uw7OGZuj3TSmP&TFqhsE(NB6Um=gyb>>L`}W@HL}^^1!)RHH0cK1N*H#KW;-dK z+^%H#avRZP9rja?hb*eZKC)6KjzeE9$)XKs>gKIJW}7e4-r4(uX7gk_IqMppEcYy2SIT4KIGT{N29c9SkkLyBY7K1`&4lYuDEZ?F zg_G{eMfrBh7RyylrT%2MJldp^*Pk^NaaXdtlv$&DBC~z&T4o=)r!XsAaW%8eE2c7g zdPP06_~yyXmNrjk_Gt4QX110FW=mS;GdtC?h*_LxDYFfpdCbmxW;07)xtiJDm2J$d zt!m!lRyFTrYpWX4))Cn^wJi^{%}(K_J|_-&4|N diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index f479cd85f681296c81d035819d67d492850194ec..9f0039fef5c5783f9feefb340c1781b104232d23 100644 GIT binary patch delta 2896 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 + + + + + + + + @@ -1406,6 +1414,14 @@ is divided into following sections: + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index a684ce4..104b3f2 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=622c8e1d +build.xml.data.CRC32=bbffe842 build.xml.script.CRC32=fa35cacf build.xml.stylesheet.CRC32=8064a381@1.75.2.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=622c8e1d -nbproject/build-impl.xml.script.CRC32=40bf9247 +nbproject/build-impl.xml.data.CRC32=bbffe842 +nbproject/build-impl.xml.script.CRC32=a945b1d8 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 8b450d2..d77d1a4 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -30,16 +30,15 @@ dist.jar=${dist.dir}/jshop-core.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.jcore-ee-logger.jar=lib\\jcore-ee-logger.jar file.reference.jcore.jar=lib/jcore.jar -file.reference.jcoreee.jar=lib\\jcoreee.jar +file.reference.jcoreee.jar=lib/jcoreee.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcore.jar}:\ - ${file.reference.jcore-ee-logger.jar}:\ + ${reference.jcore-ee-logger.jar}:\ ${file.reference.jcoreee.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation @@ -80,7 +79,9 @@ manifest.custom.permissions= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform +project.jcore-ee-logger=../jcore-ee-logger project.license=gpl30 +reference.jcore-ee-logger.jar=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -92,7 +93,6 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 -source.reference.jcore-ee-logger.jar=../jcore-ee-logger/src/ source.reference.jcore.jar=../jcore/src/ source.reference.jcoreee.jar=../jcoreee/src/ src.dir=src diff --git a/nbproject/project.xml b/nbproject/project.xml index 815ee3d..90befe4 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -14,5 +14,15 @@ ./lib/nblibraries.properties + + + jcore-ee-logger + jar + + jar + clean + jar + + diff --git a/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java b/src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java similarity index 90% rename from src/org/mxchange/jshopcore/model/item/AddableBasketItem.java rename to src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java index 00ea850..db0855a 100644 --- a/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java +++ b/src/org/mxchange/jshopcore/model/basket/AddableBasketItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshopcore.model.item; +package org.mxchange.jshopcore.model.basket; import java.io.Serializable; import org.mxchange.jshopcore.model.product.Product; @@ -28,24 +28,28 @@ public interface AddableBasketItem extends Serializable { /** * Item amount + * * @return the amount */ public Long getAmount (); /** * Item amount + * * @param amount the amount to set */ public void setAmount (final Long amount); /** * Entry id (from database backend) + * * @return the id */ public Long getId (); /** * Entry id (from database backend) + * * @param id the id to set */ public void setId (final Long id); @@ -70,19 +74,14 @@ public interface AddableBasketItem extends Serializable { */ public void setItemType (final String type); - /** - * Calculates total price by multipying amount and single price - * - * @return Total price of this item - */ - public Float calculateTotalPrice (); - /** * @return the product */ public Product getProduct (); /** + * Product instance + * * @param product the product to set */ public void setProduct (final Product product); diff --git a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java index 9e47ad5..cc4d280 100644 --- a/src/org/mxchange/jshopcore/model/basket/BaseBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java @@ -21,8 +21,7 @@ import java.lang.reflect.InvocationTargetException; import java.sql.SQLException; import java.text.MessageFormat; import java.util.Map; -import org.mxchange.jcoree.BaseEeSystem; -import org.mxchange.jshopcore.model.item.AddableBasketItem; +import org.mxchange.jcoreee.BaseEeSystem; /** * A general basket class diff --git a/src/org/mxchange/jshopcore/model/basket/Basket.java b/src/org/mxchange/jshopcore/model/basket/Basket.java index 679200a..24502ec 100644 --- a/src/org/mxchange/jshopcore/model/basket/Basket.java +++ b/src/org/mxchange/jshopcore/model/basket/Basket.java @@ -21,7 +21,6 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.sql.SQLException; import java.util.Map; -import org.mxchange.jshopcore.model.item.AddableBasketItem; /** * An interface for baskets diff --git a/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java b/src/org/mxchange/jshopcore/model/basket/ShopBasket.java similarity index 84% rename from src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java rename to src/org/mxchange/jshopcore/model/basket/ShopBasket.java index 9cd3c53..7cd016c 100644 --- a/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/ShopBasket.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshopcore.model.basket.item; +package org.mxchange.jshopcore.model.basket; import java.sql.SQLException; import org.mxchange.jshopcore.model.basket.BaseBasket; import org.mxchange.jshopcore.model.basket.Basket; -import org.mxchange.jshopcore.model.item.AddableBasketItem; +import org.mxchange.jshopcore.model.basket.AddableBasketItem; /** * A basket for orderable items * * @author Roland Haeder */ -public class ItemBasket extends BaseBasket implements Basket { +public class ShopBasket extends BaseBasket implements Basket { /** * Serial number */ @@ -36,7 +36,7 @@ public class ItemBasket extends BaseBasket implements Basket< * Default constructor to be able to throw exceptions from super constructor * @throws java.sql.SQLException If an SQL error occurs */ - public ItemBasket () throws SQLException { + public ShopBasket () throws SQLException { // Call super constructor super(); } diff --git a/src/org/mxchange/jshopcore/model/category/BaseCategory.java b/src/org/mxchange/jshopcore/model/category/BaseCategory.java index e8fe1d9..ecc6a82 100644 --- a/src/org/mxchange/jshopcore/model/category/BaseCategory.java +++ b/src/org/mxchange/jshopcore/model/category/BaseCategory.java @@ -16,10 +16,9 @@ */ package org.mxchange.jshopcore.model.category; -import java.io.UnsupportedEncodingException; import java.text.MessageFormat; import java.util.Objects; -import org.mxchange.jcoree.BaseEeSystem; +import org.mxchange.jcoreee.BaseEeSystem; /** * A general product category class @@ -99,20 +98,6 @@ public abstract class BaseCategory extends BaseEeSystem implements Category { return 1; } - /** - * Decodes the UTF8-encoded title - * - * @return Decoded title - */ - @Override - public String getDecodedTitle () throws UnsupportedEncodingException { - // Get title - byte[] t = this.getTitle().getBytes(); - - // Decode it - return new String(t, "UTF-8"); //NOI18N - } - /** * Id number of category * diff --git a/src/org/mxchange/jshopcore/model/category/Category.java b/src/org/mxchange/jshopcore/model/category/Category.java index fd775cc..1fb60e8 100644 --- a/src/org/mxchange/jshopcore/model/category/Category.java +++ b/src/org/mxchange/jshopcore/model/category/Category.java @@ -17,7 +17,6 @@ package org.mxchange.jshopcore.model.category; import java.io.Serializable; -import java.io.UnsupportedEncodingException; /** * An interface for categories @@ -69,12 +68,4 @@ public interface Category extends Comparable, Serializable { */ @Override public int compareTo (final Category category); - - /** - * Decodes the UTF8-encoded title - * - * @return Decoded title - * @throws java.io.UnsupportedEncodingException If the encoding UTF-8 is not supported - */ - public String getDecodedTitle () throws UnsupportedEncodingException ; } diff --git a/src/org/mxchange/jshopcore/model/category/product/ProductCategory.java b/src/org/mxchange/jshopcore/model/category/ProductCategory.java similarity index 92% rename from src/org/mxchange/jshopcore/model/category/product/ProductCategory.java rename to src/org/mxchange/jshopcore/model/category/ProductCategory.java index ad6ef83..cfd56f8 100644 --- a/src/org/mxchange/jshopcore/model/category/product/ProductCategory.java +++ b/src/org/mxchange/jshopcore/model/category/ProductCategory.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshopcore.model.category.product; +package org.mxchange.jshopcore.model.category; +import org.mxchange.jshopcore.model.category.BaseCategory; import org.mxchange.jshopcore.model.category.BaseCategory; /** diff --git a/src/org/mxchange/jshopcore/model/item/BaseItem.java b/src/org/mxchange/jshopcore/model/item/BaseItem.java index 0353d33..d2895c6 100644 --- a/src/org/mxchange/jshopcore/model/item/BaseItem.java +++ b/src/org/mxchange/jshopcore/model/item/BaseItem.java @@ -18,7 +18,8 @@ package org.mxchange.jshopcore.model.item; import java.text.MessageFormat; import java.util.Objects; -import org.mxchange.jcoree.BaseEeSystem; +import org.mxchange.jcoreee.BaseEeSystem; +import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.product.Product; /** @@ -58,19 +59,6 @@ public abstract class BaseItem extends BaseEeSystem implements AddableBasketItem */ private Product product; - @Override - public Float calculateTotalPrice () { - // product should be set - if (this.getProduct() == null) { - // Abort here - throw new NullPointerException("product is null"); //NOI18N - } - - // Calculate and return it - // TODO: If later other purchaseable items (other than products) are handled through this class, this needs expansion - return (this.getAmount() * this.getProduct().getPrice()); - } - @Override public int compareTo (final AddableBasketItem item) { // Trace message diff --git a/src/org/mxchange/jshopcore/model/item/basket/BasketItem.java b/src/org/mxchange/jshopcore/model/item/BasketItem.java similarity index 91% rename from src/org/mxchange/jshopcore/model/item/basket/BasketItem.java rename to src/org/mxchange/jshopcore/model/item/BasketItem.java index 217b3ac..334179e 100644 --- a/src/org/mxchange/jshopcore/model/item/basket/BasketItem.java +++ b/src/org/mxchange/jshopcore/model/item/BasketItem.java @@ -14,11 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshopcore.model.item.basket; +package org.mxchange.jshopcore.model.item; import java.text.MessageFormat; -import org.mxchange.jshopcore.model.item.AddableBasketItem; -import org.mxchange.jshopcore.model.item.BaseItem; +import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.product.Product; /** diff --git a/src/org/mxchange/jshopcore/model/product/BaseProduct.java b/src/org/mxchange/jshopcore/model/product/BaseProduct.java index b1704d6..e655ed5 100644 --- a/src/org/mxchange/jshopcore/model/product/BaseProduct.java +++ b/src/org/mxchange/jshopcore/model/product/BaseProduct.java @@ -7,7 +7,7 @@ package org.mxchange.jshopcore.model.product; import java.text.MessageFormat; import java.util.Objects; -import org.mxchange.jcoree.BaseEeSystem; +import org.mxchange.jcoreee.BaseEeSystem; /** * A general product class diff --git a/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java b/src/org/mxchange/jshopcore/model/product/GenericProduct.java similarity index 92% rename from src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java rename to src/org/mxchange/jshopcore/model/product/GenericProduct.java index 58619f3..15a40f7 100644 --- a/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java +++ b/src/org/mxchange/jshopcore/model/product/GenericProduct.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshopcore.model.product.generic; +package org.mxchange.jshopcore.model.product; import java.text.MessageFormat; import org.mxchange.jshopcore.model.product.BaseProduct; +import org.mxchange.jshopcore.model.product.BaseProduct; +import org.mxchange.jshopcore.model.product.Product; import org.mxchange.jshopcore.model.product.Product; /** -- 2.39.2