From de57378869c960c648bf72f4d83f52f5663b22c0 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 21 Oct 2015 10:56:13 +0200 Subject: [PATCH] =?utf8?q?No=20more=20list=20for=20multiple=20company=20ma?= =?utf8?q?in=20numbers,=20only=20one=20is=20fine=20Signed-off-by:Roland=20?= =?utf8?q?H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jphone-core.jar | Bin 22986 -> 23037 bytes .../basicdata/BusinessBasicData.java | 13 +++++------ .../basicdata/CompanyBasicData.java | 22 ++++++++---------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index a6242e313134c45ad52f4d3c69d2552097c7f611..a5d222b5e458841311e097be654fba5408b3bc86 100644 GIT binary patch delta 1756 zcmZ8hNlaTu82;uN{A^?U;l$VlCv_4aBtS4EWGRpYunW||k!!Gl1~pVkU^cMOm<lQA~WZ5DsuxmO0xo!wVI zQnjO^>~LB6=|hKCZWkH&mIq!T{@cR^Eh0W4J4lU?Z;}QfACg)j3#8|T?3S8@ydza{ zss1G;BpX{a{&r{m#W4pkMtd{EFWs=fi6Jw#Vwg{txH=+Z)WVdpEM#KLf^l5t>I7FO zWK5bcWkD8_e8aQ}GbYUPpgA5iFJnQ*qKqZ_XLYd}Fh(-SC=D5os^43_kPOnLa`i2n zpBS!SnQqvdv#wgvfNNH~j5g}XFQsRc3UXb&sg%j&D81*}9dmN6Ye_b6XKZi;Q_If>^NP z6gsUqjV_v9*+drAXnvcK!F9Ll30w_mWN>h}&Lbq?dX;GsF5opGyYVcO9IhVbE$nBg zCQ=JMT)D+bVizdIhgSRw;8*CU!6Ld=vYYxm*VUO)hSfLT3#w8P*9srlf1DU*FiSUz z{WdG2h{%|;vZl>bV`YRas2!E@RJrcW?mj6uj%EV|-u>)QJ_4*Y<+SU# zgN|1#?bmn<24xJHFl=GhV9d=)F_+=Zk>6yllQY-Ifp=n(uO@j*ruf7t?8G#mW;lZx zjh$369#o&HX=JojyK0l#mDcOFN`@s|p{vc+v^*dim#qxdtLo9fqf7z3iw1((>Dx4- ziGj<(k0UH@grqYVer1j*yYgu4DqPX zMvmye5&A*opzu75cn;iSM<@E?zVHbmISuK*Mwtur%5_5TNI`he#qBaAb(rqt=j(OR*z(t zM9Q@ibLmqj>T>PV<%;o5KI)5Vd5%Rr(!1Q`qPIgUDQfYyTIk1S#`D+~k*71}k@mXNF1zC9E|KePo1xf206uDTxe~cz z!^W;0y40ox>pmJ?@PoWmF#mTv;?P@d9%*N>Fe?YV^zmkn^fLsG>2kbZB7)aSw$ntr zRaB>YKDyvQH4FBM*Ys1ncFRZY9_fc5GuP5khlXosheuisF%!qNkbcyWZCs4-JpTi( CVW;c> delta 1861 zcmaJ?YfM~46#nM!axYx&?y_~+wQQujEK&js1=%9uVSplA7l~wf3tA{rpin5Vv_Q-I z)t1VmV}ecmWonveQWNhVV@y-yAEPm`Y15e4A3kFJVN{HN^hXnCX4f@W44cfHIp?0o zobQ}D`&cKR>%`JfXELimB2ad{aodt@FTLIvtoR`N`?CP}a?oGHuI*QfJjE9E*jR6O zr1!PF>ZwvsVSY(|!HMGHyn*3J@7Qqn(Du#4Chp_zAwmAg=7gq`BZ4-NazQsqt)O3% zNOYMa(0HZGYV!CF{dIK^W0z|5sQgf;!4X*i7Mqs^)fkZ zCR23RQ=xyMekSQ}TB?YA8CM9ZX<<_?t+2W*8eT?+f^`kGxJvVFC&}yjwk=;FMf8p{ zt5ySH$R(i))r^`j%ytPQ0#6B}c#7l7Bx6i3a~$J{#14jP=*6yMk^tl4!G2=lVEpyx zP0u4M@QD7NRzp?)hW@EL#Y{gcIIUNBx`_U^H-pGaSSBc@-NZ|89ZbFEQ{)v5A*@o1 zFHF|-E?=w6?)gn=7E2>~&sqcl`ea$Lh?bwTK&(7kXQn?GumJ%Z-3=Y4T{%f~qs_sA z?^#okis2-d#R%Wd@@2jyI%(H>4cPnV)7kBy)UYo$0^= z-xhgevhH+XS;2~eRRwDTmh$o->rp*eS5N4GH=wK4cFA-JmuY%UwR}ZGJ=XP8HMd7UPF);M1& diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java index 7cb16a8..9286df0 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/BusinessBasicData.java @@ -17,7 +17,6 @@ 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; @@ -76,14 +75,14 @@ public interface BusinessBasicData extends Serializable { *

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

