From 4467c080c44c5a2150b488d56fb7b04a4c779c98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 3 Jun 2017 18:18:26 +0200 Subject: [PATCH] Continued a bit: - renamed interface/class - updated copyright - updated jar(s) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jcontacts-business-core.jar | Bin 78431 -> 78431 bytes lib/jcontacts-core.jar | Bin 48388 -> 48388 bytes lib/jcore-logger-lib.jar | Bin 2535 -> 2535 bytes lib/jcoreee.jar | Bin 24955 -> 24955 bytes lib/jcountry-core.jar | Bin 10608 -> 10608 bytes lib/jmailer-ee.jar | Bin 11208 -> 11208 bytes lib/jphone-core.jar | Bin 56707 -> 56707 bytes lib/jproduct-core.jar | Bin 21552 -> 21552 bytes lib/juser-core.jar | Bin 84624 -> 84647 bytes .../database/BaseFinancialsDatabaseBean.java | 2 +- .../{Billable.java => BillableReceipt.java} | 4 ++-- .../{Receipt.java => FinancialReceipt.java} | 10 +++++----- .../receipt/entry/BillableReceiptEntry.java | 8 ++++---- .../model/receipt/entry/ReceiptEntry.java | 18 +++++++++--------- 14 files changed, 21 insertions(+), 21 deletions(-) rename src/org/mxchange/jfinancials/model/receipt/{Billable.java => BillableReceipt.java} (95%) rename src/org/mxchange/jfinancials/model/receipt/{Receipt.java => FinancialReceipt.java} (94%) diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index a0ca53b9d02f36e1d30269cefd780f092ac072e0..6de90379984e4536915f0abf67334246fccec75a 100644 GIT binary patch delta 828 zcmYk(T}V@57zgn4KgZ2w&eq69s6}(%PPajjc{9RlF%g$qNkPr*W2oJT2ue8nxQ()b zhi;r;q)>vji$x?D>4niv7gErL1rkPNUxF5i?fsuqI5<2%{?Ge959e%QF>hfp&m5~$ z@(Lu$BuTMbF9yvXr6E_Umqkf=QNwx>hgc_Yko7wbvmTIZS(9>vbxuCAJ$ElEZTdM< zkHYp;z;4*INz86mj`B`gX%scHqHHq~#)3D+#QQz{TGHwY?_x3~zuRVu zxpMqktn02plEhOZR;ocCN;2lYQ3DTVlF{7)kB6U{7);&YUqY-tFVlwZoNF&+a$|l* zChFdP)UfZ}=R&S|Ff(B7v`CV8A}Ra|X5ve?Ej;{l&8!rOx3^w-xil?H(zL7wjEH7h z{=C+v_&0hLlQ`jiHPn;}ZN#$cG8|fzxLQ9fA~haFes;i!GDS?yj%-1%rcyKdw6h)G zo;*|cni0z`Tj12XwjH=vq~!iWb;^!vaaCQj;~_CtjwrEGj%K3Hfn!A4f#bxg15HG| z6DNr=Cr$_qxzNC%(S;Ub!i95$)s3@6w;N}Oc{e(US`XTZNe|ixn^#Y+d(p|{hZh%! zQ$8e!Ssz*nZw0!EkqTTUEPnk~(vM3_KKb>-^_7S-nXE(?;jGek-KjzkldS>t{Qvf< jB>;HQG@&21yZ!oC$z6SLHiI9#DA@u(R@i;K& delta 828 zcmY+AT}V@57{}lLIon*zW826@s6}(%PPajjc{9Rlu^}zBl7gDq$56Ww5tP{M<2J}n zc<9CnMhYcZ=VB5G23i>1bRh*@SRi3U_9bYM*xu)yq7J+~|MUC*pXYhcSy(hIEE=R_ zLNr(yGc)$gc56WLiBAiqc3CXE$$r#PJ&*lV$FYy>ryOz`|KB7xi-)KuCpPkx>Wa9<#DQwEyecK~c4tN-t)A$1A|uhWMU=6`K9!UB z**05hE40VQt|Yr|8yVxLj;~b00hFmy--wZdYBs)u&v-cW$V_1B?w&Fly85I-8@g?- zy_m?g`5A#k;`Muh!n@ymET%8JH`8zLv@*s|OvaC}np(PHrOfv=Ni5-CZ@=_>X$%-nO_&+(op(x!w^SGDvY9hzX=s0pPC=ugkDXR zOX$Gt9jk$EpVh}8SgPGrJ|HX;sx zf$$4n^`n!lZ+@I3aw32fwfJq$o2{jV==I x8hzKz8uSp^9750Ef3H|Wa45MDPLj9&#|w^Su4~>vSoc1M^#SRKF5X3u`3*y2Ar}Au diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index eaa2463471426757016ba6786661d4a7b471c087..54a8731c3ecc2973c6f9286a08706a16c4a442ab 100644 GIT binary patch delta 850 zcmZqq#nkePi8sKTnT3mifrEj;umA8wUJYj7{=*wBlo^?U+{tl_RuGy=WAX(lepJPi z4OlfM8wB!A7G>%Z1giF8KmuBm8(9@6Ur6VeT#&#r`7RR|*qptr`am%OG;_?DJHWCB znO(p%2TM0xbwRs;G>Q{ZY%u`aa$u*>-J$wD!E__D=Hv|vxhC7N zfnBlLldYcV(V1{T~Cpf4!FHHXn5m}f!6Cz@p{}Uo&Svnmea=C0H#GLl(rx20++T#!r%chSI z5#1Ixh%U2EUM8>=Zrw5vk<PGV$Wm^9g; zQ+4u%-FA}~G>LA0KCd03u5iIAh)%nuJHU*|KUZ3SqI|N+s*fPsCTpzr0@J0d1HtsI z_0p4{tiB3n?^zQHrWJr<`fKgL?1Hr`z_j$b5HMY|ZZ%X*B$%#QzYa|6ZU~2pOHW?3 z0iyTxTItFEHW-1$jWqQsi`Mzh*`>~frYh1L(87_Nx zLC-LC3=(l`3q802{j399j)Q~*_VR1iH zdh4LSM}SY99&Dls%HjdlnV?;;z*#<^z4)3x4VMHHNW!po)r$TY7OWlLSY6r$zePPp zF0omQLSidk%c2wckZ%Mztp}%0&###uDHn8!op|_If9RN5HJyoXU+q`brL<3z`m9CW zKvLSAw`d^K@l(*&RGxaq_u!vr>1Le8L%Mg1O#03g8JD+8#^IkN^JXwFU>pm4 zCgTmhB;$x|lCec~G<7O&;4tnOZ6tGJyn#$OxlU7klUp>^H&qi1+9n%qx@wYTm?WHu zABIZF4Koo*`7#}&&Nox0N%xbYz^i{CRG+nItHFuqo6s<8f|D5+GLmUW{~@;*)-!L> zy_!9bwB?L&JnP1DFq=YJ=guMT&rNSP7m@K?8rdp$ZhIp6kZj>Da;OkQ{wPrITcrN` nB6)u?hTs1!k{?+b#k+a=9&&7X1i8CJJ(Q^5x8g;gSn>Y@Bj7>6 diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index c8046481dc6d1d52e4cec0137a3fb47448a8f795..3e757cdc2af9b522811655bbbacd2cd6dce2cba9 100644 GIT binary patch delta 96 zcmaDZ{9Kqfz?+$ci-CcIfx*51@I+n>X1D&s8!c8dg6PT57(GGsW+Ns8CNLwFC7+2I esBrRiHVd$T5c^Ds(sdk>U@csnNnkpkvjPCz&LF}7 delta 95 zcmaDZ{9Kqfz?+$ci-CcIfnl%Ul!?3=%zFfF5T zvk<8eC2w}H$RbTs4lv`EVF?eI5oospBJ#)0ksB=H5Og1`c(PKI1;~QUu~FGzVJ%Upv@@g>e7M!xtLY5gsZ;oKz#RX=F^5qDC87*>W zAyOeq-t1tJMVh7@V8$)O5*{!k&~61p&B&n>FIHKV45R73`{4+CxhwZ@tI)SI3W#8&q>Gt)9i^Q06tkrcK`qY diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 5cbad453c2f8698f9ab16791a4e97baef7fa6686..e91ed0ad88c8635e2a9fccb45c289eefa8d2f943 100644 GIT binary patch delta 178 zcmewm^dX2hz?+$ci-CcIfx)x?@I+n>W{>{E8!eO=LGVqUV z3oyB`fEnRzydq#my3}-5FoRJcn-R>&SA5IN3^Z_Zys8CAVDc>050kmo1SZc?vjo$R j)vUp^p1M6)zCb+~OdnGZ2h$1~DPX!?BM(gf(5L_a0Rej=PVz?+$ci-CcIfg!2?@I+n>=EVNP8!e(3nStENQyJ~S^mRse5WQKEDMu2_ zm>|6ktYWjLYy~@5Rej=PVz?+$ci-CcIfuXNt_C#I{=H8Oo8!e(3nStENQyJ|i{uY@0gwYDb-K@xz zBguS4aLVQh(%Trp3{Tk#b}-|JiYhZ$%NunIkP(~JH7p=zBx(9jo}nQy`Jkp3SOK3_ VJV?jn0G$wGP24AT_F%XH2;@6PDf(kU>b6y60`u)%UT%PCQISqYGLm#8eH!)%# zfj}-0n3{)Ml=~TD^Ke&ctB~0a!6nS*X@Fy*K(FrHB?r4$4K`5%dhtvW3~J;M&iL?g zuGb%kqFM)I;5@7ND5j2!b0|!-rgH^mbi*YkWR@%voQrU3oT9SeMA<5!s6-Qb_ zRsY`|u1k+#O}Hcy?lx=Tuaqt$mnET}B}?PT-jOxo>sX1x#-P*f*CIxdw{w&c%e6hGRbHOOI?J1Nx z)Afr^IN9yNPi6HVuHwDm*+?q4cC2Tl5$Az&OapbJDck_mZm)ihp8vQ8oMW^S{^NyS zuVMTV>Y)h@=qB*H;nKuu-m@Vs_OnQ*-H6mqo_QX0Om^_HOM)hdDFERk51o0W;-eWmS_CTZS*^M#=06Y?s7HYvT-{Doii#h z&z7Un`!z=m2e%CuZv=k)CW1HfD#&-2U~8xQCNgfW9%-AaL+a&iupH&>{>dbI-Mg;jd8$#Vtceop~1 Hc&+*$hz#7& delta 1130 zcmX|9X-HII6n$^ryjj$lM$JKI%px0iN3+~UF%wf9sbs)HP(}%Ntj};~>X9!2Sb#ZP~h4bg|sOnfAX8Xkcab|6%Oju!O^AgdWxc6`<0) z!&!N{O%i;B=3_&9==7bVKWO7d#Aj-a85*ck5ZgqFHg20Ehub_84)S>3@#JC}Za3CQ zQHe8sl_2rX@S;{?W+#hXJ6T^`@BrC;&zLfnVaizOHEOILLEuob2cBlCZ5c(mG}~Kj zcBNzP)QXU_-#h0rCq(y5V%&svIr-hs!)6@S-n@JTu#BUo{ISKdC@7poEJ4 zNH7mjKC{aoqpuxQ!o)x<`r1LGfJ&$ud_Z0m^bTnuc*ubI)uCkU86SF%STTGGmre{D zvGyN1hIQUZ8Y1ak8Zn^fJ(`4C(XbZoj>e<5Fd8NF+joqGkZZv_R*X0+V9IzI*8Stx z5fdh;-yvYoWI5_h0tQS~W8FGcg^!KA8EBbQgK0Vkh0bq@8aQkhrUb!d{ksU>%&8%5 zCJRq)nYo4|0%t1`n`bK!^>b8zE#RSfs=u@&`S(5xC764*kdNrNScF))Sb(^>n2l&! rI*<8xOJ=OSmW!~qE?>lYdzt17S8`FGU!f+(x3$9mA#lyF diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar index 081cf1fc5285da28641848b97101a71eb8ae1b58..58afdc537b85c6c7de127b2b27f86ec60a4ed6fd 100644 GIT binary patch delta 415 zcmdn6f^owNM&1B#W)?061`Y;>^!~#Wc{P~R`VVikh-C!PlV>nGg6TVq4q#fIsSL_j zpZtNDfATpdE-+t~S#Odt2M^pRkX~74dyw4bc;2Sm$Pu5GF8#OFRI=h?Ts_3>LAJJquxQDyl#j1}bcP z5Gf;9RxqQ{{24!(k>$RenHlK2$s*nsU;%$`Yl#1PeF8xOlOOs7fN2xoX;8lOMH?SB?9}X-6(-uK- XV0vayDwt*rP5{#>!O39yRB##qES{VV delta 400 zcmdn6f^owNM&1B#W)?061`Y;>n}Sm&@@g>O5S+5nB9?LDZ-L268BIXcOGaZ5rNfj7 z;Ym&Yz|24S91|CatHrE1$(Uo}CrKd72&8#)JaarFm~oJ$j!h6K;`Ly|vLpsZ1_lte znS4-0YVrX_w#^0Hnh*oZP)Ai$<-0NooGGOu%zf3S~;18ka_@{&UYyl9uARq_KzaNkdrhNm8 h!Svz4A~0=W5tz$R_)3l^c6GA#hiM;oXumASAQ)u5xqr*R|mr})EJYs6N%VCG#h~+Zlel+ zOE*riS@InnE+?V4Z<}z**`maX#zns3jz#YlZi*F8E8$#FtCaBAqNMW}WE~zvHAUd` zmmsoQf39Ulpug%^5PdGWvc~?vdV`n5-s(L?Vb6%b)w<_;&<%^f?AKy?v6DXn_~WX< zQCj>!RK&W_5V5ptfViBh+S4C1Bj(HWF-LtjW z@Jt+Oc&?Tm)!JEzUeG-YC$B_a{(i&uor|M6$^R$C-Lhzn zuBz2uGG(G(v3u%Gy<)?xr%c@Ses#I7cl4Y%GkX@#|55imU)xs)dlygELs3hQ>EO4V)P0J@9veOWa>^MStbr8j&9 z7rh|~F8M-txNL1q-xF&)=kZRidvYx+c*#5?z<*hD0|dx+T%K5`8Dp-zB;& z(LW@*Bhg)n{wdKtLN@r9g!iTMfkgk7dj4aD@1;RxKfsR?J){INa{r(}5{Vtijow!D zvC?BWa$21I;Qm7vU!Td-t14$zmsd=!6u0a1M8T~n(NOO%?j1Q~`5vLuBoT15vwg&u zYfbiFeX>^RTm!$iqN<`F%vE8I{8_4$LqZ z5YorM5Ex4!w-Uy|c*r1sW))0;Y#AuC2RG+pYzUYh%`wTG1+Y-&gi|rC2L0BG1t-H2 z7SZmrm;uY-Rm$rM(XfJAn7D-sURL!X#9E;) z6Ddkpf_`hMK7mFl(9-LDh-xHY0yz_fooAh9U~$ZVt{@i|11*Dzg)6;mA3)R|N4XDs zzoIAMBDc_|r#Mt9kP2zcOm~cICIU|f$Fvi-x+SI?i*rj(cd3!NI?Ff2a@_+sHBj*kKfl>d&3l00W6R$OCgZR8SGh-Np@bFIVPZx6HIl8O4vTK`+-e2qh(9 z9+XTmt_JOPZj{(umGp3{gmy`zxUgLc-H|p|CDEiL#)Fb+#?_#mRW=jNUj*|V#g9JP z+!E6U{C`V8yuDp{6Nxv;1Mf_DhI*jf$BkZ&XR?Mip+2rlknC0o9RTi>^l?>^N=ni^ zD5-*KRzhc$-b-9P+o^pQ!VI^}bg0Q}5q_>qvSSy*T;dt(foHa{(sY{1O6^JrI&F4X z=$3{~Jx&e_MW@{khZD~T4?J`pQwhrRQlo57 z)`N!m#{In?K9p_5{PPKXS9PRA5pW`y@M#FZatOr=rw-x9$zXy|H~4Kr6aa4d7UWiIlx)1i|x6-Dme%KTs-$t9F!|+vZ(bN=)yR2sV zMAIhOFolD!+c1;gl(lQUakF%3b$u~JtM7wpY+deyBN!ybV`+PQOS}=k7?0c8y*L5O z7;H+S`uho(+HRF3I$PV@tabe;^QT12;mn*Qe5$SF2?m8S9@rNbutmC_WN@=Dj&F*{77oCf4DJpvlE)0h z8SFVe5GxtsvkZeXE7MT%Q6|=MPF@y1$KY@lPG^vm zZFJt1ZB#|&7*pSvgTLV%Ypx-6ZZ6Jd&%InjSmjWh%APYr@fijMc{q!~fjomEJ|C+e z{qE6r=VMuS`6={X)cWtz6ae|(o1V?KziqX9wTJ@aW|~ldA*S?Jtw#aIikY`8Vn(Z? zH58z#^H9`$+Z#m>YqAzth!Na);j}dYr2zo)e^^^r8n@NX)(|Mc9!eAw?895{aT!iPW}4;bU5L5e6$WZ1VN?f0JJK3;+NC delta 4239 zcmZ`+33yc16+UMsGcU`VEPNOULjpp`!aza@A<2Z02_!N}K$g<7i6PXrfNW8VKw`jP zSxdO!vxc=&6;ue05)6w#L8>CVvQ&W-5fE$>Tc{Okd(M3?Lo(mYeBYb*pL5SS|9{VW z@80*`Tw__e#$p>$Vh#!g2nKkmytc-cWL{WayCZ8dnnyoXE7oB}&D}`hFlF-x)N3m;7+1O4@H<$3xr{)YkjR{H={ez-(n5CbR#F3y#hH;8r zT+UQQxTO=DSr(@rkf?3QM@7_GLRpG9X-yJ!3&KQ`rI5!RCcBtqjbpgN>M|m7*^E>2 z>4d3TjSUmD%W-I{`5}gsWt#2nR(tL!*X5KvjUiL4(lb1A4N7n=>bfPIVv0|iUTz@uTH- zz34BxuGfnybva}0RMd{Eo{iIHWMi<1HHUfnB)Ij!xrxX1)M331Jy%n{vqZ6;!EY}c zQbJ^WxJ2`)1aT{~gE--g5I>hZ<9RLPVvyvV>wI1>bvx%ReQFyAHRzs+1$*@3or|k< z&&CqNQ##V{Tp6`rA9`c-azz&G|HwH#D{As`eQ49KFX*0%r)yAZOCQ>BE}5pq$FEqM zylS3dQ%d!W?Ne{)8MU*RHyC}#=q96EjJ{{| zcSiqU)WoQn(GP_Bz&{!Oi=DR_-C;fdR^UfAi0nV`6QjEvaF-N{p}Vug$c@1YhA0>+ zMovri?A!g3MKodKk5qH#4Sq-%+tcEoz zyaJjE?=kW)+Q?`Vqm@vj!YU9dtc7(dtcMLMyus*AMsIQ47LMD+z7N^=K763UPN-L5 zE4;13JMgXw+hDs2b+AK48`86rFn!jOsndQdwm#6+reK5$OE6M}Kf>$c_R)dX28=>* zh(=pCv29a`=dsV%VYhfN!vH|Y9S;Lx0)c|Z;Srb!d0+z9YQ&BZ|?>@H>iIOkOjfo!}B!Did#<96^cBQ{D49v8$xa^CsrOGFVP=F^~W&sDw$D zP$5WB??I9Rzjq;xQpf54MX~-=bR`S7k_B+Km0*ikFkKjqrSXAOjb&PUIzE8-9fVB4 z*`d<=72UpH%L@8rtX@r4a6%5%K)w%*TB*_ouvGSZA9~bzYw1cF{VJgw$jEM^q=&DP zZ%N6u07`~{TQbw_sn-(koo=6azXvz{GQS4394)>--9h$CpK%lMGzZ`r3d1B1-O)M^ zcxOx#PV}Ad9lx~nBpAu}CtOLrPxPJfJyP=D07}Nec&UV*H$O^}e3T&iRYK3Hkt|GK zw7=g2w1Ned0L-OEuj!%l!<_8P9OjpKGyKU&Zrg)opB`W&DTxZ8qzoog5#&|HkCL9g zN}~NLq1DJp7VW=m-Gk1=928g%S@}Ek=(Wi4&NRmkdnjzN~RfC zgH}vGN_zP!arjk2E3J`SbYBYHk-dDC^dTi_0hG*unN$RM#pYsS`q@^i5N7x#riI-g zZo}K#m)A+WIRSWQL%HOoJ;9loSR~@|P^#~QNBgCv9oI;{-}*ed z=Bd6j9#2Xp1W+>1cn%t1Hy0D)e5zbU+RkSvxj!S{p6+X`2ZYj0e>b?FabhcaERh*>@a*h8;*F*zp(j@oJjdqwmhT*Tm*($*!xt7<m#HuHx^gOSL*s>-SJ(;OrJ-^cQjnvnSwdGIkz8%YZ0lqL^rpjVxf+HPDQsDg=>%X zL8oqR>(er@H=T0Zr?pgmG7XDcWgJgKCu`IurK4R-?2GgDL6R4)9qij8z?P09TEd3u z5ma}ij^g^E;Uk?xxE_tV*BH>60GTuGb9Mkq+rgPnTgXS zxRQyFOHh)9b0j#DWejC!V} + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Häder */ -public interface Billable extends Serializable { +public interface BillableReceipt extends Serializable { /** * Getter for when this receipt has been created in database diff --git a/src/org/mxchange/jfinancials/model/receipt/Receipt.java b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java similarity index 94% rename from src/org/mxchange/jfinancials/model/receipt/Receipt.java rename to src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java index e3d1057..34fdc9c 100644 --- a/src/org/mxchange/jfinancials/model/receipt/Receipt.java +++ b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ import org.mxchange.jusercore.model.user.User; name = "receipts" ) @SuppressWarnings ("PersistenceUnitPresent") -public class Receipt implements Billable { +public class FinancialReceipt implements BillableReceipt { /** * Serial number @@ -97,7 +97,7 @@ public class Receipt implements Billable { /** * Default constructor */ - public Receipt () { + public FinancialReceipt () { } /** @@ -107,7 +107,7 @@ public class Receipt implements Billable { * @param receiptSeller Seller instance * @param receiptUser User instance */ - public Receipt (final PaymentType receiptPaymentType, final BusinessContact receiptSeller, final User receiptUser) { + public FinancialReceipt (final PaymentType receiptPaymentType, final BusinessContact receiptSeller, final User receiptUser) { // Call other constructor first this(); @@ -128,7 +128,7 @@ public class Receipt implements Billable { return false; } - final Billable receipt = (Billable) object; + final BillableReceipt receipt = (BillableReceipt) object; if (!Objects.equals(this.getReceiptId(), receipt.getReceiptId())) { return false; diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java index 6f066e7..8dbbfa5 100644 --- a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java +++ b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,8 @@ package org.mxchange.jfinancials.model.receipt.entry; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jfinancials.model.receipt.Billable; import org.mxchange.jproduct.model.product.Product; +import org.mxchange.jfinancials.model.receipt.BillableReceipt; /** * An interface for receipt entries @@ -61,14 +61,14 @@ public interface BillableReceiptEntry extends Serializable { *

* @return Receipt instance */ - Billable getEntryReceipt (); + BillableReceipt getEntryReceipt (); /** * Setter for receipt instance *

* @param entryReceipt Receipt instance */ - void setEntryReceipt (final Billable entryReceipt); + void setEntryReceipt (final BillableReceipt entryReceipt); /** * Getter for linked product diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java index db4ee70..6fb49b9 100644 --- a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java +++ b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,10 +33,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jfinancials.model.receipt.Billable; -import org.mxchange.jfinancials.model.receipt.Receipt; +import org.mxchange.jfinancials.model.receipt.FinancialReceipt; import org.mxchange.jproduct.model.product.GenericProduct; import org.mxchange.jproduct.model.product.Product; +import org.mxchange.jfinancials.model.receipt.BillableReceipt; /** * A class for entryReceipt entries @@ -102,8 +102,8 @@ public class ReceiptEntry implements BillableReceiptEntry { * Connected entryReceipt entry */ @JoinColumn (name = "entry_receipt_id", referencedColumnName = "receipt_id", nullable = false, updatable = false, unique = true) - @OneToOne (targetEntity = Receipt.class, cascade = CascadeType.REFRESH, optional = false) - private Billable entryReceipt; + @OneToOne (targetEntity = FinancialReceipt.class, cascade = CascadeType.REFRESH, optional = false) + private BillableReceipt entryReceipt; /** * Default constructor @@ -117,9 +117,9 @@ public class ReceiptEntry implements BillableReceiptEntry { * @param entryProduct Product instance * @param entryProductPrice Product price (copied) * @param entryProductQuantity Product quantity - * @param entryReceipt Receipt instance + * @param entryReceipt FinancialReceipt instance */ - public ReceiptEntry (final Product entryProduct, final Float entryProductPrice, final Long entryProductQuantity, final Billable entryReceipt) { + public ReceiptEntry (final Product entryProduct, final Float entryProductPrice, final Long entryProductQuantity, final BillableReceipt entryReceipt) { this.entryProduct = entryProduct; this.entryProductPrice = entryProductPrice; this.entryProductQuantity = entryProductQuantity; @@ -206,12 +206,12 @@ public class ReceiptEntry implements BillableReceiptEntry { } @Override - public Billable getEntryReceipt () { + public BillableReceipt getEntryReceipt () { return this.entryReceipt; } @Override - public void setEntryReceipt (final Billable entryReceipt) { + public void setEntryReceipt (final BillableReceipt entryReceipt) { this.entryReceipt = entryReceipt; } -- 2.39.5