From ad7fc179282872e34c096d1521b05874cbe0dc33 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 7 Apr 2016 11:23:51 +0200 Subject: [PATCH] Continued a bit: - added POJO/POJI for opening times - size only applies for strings, no need here (cleanup) - updated jar(s) --- lib/jcontacts-core.jar | Bin 20592 -> 20582 bytes lib/jcountry-core.jar | Bin 6264 -> 6254 bytes lib/jphone-core.jar | Bin 24260 -> 24201 bytes lib/juser-core.jar | Bin 38967 -> 38957 bytes .../jcontactsbusiness/CompanyContact.java | 2 +- .../basicdata/CompanyBasicData.java | 4 +- .../branch/CompanyBranchOffice.java | 2 +- .../department/CompanyDepartment.java | 2 +- .../employee/CompanyEmployee.java | 3 +- .../headquarters/CompanyHeadQuartersData.java | 2 +- .../jobposition/EmployeePosition.java | 4 +- .../jcontactsbusiness/logo/CompanyLogo.java | 2 +- .../opening_times/BusinessOpeningTimes.java | 177 ++++++++++++++++++ .../opening_times/OpeningTimes.java | 106 +++++++++++ 14 files changed, 294 insertions(+), 10 deletions(-) create mode 100644 src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java create mode 100644 src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 6c00138861dd02dae05115842913099b8f9d10f7..59559efe241a09d9c37e438697cafbb84fa98ae1 100644 GIT binary patch delta 4172 zcmaJ^32;yh;pNt5OTRm2!2K7cGr_4DADAs|CAfU|gx6s5^yyC8Z|d(lf5bdsQx z1$7YAQBWsAodtCf)KyS7LEQzNBIr~>Jp`R5C__+YFv75>z$}^UB`8}^j-XsYd4lqN zbh?j10t;laAb>(Dl*je~Dx%&pn8%ZZaIug2_~?vODhZ&7`Ua>U^%sKy^0HKhfieu@ zL9bOqf`v3PK%?j!A5}(=tK})t6&=D}3Plfhe%Kdj#u|m|ut4EjOjEcT(|j~q(HPvR zuvCV<*rc!z?<(vR^ogLK1pO@Ncl@F7C;n2{D0A<~+!nmAuoc@BzQ+#=NARPtL z6nhljz?%wh;cbOi@T$teYj|DZJu%)a#vkBAg^#dZ;a5SwVLKtDdzNSDreIJ{&M4@# zAD=0#$1^^vQWO@$NARd_%9xtoOw~TBQFxJRdB96LJ+oi--B_luLUL=8;eO0gco3@; z)nS2;&Q&y)#zkjjW_lyp@Zwegw}Ehb0~X^BRPj`}5gHfQqXA1~@JLx$V+?C{2e?}!9 zPVXv(w;7M|__&T{=g<>+SN19GpX4_oB=Oi0tMQcf=JfLMVlrAqIX#M>;5Y3! zY2X{y`W8VPhS(_9kdbXz5}w9dV{>)R6879Kw=74rggdan(h?NKI@Tlk&l~-jxtFm1 z-rT$j(a$uICbsHN#Ityg^}66pW9h;3tfi3TPd$baKDXlBv+Rh?OIyHN6y6Vzi0OpOfV*o=IOjlRl12_%lpoqF=~Q ziwOT1f&NTjfD3`K7-tCZcke);pPj&9M*_TGBog3KM7S3HxE2YeC}Sq&E=;DHPl03; zabVKl&SZom6W)9*5uWG5sioCA|Vb|zOkGU1caGS)K-JI2*uE=Qi{5_t~hn#g=YJ4E){BhPn? z%qP2L+_vnc23~s&u4g7UxG>??!7$;Y*@212&g3RXCZFRA%UCZgim$=#9C@)zWbRx{ zYcSkigN@8&lM9nri$~H3JJg`e&SbMA6KGs8$ zt~n$AT-)Iom@frZ;IfKXcQIla5uQ_sb zPNg4^UulaL%T@Dt3^R(`YO;-D)9l&vF6GOF{6-`w&KjkshP&x0)j_>sRF@=%KxtX delta 4019 zcmZ`+32+oe6n%d;*-bW$28aO?LqfghiYO|cc%Uf$-#ct}$C<6#?$e4*c8y5f)fR#%ZEb3C=UBOjFhgVu3W}51FfmAx5f~G!?DouSi4L9{CR3&vN!_$=5 zmBE-*Cw%jU<^%FC)jwBd>yD(f)^h^Lro==p0#YPNp#nII`=|?@BF$5i(3g_MuB)JK zg1QSz5pto>Uw|cCTvr<0rM5E$8?3O zFx^jM71iS|g{4w_iq{oB!Jx5RlDb}Q_`UWMNU{eiuNLfuxE zshcv(dLF>%3XkAXKQ$<76sP;Kkx8?IQ#6hXJgt+m2It(3dlXj5 z^j1r;2D25`Vx6M1G2c()6-}Utp^LM!yruo%#qAuUJ3wfkfkn6z^@u}53p8fcVlie; z!3->s!Xx3)Tl=PuSQhT}fO*(&Ec+MmLJ1)nh7OcSJDVTz(+|6>!w8ADzC3p^bHwFU=ZaM-`vCJTD?!__gY8Jx$=J`zyM*m`=j9I< z`z#I%FgapB8IR#{w(Efr#?yl*__;z{V#0BZ^yA4I8H<;a%guUN{-nk&{5%almXwY( z%0LG7Mj>UQoU$;I`k+(QD2pWn{qPK)3TFDQ*6zkX)O1No`>GNg}NpgiLqo_c&_ z>im)#+l+!9tzsLHNmCKxsW^(x7nzg~wWwnclGj~4*{8&`!QtMHK@w4pb%eImk(RfK z>`JCP zDtSM$8nvBL_>HWvE1AhkX1OStW32{XC^9YGQIu-lsPGQF)RCC)o&SY^dE@N7S2Ayl z3ol=8CIWmJSz|@^WGipVq4p5Waa6*$n3IyBb|v#z$+a#@uE9K`gfG|dSUOak5_Jl- zIWqGtEY|vm;^fb1WH5_bG|K#SYLJFO)81qw0Eb{Cp(N<)(IS&}1LhIdSrJ$R2f(sHI~ImZUC${xI@S;;dlN;pm8 zK?p}3m7Hl;@`9t1-y%wMOKJ2A^eQvI=EBTLqhaQR)S5dv49dh5{DVN~c<^Are1?8mwLH;)w$VG|%m-?7eT970>V@^yru|lZiK$O;zkJwM zHjFTJYeSu>cQ%YObyj18sjq09)FtM-R_|#XmnA(m5j@lIZ*AM*pl%=COF!p3O}8|4 zGsai{c=VduL_q%KCoQ>N+jgMJ7`Ioa>HSUJ4Cj%ibkB98xqFmuZcg@%trv&?0Kb@} A%K!iX diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 49be2e4aa7b60c8ea2109ed5fbe2002af4911630..01a8041b9818458cfcaf5783e01d872b7be6d95c 100644 GIT binary patch delta 1600 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 diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 7a5f4c53513c18407f787533376971a2847632d3..5d51db160dd34f57e4396d21845d8b83d6ca675d 100644 GIT binary patch delta 2411 zcmZ`)X-rgC6#m|Ov%v6xs3VvT*0EA$k&H`G5Y$nIWl(XDqEsqcky=p^#a$Gww(78R z1%%e!{%8|Z%-Gm;F=?xbNtYi@t#(N({h?{vv^A}*(I)LV_aWdoK<0k;oOjOmoqO(m z?_TUt&-JL0zImF-2801$mmX}5Owg_oq@7UBovq(Ed3=yaqZqGDWhhlU>v%8Q+!gw#592S0&mf)tVxyxV(>3?w#)%33Q2L&lJU+wP7R-OoHL~@K!Fv13InIdY*e7JKTiTt0&2z3O$??!I9Y7isq*q`DGBB20Pt_n36k zzAuVr)G(PDk79Vln;yqFS_{lFidqPZoKYWPm8^>;>urxSmn#`gH2~c-9z!_oMHID| zb)2%o=zg7OW|unAyc5&{g<4-CxeBrislt=lF84sDyFb&7=dhIGob+Fc=P7d;@khX9 zwdnsM#)>j}xEw1aRdkMvsAlKHu4Jkh3I?9+qf$xs1+1hvg?FFh>8VTFfH~;`B6`T7 zg4bmsH*jfCXU%;y3M%j-CyQo1wvJ!f>Q2wgryth@g4me*0w!-5z8eaK3xjGmM3z~ZTru;5C1sgj?DsD#fj zSF!=sG}11JQ+f75J-8K8c_TI%(T^&dgOz_FHQ3z8)xZDT11-1*e}t@L z3%&8i>3O6FT5u(Isgl2ksD$5b?g4%A3@#Dy+9&V{GS0#Mkjgu-lcU9N-oYpSKbYwy zDWu%TPrUKDQ?W~)lv?@W%cpO`ZsMVj=N{BOob07Zaw#-7_R*Q5XD?%a4G#31udw-Q zzd8IM+lK}&VY;*l zm#Ei2o1P25e-gt7{&a?a{8x&p}*5@-!Z16GcX;{LL+!QDNY?#8+35{OK zSl8eXO^q4s`n0i3x+XSBqFqg;?7h)c%;0KX&2Y4NErYp5T2(Ep*!rranjxoE!n>^- z*h*~M$?!(oR)*1H4Z|U^k>P<@&ro?}6T=TjYJ%?Ovi4PD%$*1FKD*-Ty-pu={&{I< z9{!!(w^#JGm&j@}I~?kzLZNJq7rSXneBB*!>a;5IB#4_G!zI!DEvIX@(M`g?$q!iw z&+hw94C{2u7}s^*jkzSmKldXsr$lw##rti=FtBEE_=iq delta 2413 zcmZ`)ZBUd|6n@_K-49q78E{!_*ws}~0dp2L^AlZV0T+}+#8l)X0ZqjZBu$M()GU{8 zuP%zI74)a1Ff98R8yo%M)JRU#XwB3#HIq(Mll`b^w8_r7yDsa_vNL<1d(J)QdCooW zec#*Lr(Wz+W0vJ>Iuj5D^!g5U#H4EH2xgsC&-psOb?|sUjYct1na)t6WHNLqSqwiY za~P6T7elF<%gN#sEmeG}Ca~+aI@`aJCT=XTh%(K@<|eHm5Gcv+Y5DBU)nya(x9WaT z821=z42*Zo9%)Y-IZk7{IIc+ITb5GkkG8H-*(u@*LNoX-Qx5UMOAN_kN|Hqn$R2#3tCJxwDPQthjt!1csR-n z6la0p;TWeKH^Rs6&Jl<~rwJ!;lFcqQyVyKs#H&V}7IA6m{rhIrsCo^6rGIdyPN(?# z|CrmWODMooMw~I@EEbqCpN9fGEzY~FF>Yj=kp!C=ui@lMPJ^jvwdNm^r8fFsxEGU>=jX9W$anNCW9p)j$gG@|Z0|zGYpt6uC&q^wFg?JZI z;^b;9LKX#(IGJ|hn?hC&aT8H)Nc3WIc`A{I{1PbDSc0V(%iN8NPQrh~YnXqLUdMQad)t5X*UzA(op(O~`;RwK%3u>#LXDt(SKleZpEn+86h;ERaGha~us z+`g4Oz?cBJO8#}Iq)de$v1F*tu})$J16jbQAx+ZyNJr$ z{H>?tM|%(z-h&^hlAngDWGX#(?*4Yv1{xY#i9WoN+Yu|-fx1AlXQ&i<8v5``ex*u& z8>SNfYo*{h>|`=A#$%P;^q;=F5ruc*`GD{vx>~sIU!?o@FuL^e5{JUyvH(}G0}XT_ zP2nxL7qODPcp*|HrtnH0Ku<@VUvB^V7y4%Szj!L@MJeOV9n+q81EuO&2N;W@hDf2JdL}u$Wp4PUOFbuR7GfZgPz|h*Z znc=?Qs%o!d>+|;Q4D&i9ywkCbt+7Ym)?rCcG2DGmmKJ>xUtdz@Za@N XkFcjP|DX)Md)O}GPFM{Oj_~ULuSM_Q diff --git a/src/org/mxchange/jcontactsbusiness/CompanyContact.java b/src/org/mxchange/jcontactsbusiness/CompanyContact.java index 3642930..aed29bb 100644 --- a/src/org/mxchange/jcontactsbusiness/CompanyContact.java +++ b/src/org/mxchange/jcontactsbusiness/CompanyContact.java @@ -80,7 +80,7 @@ public class CompanyContact implements BusinessContact { * Id number */ @Id - @Column (name = "company_id", length = 20, nullable = false, updatable = false) + @Column (name = "company_id", nullable = false, updatable = false) @GeneratedValue (strategy = GenerationType.IDENTITY) private Long companyContactId; diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java index ca92223..fcae00a 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/basicdata/CompanyBasicData.java @@ -73,7 +73,7 @@ public class CompanyBasicData implements BusinessBasicData { * Id number */ @Id - @Column (name = "company_basic_id", length = 20, nullable = false, updatable = false) + @Column (name = "company_basic_id", nullable = false, updatable = false) @GeneratedValue (strategy = GenerationType.IDENTITY) private Long companyBasicId; @@ -101,7 +101,7 @@ public class CompanyBasicData implements BusinessBasicData { * Legal status of company (example: "Inc.", "GmbH") */ @Basic (optional = false) - @Column (name = "company_legal_status", length = 20, nullable = false) + @Column (name = "company_legal_status", nullable = false) private String companyLegalStatus; /** diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java index 062b781..f6126f2 100644 --- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java @@ -108,7 +108,7 @@ public class CompanyBranchOffice implements BranchOffice { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "branch_id", length = 20, nullable = false, updatable = false) + @Column (name = "branch_id", nullable = false, updatable = false) private Long branchId; /** diff --git a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java index 2ef7040..093d9c4 100644 --- a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java +++ b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java @@ -90,7 +90,7 @@ public class CompanyDepartment implements Department { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "department_id", length = 20, nullable = false, updatable = false) + @Column (name = "department_id", nullable = false, updatable = false) private Long departmentId; /** diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index 3b33f6c..221d481 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -107,7 +107,7 @@ public class CompanyEmployee implements Employee { * Id number */ @Id - @Column (name = "employee_id", length = 20, nullable = false, updatable = false) + @Column (name = "employee_id", nullable = false, updatable = false) @GeneratedValue (strategy = GenerationType.IDENTITY) private Long employeeId; @@ -310,4 +310,5 @@ public class CompanyEmployee implements Employee { public void setEmployeeUserOwner (final User employeeUserOwner) { this.employeeUserOwner = employeeUserOwner; } + } diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java index 87166fe..190b973 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java +++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java @@ -94,7 +94,7 @@ public class CompanyHeadQuartersData implements HeadQuartersData { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "headquarters_id", length = 20, nullable = false, updatable = false) + @Column (name = "headquarters_id", nullable = false, updatable = false) private Long headquartersId; /** diff --git a/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java b/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java index 6ebfcb9..29d013b 100644 --- a/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java +++ b/src/org/mxchange/jcontactsbusiness/jobposition/EmployeePosition.java @@ -61,14 +61,14 @@ public class EmployeePosition implements JobPosition { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "job_position_id", length = 20, nullable = false, updatable = false) + @Column (name = "job_position_id", nullable = false, updatable = false) private Long jobPositionId; /** * Name/description of the job position (example: CEO) */ @Basic (optional = false) - @Column (name = "job_position_name", length = 20, nullable = false, unique = true) + @Column (name = "job_position_name", nullable = false, unique = true) private String jobPositionName; @Override diff --git a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java b/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java index 3b98382..447af3f 100644 --- a/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java +++ b/src/org/mxchange/jcontactsbusiness/logo/CompanyLogo.java @@ -67,7 +67,7 @@ public class CompanyLogo implements BusinessLogo { */ @Id @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "logo_id", length = 20, nullable = false, updatable = false) + @Column (name = "logo_id", nullable = false, updatable = false) private Long logoId; /** diff --git a/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java b/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java new file mode 100644 index 0000000..e030964 --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java @@ -0,0 +1,177 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcontactsbusiness.opening_times; + +import java.time.DayOfWeek; +import java.util.Calendar; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +/** + * A POJO for business opening hours + *