* @param companyFaxNumber Fax numbers */ - void setCompanyFaxNumberList (final List companyFaxNumber); + void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber); /** * Getter for legal status @@ -132,14 +131,14 @@ public interface BusinessBasicData extends Serializable { *

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

* @param companyPhoneNumber Phone numbers */ - void setCompanyPhoneNumber (final List companyPhoneNumber); + void setCompanyPhoneNumber (final DialableLandLineNumber companyPhoneNumber); /** * Getter for tax number @@ -170,8 +169,8 @@ public interface BusinessBasicData extends Serializable { void setCompanyWebsiteUrl (final String companyWebsiteUrl); @Override - boolean equals (final Object object); + boolean equals (final Object object); @Override - int hashCode (); + int hashCode (); } diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java index 3444b3e..c44743e 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java @@ -16,7 +16,6 @@ */ package org.mxchange.jcontactsbusiness.basicdata; -import java.util.List; import java.util.Objects; import javax.persistence.Basic; import javax.persistence.CascadeType; @@ -28,7 +27,6 @@ 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; @@ -77,8 +75,8 @@ public class CompanyBasicData implements BusinessBasicData, Comparable companyFaxNumberList; + @OneToOne (targetEntity = FaxNumber.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private DialableFaxNumber companyFaxNumber; /** * Legal status of company (example: "Inc.", "GmbH") @@ -105,8 +103,8 @@ public class CompanyBasicData implements BusinessBasicData, Comparable companyPhoneNumber; + @OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private DialableLandLineNumber companyPhoneNumber; /** * Tax number @@ -177,13 +175,13 @@ public class CompanyBasicData implements BusinessBasicData, Comparable getCompanyFaxNumberList () { - return this.companyFaxNumberList; + public DialableFaxNumber getCompanyFaxNumber () { + return this.companyFaxNumber; } @Override - public void setCompanyFaxNumberList (final List companyFaxNumberList) { - this.companyFaxNumberList = companyFaxNumberList; + public void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber) { + this.companyFaxNumber = companyFaxNumber; } @Override @@ -217,12 +215,12 @@ public class CompanyBasicData implements BusinessBasicData, Comparable getCompanyPhoneNumber () { + public DialableLandLineNumber getCompanyPhoneNumber () { return this.companyPhoneNumber; } @Override - public void setCompanyPhoneNumber (final List companyPhoneNumber) { + public void setCompanyPhoneNumber (final DialableLandLineNumber companyPhoneNumber) { this.companyPhoneNumber = companyPhoneNumber; } -- 2.39.5