From 821c6bd2e5d4e67533bf1162b7d7d069bb8942d8 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 10 Oct 2015 22:02:39 +0200 Subject: [PATCH] Rewrite: - introduced jcountry-core which is a library for handling country-related data, e.g. dial prefix, country code ... - introduced jphone-core which is a library for handling phone, fax and cell phone numbers - these both new libraries required a rewrite of many parts --- .gitignore | 8 +- lib/jcontacts-core.jar | Bin 18101 -> 19800 bytes lib/jcountry-core.jar | Bin 0 -> 5394 bytes lib/jphone-core.jar | Bin 0 -> 14657 bytes nbproject/build-impl.xml | 2832 ++++++++--------- nbproject/project.properties | 6 + nbproject/project.xml | 30 +- .../basicdata/BusinessBasicData.java | 27 +- .../basicdata/CompanyBasicData.java | 32 +- .../employee/CompanyEmployee.java | 4 +- 10 files changed, 1480 insertions(+), 1459 deletions(-) create mode 100644 lib/jcountry-core.jar create mode 100644 lib/jphone-core.jar diff --git a/.gitignore b/.gitignore index 315ea15..0383bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ -/dist/ +/nbproject/private/ +/nbproject/*~ +/manifest.mf /build/ -/nbproject/private/ \ No newline at end of file +/dist/ +/data/* +/*.properties diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 98ca617007e9f5e8090f6843513e80bec85acfa1..855385dcf75d9ff7c6acb19cddb65dde39bd5bc0 100644 GIT binary patch literal 19800 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 Ov)fz@!S#Jy#{U5Yz|DUE delta 5439 zcmcgwdw5jU5&zBZCU&jPrtE=3F@XGwj8ALwjU6rV##MfA942U}(@?Krys_N1)u59j`rZytCueft~972Geuj%`emJK37U*x$vEc@<|c@`V|9Dy%C%Q?EDjP9r1!GI zIOw@IUT0n7f;FbKp0hE9WSkh7+_PJoN})KwLr6rt;z=;u$yPfBsY;)Q0g9(v{TWvO zKnzm)Obk|hh}EBE^=Dh{9IKscwezfYe#lY`wG_iJTp1dH0>uk4Qt<#rDPDwP#YbE7 zO00RMR=dn(*oj)^F z@5dMLPaj6$Eg^3UIj7+rFW&Vd2JiW~{eBz+f8USu_`r{U;X`TuTRQ$D(nliwSET=m zbU~z#MY<@`Cn8-E=~I@7BPt*g$t99IB%(*e7?EN{(nR8oR6stF{36APq>B_UQi4W_ z8YPLCEXrg*CQu4D85gBenh@3eh~uFFLehm~2pK43kdRE@T&9CX93mu3NVbq1A-O{G zgyahuDrA^O!!;V=r2;=1sF0IFBgJ{Z$7GZMD)Lh?jn=3{qf#SrO29Z3_ndL0Za`(y zqVN%z*RIY0A+{~pzNB-ho7ZbG!Lvx61#kQ6wzdTe+k&EoaUuRxZrq~FyPu$2t$B<1 zbjTo=(V95H=j~Y0xvZmoL7TBLaYmf~+68MYKRt7jQYl_nr!TB>rR2IO$=Kyhu-pbVQ_wM0!}H`|)!f z58y!^-PxktBg$XmfR4xUgpNOmbOKKh0!DIqjxl>k<@{&xEW^XS8dd5vP9{x5tB$Wq zD076&7qSqGbhL@offYJBMOq`|7OdCt9o(wpc4^)r1XN3Gkr)o*qUASAL8l7sXu4iS|)f7tNgMSU5`Y*1+EPSmAvsq>otews~WPs{* zOYa=aorQVfA&k))lE@Pl@X%|x&BNw%ld)T!!{EkZ?hJDK+8~x-DUVa;mWie75V~HB zx+GF-N`%YhGN#@1>ykV~SiOPel`?k*3ttN2%UBhTqa!?nlh)tpYBK~Cj0+*&Jl2?O zhS6))Livq8gE{}!*odsHHHWxlFa94(H}$c^o7Ws0f}|+Ity+nj%?Q59V>q-BzQxdZ z-7WJG8QLILza5U3cZD@10^e=nUfwSKdmFzShR++RfA<~X$-Kj?-gL&&C+D*4#-`jM zS>gTh{iK1i4|&;(c}^D$rdy0PdBa0LU|l+258z|!!Cv^V4+(tMQu(NDWo>}9KpK9C zA2AonOq58HUYF9zlDU=TZDN^q70iiwOkh7~4+}1cE5Dj>kc}Qv<}-A2lx3gfG>8SG zBENZtOvr}D^f^X&jLU%I$l<3%9zP_;@);h7my{8SAADnmF;-(ce#};W!rBGEE@49TJaA)f^YMAImes+9X{>v z@{+$7;dDc<(+!qWk_UuXqNN1o z!=7$_PFl0a^KeOHY+%$rl-O2`QV~OG5pl=%qKuVirSi;=V9Qo7l2BkTN=+!2kqmT1 z!q09eB&BvFS&Sq*3KD)`DX6?71+CXY=_?=ni|n zyc&{&a(fPn9Fg!<<%Fc%j--r{lt)2gUIQezu9btMBhm^kXTQ?X^Iksoa_laR$WZxG z=ag#MPhAv0=8ZyfEnAp-SDgbMV-L8&(Jf!+{Q?g0{u^VDcnTwFjDp0xs7UU32P9+d zNSYmyaBW~sHc|`CJ!9rz8hdVy;@Q0a2nQW=P-*u(!_o7hC^@LK=U^rynH2?zd9RWb zQw}-s*pbY0M8ZXwHMyzJ)4*d#vY3$sqaZPFZ<5kXj2Z1C(<4scGDpW;!C8*`_#J2W z+s=MFqWCo{0g}Sfo&h<5ZhHz=IU?bT)Cq~(j${oZSsMk3S#=P&sx)mG>jRM|aGj&) zU*Xp>+Bg)5Jb~-k&xR;|%!`=t8@?X<-vCwifNyhjdknwr7qFbbDtp9tGLnr^keG!K z;dl6bKVxjG+HPwz+vt? zEyS|b`#_ToRBO-Y4o4*X`r?G7){bN+Be_2c60`0jc~voO86OlyZlH%8J@Y$_j5dmk zBR9|^?58`5AG3ladE2r_%mLTi1K#WCmfzC)1w4Tlz1|-20Y>t86eRqj#70Qoio}@V z8vPaZ(8%QC1#}phbOc%SGy-%KZ3~LQXhE(k7CL`xa(U#DBY#cVdL4gP{0;Tun8w!6@>G5!e3R>1Q|R+yspmq;hkp4u*mJ&Si%$u+ zPu}lQp9?27RmnF-V_nk()jr%*qWF2%%V)--=1Gd*(A=!}lg-l=PieU-q3>r#V|mNe zTv7G;jKx61zx!^<@OIVa8Fl_-V^@o=%w$d->}np_RXf@UPEApo8(A}POjm8S@xoMd j%xTt~tnaEFWOPq1PH%0A;k^U?;1-WWeuvpKNm`!)iezsq diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..ed08999183499faff1992f30a52fc7c2576ad80a GIT binary patch literal 5394 zcmeHLTW=dh6h7l5zHIC^x28>cNqV7mnkG&tl-|K{lj1fvnl#WtF&lf5Y`fWY*Xt_j z3lt$CKtf3HzzaN}3V1-`qS8tr0ne3q>>uDA_y>h^X2;(3W^M9EDI_Ds(D6 zot+q;n;)KU2bIy{n4(uSueT~zZcydV4U;fdj62_<83)#inv zv30^9A0EjaJ2s>lHn$8_A6gt4?N82FYF_948Ph77mTIHwfrOG!T!#M1G$TXPT29qR zBqU;WEx)1~%e(=!+Yh~-H_L`?tv8U_Sy!f@+Nw`*E%)9B(I#9K{3ja=W}K0S^SW9p zJ$(GbPY6E>eG%9df!z_I2$1Sw3c3WN4d6)r%5dP6`VM{Z^ z4AKICbr>R|jzUb-3bcwk4j6X$d<$$9b(?Ir%XWuscgl8`Y;Tk8ZrCp5c0dn~$er~vJ zLXW_zg0&F=GXlj3+(b*3gt=rsyqrCU7Q4V8kui;uts3@%s+T$1Eb->8YswIVSl)?m z3Z6Dk6w2`GxrBK~TjdK{NkjXm4a2lWIxI2h7Vx!Hk#cXz=0={UvIX>{eE|>7bAw|d zjH#Db$rqaqbroGnk>qk3vJ30nShiPa<+~U}jk2zjOHdmZCRQ$zOJN6t zRw?GhaEE7B)kyCN7=27FX?YwxY8ENst2+8}g+Ly28jTb}9%VzjSr#pZMv#aNq25yw z)hR*b3h2YRqDT>>M`5sC0yf5aZ$(rUIl?Q8o-7|$BfhPI)-W&RFfovRT20yS$;s_r zQ^<_mQ4udv?#|If8SJVI5}XJ+J$fp6fI)vnlUB+(lXm8tv#Pl#d|ER!`z*$9lJZ8g zvqD=ZHG@x=R~NZ8@2p^lFz14bk&i1XJDcql4c#s|xw-hlmHgLsCXAZZqH6JZlfj|Q z5IQxGWe|}DVsKy+b3p$8Z-DN$`k&qaYt9MI4klJSHm5Bcs$I4)rYuj;NXTZqz$29r zPDc@OdNYz|(SvGs=C+KJ>&5Ql?9M@1cpNjny-w~|324f!c(4&vYV*Aa%~NqW0Vm^l zEPM*X!QIL)8>Mm)&(E0kXK<4c`^NZMo{RK~=ecRq?yn;H*SS4Rie}<~yKWrz!+|&q zQZY=$2o=ZRnN6K2;&2Ye864bPrf6{f5QkUS?ywiP+pTy4h(jB`()2<*bl~RGNjn3+ zq=bk$ws&BAA8y}tW}p+pPCTdVD#32plZ8I$zlv)1Q4yj^O8kCoJ%RTJ>46kDL;^`i zVBjhoMhF^23iQ+pglL2#Brt>z&}0o@sR|5@Dq(wSwKb8pQGz|`3?HJ^mDnJvPkX4! zx#40p;Beg0+l~-)9xP9xp;A~gtXmF00QN23gy1xmVbQr4&ftCA0l-;!7F!ISgEW@4 z!uKHbjZat&6dr?&6h4bXg=nb5gWp5Q9a<5+OL)v&78<%8lpLO@Id);>aaCPS0;T*2 zO;R|9ZWTh_GBKIKdpHwk$QWxN2m566jVgIDcIH_A6 zBH=2Lu=HaFlQ0!PB;qG>JCMjU%mfjM_=&uZMBb=F#0d}vvw=jSej;xL5_ut*NYqc{ z9VGH@9U@NPF}M^+B<3gbejt&#U?MR;kq?o`M|Freq0L}Ekci?Z@^K)M%fUnxKao$6 z$ftFPILU*-0=yXDBdvZSp9KGw_WvOv88*F^oQ$m5jNbEp>c;cKAEo7syj)YVk~vlhzZ)ds(( zsjhyxaz1joqCuazNPw=pcLuSnih4eJH5!~gLpc`>{wvI-`# zQTj~fTqN3yi92||ZKQ)fTe&)>>*}B*$cB0NKVwx?-M#a6V@2{HG@yhU9FGM eyunix^t{I_@wsgFVoR8$qxd_7{`jbaT7Lrx@v2+^ literal 0 HcmV?d00001 diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..480f9f8edebf04e4b9fe061fdeb991e5fe3849ea GIT binary patch literal 14657 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 I(i8mczs@C64FCWD literal 0 HcmV?d00001 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index d484d51..07687a8 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -18,1421 +18,1421 @@ 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 f3912e3..4a7545d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -31,12 +31,16 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.jcontacts-core.jar=lib/jcontacts-core.jar +file.reference.jcountry-core.jar=lib/jcountry-core.jar +file.reference.jphone-core.jar=lib/jphone-core.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcontacts-core.jar}:\ + ${file.reference.jcountry-core.jar}:\ + ${file.reference.jphone-core.jar}:\ ${libs.jpa20-persistence.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation @@ -90,5 +94,7 @@ run.test.classpath=\ ${build.test.classes.dir} source.encoding=UTF-8 source.reference.jcontacts-core.jar=../jcontacts-core/src/ +source.reference.jcountry-core.jar=../jcountry-code/src/ +source.reference.jphone-core.jar=../jphone-core/src/ src.dir=src test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 9f0dd7e..e4f71b9 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,18 +1,18 @@ - org.netbeans.modules.java.j2seproject - - - jcontacts-business-core - - - - - - - - - .\lib\nblibraries.properties - - + org.netbeans.modules.java.j2seproject + + + jcontacts-business-core + + + + + + + + + .\lib\nblibraries.properties + + diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java index d0c2ff6..8964563 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java @@ -17,7 +17,10 @@ package org.mxchange.jcontactsbusiness.basicdata; import java.io.Serializable; +import java.util.List; import org.mxchange.jcontactsbusiness.logo.BusinessLogo; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; /** * A POJI for basic business data @@ -69,18 +72,18 @@ public interface BusinessBasicData extends Serializable { public void setCompanyEmailAddress (final String companyEmailAddress); /** - * Getter for fax number + * Getter for list of fax number *

- * @return Fax number + * @return Fax numbers */ - public String getCompanyFaxNumber (); + public List getCompanyFaxNumberList (); /** - * Setter for fax number + * Setter for list of fax number *

- * @param companyFaxNumber Fax number + * @param companyFaxNumber Fax numbers */ - public void setCompanyFaxNumber (final String companyFaxNumber); + public void setCompanyFaxNumberList (final List companyFaxNumber); /** * Getter for legal status @@ -125,18 +128,18 @@ public interface BusinessBasicData extends Serializable { public void setCompanyName (final String companyName); /** - * Getter for phone number + * Getter for list of phone number *

- * @return Phone number + * @return Phone numbers */ - public String getCompanyPhoneNumber (); + public List getCompanyPhoneNumber (); /** - * Setter for phone number + * Setter for list of phone number *

- * @param companyPhoneNumber Phone number + * @param companyPhoneNumber Phone numbers */ - public void setCompanyPhoneNumber (final String companyPhoneNumber); + public void setCompanyPhoneNumber (final List companyPhoneNumber); /** * Getter for tax number diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java index 5d0d8b9..a816142 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java @@ -16,6 +16,7 @@ */ package org.mxchange.jcontactsbusiness.basicdata; +import java.util.List; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,10 +25,15 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.Lob; +import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; import org.mxchange.jcontactsbusiness.logo.BusinessLogo; import org.mxchange.jcontactsbusiness.logo.CompanyLogo; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.fax.FaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; /** * A POJO for basic company data @@ -59,7 +65,7 @@ public class CompanyBasicData implements BusinessBasicData, Comparable companyPhoneNumber; /** - * Company's main fax number: +ccxxxxxxxxxx + * Company's main fax numbers: +ccxxxxxxxxxx */ - @Column (name = "company_fax_number", length = 20) - private String companyFaxNumber; + @JoinColumn (name = "company_fax_number_id") + @OneToMany(targetEntity = FaxNumber.class) + private List companyFaxNumberList; /** * Company's main email address (example: info@company.com) @@ -146,13 +154,13 @@ public class CompanyBasicData implements BusinessBasicData, Comparable getCompanyFaxNumberList () { + return this.companyFaxNumberList; } @Override - public void setCompanyFaxNumber (final String companyFaxNumber) { - this.companyFaxNumber = companyFaxNumber; + public void setCompanyFaxNumberList (final List companyFaxNumberList) { + this.companyFaxNumberList = companyFaxNumberList; } @Override @@ -186,12 +194,12 @@ public class CompanyBasicData implements BusinessBasicData, Comparable getCompanyPhoneNumber () { return this.companyPhoneNumber; } @Override - public void setCompanyPhoneNumber (final String companyPhoneNumber) { + public void setCompanyPhoneNumber (final List companyPhoneNumber) { this.companyPhoneNumber = companyPhoneNumber; } diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index 86d83d8..b1fe993 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -90,8 +90,8 @@ public class CompanyEmployee implements Employee, Comparable { /** * Employee's personal data */ - @JoinColumn (name = "employee_personal_id", nullable = false, updatable = false) - @OneToOne (optional = false, targetEntity = UserContact.class) + @JoinColumn (name = "employee_personal_data_id", nullable = false, updatable = false) + @OneToOne (targetEntity = UserContact.class, optional = false) private Contact employeePersonalData; /** -- 2.39.5