+ * @author Roland Haeder + */ +@Entity (name = "opening_times") +@Table (name = "opening_times") +public class BusinessOpeningTimes implements OpeningTimes { + + /** + * Serial number + */ + private static final long serialVersionUID = 19_578_871_756_871L; + + /** + * Ending day of opening hours (if applyable) + */ + @Column (name = "opening_times_end_day") + @Enumerated (EnumType.STRING) + private DayOfWeek endDay; + + /** + * Ending time (hh:mm) + */ + @Basic (optional = false) + @Column (name = "opening_times_end_time") + @Temporal (TemporalType.TIME) + private Calendar endTime; + + /** + * Id number + */ + @Id + @Column (name = "opening_times_id", nullable = false, updatable = false) + @GeneratedValue (strategy = GenerationType.IDENTITY) + private Long id; + + /** + * Starting day of opening times + */ + @Basic (optional = false) + @Column (name = "opening_times_start_day", nullable = false) + @Enumerated (EnumType.STRING) + private DayOfWeek startDay; + + /** + * Starting time (hh:mm) + */ + @Basic (optional = false) + @Column (name = "opening_times_start_time") + @Temporal (TemporalType.TIME) + private Calendar startTime; + + @Override + public boolean equals (final Object obj) { + if (this == obj) { + return true; + } else if (obj == null) { + return false; + } else if (this.getClass() != obj.getClass()) { + return false; + } + + final OpeningTimes openingTimes = (OpeningTimes) obj; + + if (!Objects.equals(this.getId(), openingTimes.getId())) { + return false; + } else if (this.getStartDay() != openingTimes.getStartDay()) { + return false; + } else if (this.getEndDay() != openingTimes.getEndDay()) { + return false; + } else if (!Objects.equals(this.getStartTime(), openingTimes.getStartTime())) { + return false; + } else if (!Objects.equals(this.getEndTime(), openingTimes.getEndTime())) { + return false; + } + + return true; + } + + @Override + public int hashCode () { + int hash = 7; + + hash = 97 * hash + Objects.hashCode(this.getId()); + hash = 97 * hash + Objects.hashCode(this.getStartDay()); + hash = 97 * hash + Objects.hashCode(this.getEndDay()); + hash = 97 * hash + Objects.hashCode(this.getStartTime()); + hash = 97 * hash + Objects.hashCode(this.getEndTime()); + + return hash; + } + + @Override + public DayOfWeek getEndDay () { + return this.endDay; + } + + @Override + public void setEndDay (final DayOfWeek endDay) { + this.endDay = endDay; + } + + @Override + public Calendar getEndTime () { + return this.endTime; + } + + @Override + public void setEndTime (final Calendar endTime) { + this.endTime = endTime; + } + + @Override + public Long getId () { + return this.id; + } + + @Override + public void setId (Long id) { + this.id = id; + } + + @Override + public DayOfWeek getStartDay () { + return this.startDay; + } + + @Override + public void setStartDay (final DayOfWeek startDay) { + this.startDay = startDay; + } + + @Override + public Calendar getStartTime () { + return this.startTime; + } + + @Override + public void setStartTime (final Calendar startTime) { + this.startTime = startTime; + } + +} diff --git a/src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java b/src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java new file mode 100644 index 0000000..5b6c3fe --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/opening_times/OpeningTimes.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcontactsbusiness.opening_times; + +import java.io.Serializable; +import java.time.DayOfWeek; +import java.util.Calendar; + +/** + * A POJI for opening times + * + * @author Roland Haeder + */ +public interface OpeningTimes extends Serializable { + + /** + * Getter for id number + *

+ * @return Id number + */ + Long getId (); + + /** + * Setter for id number + *

+ * @param id Id number + */ + void setId (final Long id); + + /** + * Getter for starting day + *

+ * @return Starting day + */ + DayOfWeek getStartDay (); + + /** + * Setter for starting day + *

+ * @param startDay Starting day + */ + void setStartDay (final DayOfWeek startDay); + + /** + * Getter for ending day + *

+ * @return Ending day + */ + DayOfWeek getEndDay (); + + /** + * Setter for ending day + *

+ * @param endDay Ending day + */ + void setEndDay (final DayOfWeek endDay); + + /** + * Getter for starting time + *

+ * @return Starting time + */ + Calendar getStartTime (); + + /** + * Setter for starting time + *

+ * @param startTime Starting time + */ + void setStartTime (final Calendar startTime); + + /** + * Getter for ending time + *

+ * @return Ending time + */ + Calendar getEndTime (); + + /** + * Setter for ending time + *

+ * @param endTime Ending time + */ + void setEndTime (final Calendar endTime); + + @Override + boolean equals (final Object obj); + + @Override + int hashCode (); + +} -- 2.39.5