From 79394dcc1aab9ce816b14f389cf4d7f952d98f87 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 13 Oct 2015 15:01:23 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20equals()/hashCode()=20f?= =?utf8?q?or=20easy=20comparison=20-=20updated=20jar(s)=20Signed-off-by:Ro?= =?utf8?q?land=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcontacts-core.jar | Bin 20682 -> 20850 bytes lib/jcountry-core.jar | Bin 5642 -> 6200 bytes lib/jphone-core.jar | Bin 19390 -> 22795 bytes .../jcontactsbusiness/BusinessContact.java | 6 +++ .../jcontactsbusiness/CompanyContact.java | 21 ++++++++ .../basicdata/BusinessBasicData.java | 6 +++ .../basicdata/CompanyBasicData.java | 31 +++++++++++ .../branch/BranchOffice.java | 6 +++ .../branch/CompanyBranchOffice.java | 48 +++++++++++++++++ .../department/CompanyDepartment.java | 28 ++++++++++ .../department/Department.java | 6 +++ .../employee/CompanyEmployee.java | 50 ++++++++++++++++++ .../jcontactsbusiness/employee/Employee.java | 21 ++++++++ .../headquarters/CompanyHeadQuartersData.java | 43 +++++++++++++++ .../headquarters/HeadQuartersData.java | 6 +++ .../jobposition/EmployeePosition.java | 24 +++++++++ .../jobposition/JobPosition.java | 6 +++ .../jcontactsbusiness/logo/BusinessLogo.java | 6 +++ .../jcontactsbusiness/logo/CompanyLogo.java | 21 ++++++++ 19 files changed, 329 insertions(+) diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 680b3d15b6eb6b3dff401aa9542f41578fb194ee..a135b3e153b7ed6f0b5f5d406f2306092bbb2e73 100644 GIT binary patch delta 2827 zcmaKudu&w46~@1_56|x1y9OISz^}Ez*o$A+_WFhK`Uzf}^{!uldE> zHa#4h9X?Xp`ec1>MOkfG`JtNH3)c$mYRN}F-Tm9II$21Sy5CRrx_^;cbpJ60lXyOq zb))q9FZgEaS0c%?US7=>>&k{EVly-E-hcf~zG(nqfewLAf$j0*w)YccAT4i|Ycw`9 z+BS7$m|*vB>XfzaIVz0baQmskL1;xA!2MQiV-JLOZfyvyc(~BOH!D9+_XFwjp3yvi z*gyv*x=}!@RI^$&NrIAHw8nswQVbradQeEI2BlHDL2GH98fK`8Or^4v%2p~zDW6ig zO64iFUa1XAGJqc_SYzJmx&+KfS}zb?V-K$Ue2E# z`%Ky|Z~K0beZa&&@jx|qOge~jCccmBf)1H9NHIC*&W!&mH<&;-6)s&88%0xQl$d?Ka(?2i8=o znIek@H2*2{{mc(&o=|M@1E~Fk zi~Y`{%ttgo$9!D#Uo$_!{3P>sI;Gix62J3lW^>y1a*0I?%!AIe%%0b*sMMktwCz-> z-+7MtdClX@zoGdZ<}Wh8sCh$~MVB;REb}{GX1=8P&&tZ3ukh$qJxa1H`krjDg3jyA z;+kD#_9MOW50>Bg2J@SmZz#9uEzL*E{m!2=e@FAzn7^m_XUu=e`~%IaD^8^T1{w4r zvgx-dqK{BZzr$Agy?ni*&v~1p`H4)b?4ZBMy_G%+%BLy|tTaB5fE!nEm3vkM{DhCH ziwM`a|1Ps??$wpN2J-Dn|Gc-EPdlk~HnNjL_fGV3-@qh+t@~$4kc(Yw;ob*ZGZ}h_ z^W>Sqc{Q~2EY6a-m%NIdU0D`honKt~kV~NYRkG`;=@IMr>7misq)har%7sAI{8!y@ zpwB=*b_kRR>@?uRE&~JD?ZF=G^xiBaYGjJF~2999ZfCopFml3se zRH-r59CIPhg>kiPLXD5Ru)&2%C8u1-ci{xfWSkV37MLN3ozZZ#dmt)%lLPU=s*6-- z8_Or8bRCPGidj$0j!jsdv%}M|*{SI*1RCPs2*KMw8ygyr#7^vp9iABG{R_;-(`rIw ze*&lEU~OQ-mjq6mcoI(uJZ)kQ&#;AwFJs=s0#2Fe#CG|^+Wz38i3&U`@SKS=IBRmj zecr@I6e#r-6NT`b*u)uu#L%|r)@^-E z+0>)RTMc1qm#c#7L`d(WLrw(O$&R4U)6V-*@1QWcH+uBC z-j&JdnatTU?*`^&Z)0eLW8Q4As}_M)7ur-NZ}spiuHA(YzatG57DL@g8AS}NRhC@b zy=YOGD|{GS;lt?lpb!0Sw&Dcd=~B6yf&l}&u}5HU{6S-os96S^&p2Y!)A{mdRaK&6 zVtA4>i#iFMV)D)A(~f-t6|%nNZ|?m9T;&hqkhEHBS_VzTa9Ci-RGDt#C^+R({+p0p zW0T{D4&}jyBkq zi;X6AJW`QPh5Z4WI|Mch)N>s|(;ardMF*yVjf0%aglzslSCpogL;eg^nh1^Bv}r{Q z4-jjpahi~Jep~HPET>E6UC2Buh@;s>n|?l z?;XB>h3|hp>K>YKzqBai-=kY{mCd7%FFv;AD{OoowJ$l*ovjTYFUJpUmln?iwBbTv zjr_RV)W(mF3m+L3MM;%kk|#$H+5ldk`?-kwa`LWjH@&6j1JS@KFxT0$hER{RIV C3LYE) delta 2744 zcmZ9Oe^6Xk70174+2!uOeb6L8C~OEnlE8xi3j_#-U4Fxo0Lv2c3-WVAC?NqtfwW0Y zrL>LCRB99NR7X3bk|t)xI!)SDtNo+uXlJxzomM;3I%B6A9cOgfv8~f-tlD_aCBY#( zv*&)#=bm%lefQoydq28JuP#zbtUJkV0bbzp#hwc(PRgZ=J(2JW&h;q(Qx{sJd9^84 z+w@3$cI0ST>zVqz%JRDMibJ)vWn+`GBh!=d@e5aqk|g(yT+{s1kw&klD$@>7y=l)= zi)r7aa0>TFE?rB_T;QiJ==H8pdPJdJp+ljQpoULQooN{#*FVW9OFZp*Dp?=#JxH4p z@Aw?r1VSrM%!RfU6OXh8Wnx+ukmLP`~LmzY(G zR(olU1rMcJ?5F!tMCle~&{~T!>27heq$68YK-4->Iil8!$`zF-DqmEAs12evirOTq zP*l;JNJnI`s1i||MU{#w6ICuMD5^qKrKl=JTNG7`tPxmap^0k6&9Z1K)rm1~K;Gvb zG4)~^#Dv6z#Wec#NxQO4(Kbcfz0_@?nR?_sdu6<+k4>Kp8ndXMb|@N9v{R>VD@pvv zzUrgu#P`;Il$>}b=W$BiW#dP*ThShy_R^qk$o-3Z$fkXIL*5T^_S^UbH^tnr=>VRz z@jPBobkL?lbXfP-r6s)i9m({Hjusu?P$1`xvY;pcAFabGT8}kUfK1+ChYHb1Mf!I| zN2pZ4QJkT>9miA2+f=2gI8#6A1gX~WH<>pu4>9kgX2T8?JDv_^ohEj%I7r)>hdq7F zVuqEJ1o{1B+><4aXOQ`j;R)sk4Zp#BnE6q|Lz{zi%<%cmj%R}Tq~WhHpEleobvzF+ zKW%ulG)NB_u9-i={87W-V*W+L*OfV*1?Eo}ez+`17Yx75{Hx5rX87NjKW%tDmxTP z6$UKiVyA^&*zLz2?Db<1Lt^$>9JpWMfENc94p}%1u0cmIY{8GCGRlag-YaTU%rP(W zy%>|UC?REF zHa>i!H$Js9eq?-v=cq89n5m6W@(gAPrFxMH<;{w0RN|Dv{Wc!JX@xU39>nK3*v45r zWaIOgwGly=POBRT&q?sZ3iCD|!J{_U;KyuiLZPU0Hj3cbDCT2;)JR9Py<^9rTho*N zw!|}a&$+B>-X7UfYmMIDu#qf1-;hQ>(@!-#-jT;!wH_(hiUL+ZFY3T`oD;fn4>LkN zd#m97FZ>D(3ZdLj;abN>X%oWS8|2;>^()rAJn2Rhn%p3o(7ZfSlJyx< z6+kAk0x0?T^rNfmyI>~Qi@k2riVJ{jjo_&*_r`h5~t3sQF zc639eYWM4d$+AHiocI|Gl-gg-iGWb6jmXuC^RkLi+Le{qf+b*|G6p z&)DRNk)u6hGkh?PV#LP12-+CMF@@bW#&Ar>+d{tM3MXugV?uwYE%cR|s>JoSXcGNF zS4O@(C)-nje3T&@9t2Q}a^5^QFJwRSN?ttqB}$!GB3sy#?aM&YO{|7np<1CvDnru^ z9-x-HT)fv_J}MirRT{XIc(tAoiO7uUNqKc7%t|(!u_4^5q_h`yVccDk=Z~ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 049ef5f9ea049cecb9bb874ec9b9c5518d6aec4c..7166776ede488c2c9e08be75ae1f7ff182548993 100644 GIT binary patch literal 6200 zcmeHLTXP&o6+W|)cBS=7UR`6!U~gAou1yE(P*^M3spQY zRns%wbI#Y_>F#q*PcL3+YK{}N68+ttyF|XLjhbn0dO0(io1aO4@-fk3UG#4d{Zr4z zI~x$^y9ak&bS^WWo0-lpkIl`@sfK=Cvz^fu&9ZgVcr0~xY`i_5F?=nVidraXDYW6^ zqhk-Z$Fr8EI$Cjba);&5jg7B8a&B~e{A_A)!BPulEtNH`ifO415Qp01?QxG-(1vCZ zGp&vE{u1p{Vr#olQjHC*foNY)^hUv~8jiKoK3qqw zoC|2R!(@8~_lORyD3tJkb47)^b|KE1#s&Zr9w5tf`;mkQ19f;nF1emvP1uh=(yr^<_~wD^`8MF`W!5cIE&3G)JjJ~qJ3YYf9*!u$)w0dl zzKL8|zo8YJ3qz|4wU$)76LMPad>RwV``eGSN zNrjT$+H(6*s7EyEW;(A~m=FE7x?a|z3Mmx9jg?NxW(A?9g$U0m#l*9f+Qc(Xhr}~M za8!Knpu^&sl=V(o?~?UyS?`hcURm#>`-I*R>KD%ef@cEnGxS+7Q0N%S2p!)YC%T63 zzVMSI5#MJZ@aZEk1*Z=9t>7=1fNZ(+1;F{CoMUd>HmR4*&ko;3~IQ4MEBEmt*+ zYx^s=o{f(x)K+k#2D@a^w08>0ZtIw%jA59L2(nm0eL{RYUEx4(JDO3@ z(zznm=ZTOHmo!5|c-D%70EAj?hwB^gjt24w=gT`4jpcJw)AP%@%F5iIELr;H5 z?~|&n7nr13;S8jf;VLx(1q4~{DFPlvc`tO zdupA8N2YEcPAxDgl&T@=_L^(7Ywwy>4~EeR-O!zj2oHlC$eP_5Iy|cz+I)3uU9*(usNqz zB$5AG28JJRRa8q`HWfO35IZk$aF5AxSLoCMh6cm(|3vR?AO5Ek{hmDD%!wVz0J9#N z`_UfR9!E6H>l=pZR4w?jwRdSBWSRK1vSL-TCr%th^CFhmt_?>r>!v4>MBPnCSoEJp zl5%!N_ZkfQz75xkvob{Rgpq98zL>YI9p;T&`4Btn<o}^5IzC+(t z=)r@ab=I~5{uq#T?FpVVWb6k9$i*sB&P8SpS)7w1IHZVa?(NcrGp!oIh77H>d?~eIL zCis6M8evP16i&3fAry zP_pvNkml{ksgb`>OVi!qdlVVL{Zp=td_+xiXlXu!`vYpZ3%MqNJpgo~5@txp+YLoLGDR!-^^?hpleSpnN zKCE~hD^7V@28KdcX+>iBjfw}2dNtIjFVdIlM0`fYgGRj$qu%fliPnikrE@79uR@3% z3KDrMl*rTcOc;?vK_YL1$Pe}*;<~Fs&xR671d04Gl*pIEi6nwV-T{#x?L)*30}8E$ z5@`<-`Ee+b=fa7!2Z{U)M1H;x5jW5%q=pjd2okv)N@P8pNJo&!dm!@5eTcZBOrZi5 zL)OUQAd!2aL^Qe{wnh#IiF^nmzukw38}<|=x{}12ga5HNceYL>A2?d#F!TW>pPM+! zQOFGo9U{tngxVi)*6>Fkbf@%#2-)G1J{A-8az#onovPQw}g)yuX207_nT{Qv*} literal 5642 zcmeHL&vP6{6@I;vcD3V`tY20l*|9fHh$Y+7+8B%zJ0`2u%51D((XIt{2+L@z>}7+0pEx3soE# z)%HwxfA96zuity!>dm_YgBsB=(fjYM-l5Qwra@XOR`Ls_^_ASG9}{hMpzi_t@^9w; z-UM9yrts@P*YfM7m14QFxVEyUTgF4~dJEg!aShvgDSLJC%7~V?LM{2GUfbnaw4w9G z#p@$l!Qr~c>kCVV0)J!iO7;5n1;g^VW9jC?&Xud#xeZ6JnLJytou=*R9#qedXd_xT z!_ZtX6(ZYdp2sX z&6Rg;$GeGEHx4^BcLX}W%_tKnF4Y-LbZK0*tp*fk0)+xI8P+5rLeXfT$R{_|rK;>X zhEz5hDD!cr!s--ED4YotuG%%-TsCxb)8P+|1M~$-j`Yn2a`_#{*6U%x*+B4U=XfAl zx_ZNUlOHk~4+J`G=R!DFj_>o@;*VQ~!(pORU2|WuZIkO3EO{=ZEnaduY>l>{Fo#yQ zTTYFy7$z1z)Aks#`i#ztsOb27$C0H|DkP(^z*9DM9`TyTXi7F2cCO4FSl4(<-!XZT z5u*ft@LL)kWC*(J07Q1wYwpHlTxsyMVX+}-BJF}AOGdAAB+---(>*)^Ng1fl97mdTf>lVroq%q(cUmw8YXFr zdQ%jSMd66T6@@2?R*LpDyuXp6gA^U6=q*^%mF80U@Lp*d7JHS^NWr#TPq(~n-E48# zY~T0huS)^|4ZEJGH{i#8@JPIs!zLH_(sFUVQmWj?BE;w~*k)@_xbdK+ z@4*W-HLt3Hi6u>LHN0KnG*i%IwM)wp~U>~p9mSGlO$$hMqkoh zqb5k&O|e(#Cc>aipoVlPMoNH3%Q7CfWR1ao3UMS$%(O*Kkz1;DxPP@Nvy0H9F?vb? zj;4v(wx}-COIQ{`pgKFrVyulekW#A1DMG(+1l1l&=i^~hsAN9T7H^8QUlkK&bf!H> zd=8lm>1n4BM%lI|!>#(0_UBu5I%z9;%diaZHbQ?+q?|#2g-)&-7GH1e?Qo~!ui%6< z=eCZdffZGagWj$IkDXgRUT9(^|7)8X0&cIVJG^2ux^NsqH|I-?Qp!M#oZKI&ygZwHCHA?gBEjFLo_PXZu0r zuzAz;nL-e9NVX0(m>cEdYOzqs*0L*G8*80pBe-SrWi)SWEf=@4OZT(2MMb<+M^7O` zx9H^zU8gS~Sc5alJ%-xuuXh{}_z=q5uvrdohWF6LkBI#m9|`&*%A{<(K(F9C z;{zy9OQ~<$yO7`=sl@n+DED3 z1vTF;OgLUg*MLN6f1rW;6N4Yo(4Qh~9*1;k9bFog=vC-obeC3@uD~K6QZhQJ{n$yZ z(RznSXi~}Oq~6A)z8NBt><~#RcV@Ifn=wREQ6k@pCGr|=#SuwGiF^k{zT1O{A0Uj% zu|$TWM7|$Oq!LeLI7;M)Ao6YxB7Wd8x))0%9VPOkSR&i;MAA_rKLL@S_8{ViHlr`c z649bWeilpQEAd3MD3SL;+pB}{c$cZSCpT`n;oxU39BPXInehDHU^dKS= z%~&20_=eJT4e^&i%%v}0`ZHyIMinYLO3X zRBwN9d^~)e*ele)KrFIR6n6|H5b2p4v}TT+jKB5S>Lr?-K3Y zarDz6uImCF>pgXdGs=;9M6d7Ks-C>_z5a^SDbBxoh|-H*V+30N2J^;GQPNXdmqE3y Tc_=BQhw*m-e)@?xN6^0k5R3xq diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 5fc37624f0e952d722990706c34aa17b065d2bef..c2ea571cf165c20b792f0bffd69afb5d0a49ba30 100644 GIT binary patch literal 22795 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 L?(?;W`R@M!kYNsz literal 19390 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 VGiQrwZDUrw_{aGgnx5dR{{@HY7RLYp diff --git a/src/org/mxchange/jcontactsbusiness/BusinessContact.java b/src/org/mxchange/jcontactsbusiness/BusinessContact.java index 2cf5953..f0f9579 100644 --- a/src/org/mxchange/jcontactsbusiness/BusinessContact.java +++ b/src/org/mxchange/jcontactsbusiness/BusinessContact.java @@ -127,4 +127,10 @@ public interface BusinessContact extends Serializable { * @param headQuartersData Headquarters data */ public void setHeadQuartersData (final HeadQuartersData headQuartersData); + + @Override + public boolean equals (final Object object); + + @Override + public int hashCode (); } diff --git a/src/org/mxchange/jcontactsbusiness/CompanyContact.java b/src/org/mxchange/jcontactsbusiness/CompanyContact.java index 7685c6c..57142c5 100644 --- a/src/org/mxchange/jcontactsbusiness/CompanyContact.java +++ b/src/org/mxchange/jcontactsbusiness/CompanyContact.java @@ -17,6 +17,7 @@ package org.mxchange.jcontactsbusiness; import java.util.List; +import java.util.Objects; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -105,6 +106,19 @@ public class CompanyContact implements BusinessContact, Comparable { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } + @Override + public boolean equals (final Object object) { + if (object == null) { + return false; + } else if (getClass() != object.getClass()) { + return false; + } + + final Department other = (Department) object; + + if (!Objects.equals(this.getDepartmentCompany(), other.getDepartmentCompany())) { + return false; + } else if (!Objects.equals(this.getDepartmentName(), other.getDepartmentName())) { + return false; + } + + return true; + } + @Override public BusinessContact getDepartmentCompany () { return this.departmentCompany; @@ -120,4 +140,12 @@ public class CompanyDepartment implements Department, Comparable { public void setDepartmentName (final String departmentName) { this.departmentName = departmentName; } + + @Override + public int hashCode () { + int hash = 5; + hash = 53 * hash + Objects.hashCode(this.getDepartmentCompany()); + hash = 53 * hash + Objects.hashCode(this.getDepartmentName()); + return hash; + } } diff --git a/src/org/mxchange/jcontactsbusiness/department/Department.java b/src/org/mxchange/jcontactsbusiness/department/Department.java index 6eca9b8..22a065a 100644 --- a/src/org/mxchange/jcontactsbusiness/department/Department.java +++ b/src/org/mxchange/jcontactsbusiness/department/Department.java @@ -82,4 +82,10 @@ public interface Department extends Serializable { * @param departmentName Department name */ public void setDepartmentName (final String departmentName); + + @Override + public boolean equals (final Object object); + + @Override + public int hashCode (); } diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index 757a4f0..7922083 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -16,6 +16,7 @@ */ package org.mxchange.jcontactsbusiness.employee; +import java.util.Objects; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -28,6 +29,8 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; +import org.mxchange.jcontactsbusiness.BusinessContact; +import org.mxchange.jcontactsbusiness.CompanyContact; import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.branch.CompanyBranchOffice; import org.mxchange.jcontactsbusiness.department.CompanyDepartment; @@ -58,6 +61,13 @@ public class CompanyEmployee implements Employee, Comparable { @OneToOne (targetEntity = CompanyBranchOffice.class, cascade = CascadeType.ALL) private BranchOffice employeeBranchOffice; + /** + * Company the employee is working at + */ + @JoinColumn (name = "employee_company_id", nullable = false, updatable = false) + @OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.ALL, optional = false) + private BusinessContact employeeCompany; + /** * Department the employee works at */ @@ -117,6 +127,27 @@ public class CompanyEmployee implements Employee, Comparable { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } + @Override + public boolean equals (final Object object) { + if (object == null) { + return false; + } else if (getClass() != object.getClass()) { + return false; + } + + final Employee other = (Employee) object; + + if (!Objects.equals(this.getEmployeeCompany(), other.getEmployeeCompany())) { + return false; + } else if (!Objects.equals(this.getEmployeeNumber(), other.getEmployeeNumber())) { + return false; + } else if (!Objects.equals(this.getEmployeePersonalData(), other.getEmployeePersonalData())) { + return false; + } + + return true; + } + @Override public BranchOffice getEmployeeBranchOffice () { return this.employeeBranchOffice; @@ -127,6 +158,16 @@ public class CompanyEmployee implements Employee, Comparable { this.employeeBranchOffice = employeeBranchOffice; } + @Override + public BusinessContact getEmployeeCompany () { + return this.employeeCompany; + } + + @Override + public void setEmployeeCompany (final BusinessContact employeeCompany) { + this.employeeCompany = employeeCompany; + } + @Override public Department getEmployeeDepartment () { return this.employeeDepartment; @@ -206,4 +247,13 @@ public class CompanyEmployee implements Employee, Comparable { public void setEmployeePosition (final JobPosition employeePosition) { this.employeePosition = employeePosition; } + + @Override + public int hashCode () { + int hash = 3; + hash = 97 * hash + Objects.hashCode(this.getEmployeeCompany()); + hash = 97 * hash + Objects.hashCode(this.getEmployeeNumber()); + hash = 97 * hash + Objects.hashCode(this.getEmployeePersonalData()); + return hash; + } } diff --git a/src/org/mxchange/jcontactsbusiness/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/employee/Employee.java index ea64f1e..da67f3d 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/Employee.java @@ -18,6 +18,7 @@ package org.mxchange.jcontactsbusiness.employee; import java.io.Serializable; import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontactsbusiness.BusinessContact; import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.department.Department; import org.mxchange.jcontactsbusiness.jobposition.JobPosition; @@ -44,6 +45,20 @@ public interface Employee extends Serializable { */ public void setEmployeeBranchOffice (final BranchOffice employeeBranchOffice); + /** + * Getter for employee's company + *

+ * @return Company instance + */ + public BusinessContact getEmployeeCompany (); + + /** + * Setter for employee's company + *

+ * @param employeeCompany Company instance + */ + public void setEmployeeCompany (final BusinessContact employeeCompany); + /** * Getter for employee's department *

@@ -155,4 +170,10 @@ public interface Employee extends Serializable { * @param employeePosition Employee's position */ public void setEmployeePosition (final JobPosition employeePosition); + + @Override + public boolean equals (final Object object); + + @Override + public int hashCode (); } diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java index 259d691..5395fb7 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java +++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java @@ -16,6 +16,7 @@ */ package org.mxchange.jcontactsbusiness.headquarters; +import java.util.Objects; import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -122,6 +123,35 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } + @Override + public boolean equals (final Object object) { + if (object == null) { + return false; + } else if (getClass() != object.getClass()) { + return false; + } + + final JobPosition other = (JobPosition) object; + + if (!Objects.equals(this.getJobPositionName(), other.getJobPositionName())) { + return false; + } + return true; + } + @Override public Long getJobPositionId () { return this.jobPositionId; @@ -78,4 +95,11 @@ public class EmployeePosition implements JobPosition, Comparable { this.jobPositionName = jobPositionName; } + @Override + public int hashCode () { + int hash = 7; + hash = 37 * hash + Objects.hashCode(this.getJobPositionName()); + return hash; + } + } diff --git a/src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java b/src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java index e9dc8f9..6a117ad 100644 --- a/src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java +++ b/src/org/mxchange/jcontactsbusiness/jobposition/JobPosition.java @@ -52,4 +52,10 @@ public interface JobPosition extends Serializable { * @param jobPositionName Job position name */ public void setJobPositionName (final String jobPositionName); + + @Override + public boolean equals (final Object object); + + @Override + public int hashCode (); } diff --git a/src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java b/src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java index 062259e..e76ce18 100644 --- a/src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java +++ b/src/org/mxchange/jcontactsbusiness/logo/BusinessLogo.java @@ -52,4 +52,10 @@ public interface BusinessLogo extends Serializable { * @param logoId Logo's id number */ public void setLogoId (final Long logoId); + + @Override + public boolean equals (final Object object); + + @Override + public int hashCode (); } diff --git a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java b/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java index 59b3b86..9cb53fd 100644 --- a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java +++ b/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java @@ -16,6 +16,7 @@ */ package org.mxchange.jcontactsbusiness.logo; +import java.util.Objects; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -58,6 +59,19 @@ public class CompanyLogo implements BusinessLogo, Comparable { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } + @Override + public boolean equals (final Object object) { + if (object == null) { + return false; + } else if (getClass() != object.getClass()) { + return false; + } + + final BusinessLogo other = (BusinessLogo) object; + + return Objects.equals(this.getLogoFileName(), other.getLogoFileName()); + } + @Override public String getLogoFileName () { return this.logoFileName; @@ -77,4 +91,11 @@ public class CompanyLogo implements BusinessLogo, Comparable { public void setLogoId (final Long logoId) { this.logoId = logoId; } + + @Override + public int hashCode () { + int hash = 3; + hash = 53 * hash + Objects.hashCode(this.getLogoFileName()); + return hash; + } } -- 2.39.5