From 16dc7e20961b2dc4e41ea16f1fc265022c47809e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 22 Sep 2017 23:50:34 +0200
Subject: [PATCH] Continued: - need to change java.util.Calendar (bye bye) to
 java.util.Date in favour of   PrimeFace's p:calendar [!]
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../model/basicdata/BusinessBasicData.java     |  6 +++---
 .../model/basicdata/CompanyBasicData.java      |  8 ++++----
 .../model/branchoffice/BranchOffice.java       |  6 +++---
 .../branchoffice/CompanyBranchOffice.java      |  8 ++++----
 .../model/department/CompanyDepartment.java    | 12 ++++++------
 .../model/department/Department.java           | 10 +++++-----
 .../model/employee/CompanyEmployee.java        |  8 ++++----
 .../model/employee/Employee.java               |  6 +++---
 .../headquarters/CompanyHeadquartersData.java  |  8 ++++----
 .../model/headquarters/HeadquartersData.java   |  6 +++---
 .../model/jobposition/EmployeePosition.java    | 14 +++++++-------
 .../model/jobposition/JobPosition.java         | 10 +++++-----
 .../model/logo/BusinessLogo.java               |  6 +++---
 .../model/logo/CompanyLogo.java                |  8 ++++----
 .../opening_times/BusinessOpeningTimes.java    | 18 +++++++++---------
 .../model/opening_times/OpeningTimes.java      | 10 +++++-----
 16 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
index dafe24b..e41f883 100644
--- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
+++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.basicdata;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
@@ -123,14 +123,14 @@ public interface BusinessBasicData extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getCompanyCreated ();
+	Date getCompanyCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param contactCreated Timestamp when this entry has been created
 	 */
-	void setCompanyCreated (final Calendar contactCreated);
+	void setCompanyCreated (final Date contactCreated);
 
 	/**
 	 * Getter for comments
diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java
index 1e7bc64..b8ff97a 100644
--- a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java
+++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.basicdata;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import javax.persistence.Basic;
@@ -105,7 +105,7 @@ public class CompanyBasicData implements BusinessBasicData {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "company_entry_created", nullable = false, updatable = false)
-	private Calendar companyCreated;
+	private Date companyCreated;
 
 	/**
 	 * Company's main email address (example: info@company.com)
@@ -268,13 +268,13 @@ public class CompanyBasicData implements BusinessBasicData {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getCompanyCreated () {
+	public Date getCompanyCreated () {
 		return this.companyCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setCompanyCreated (final Calendar companyCreated) {
+	public void setCompanyCreated (final Date companyCreated) {
 		this.companyCreated = companyCreated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java
index cc132aa..4da8fd7 100644
--- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.branchoffice;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jcountry.model.data.Country;
@@ -247,14 +247,14 @@ public interface BranchOffice extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getBranchCreated ();
+	Date getBranchCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param branchCreated Timestamp when this entry has been created
 	 */
-	void setBranchCreated (final Calendar branchCreated);
+	void setBranchCreated (final Date branchCreated);
 
 	@Override
 	boolean equals (final Object object);
diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java
index cfe6909..d1b8dfc 100644
--- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java
+++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.branchoffice;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -103,7 +103,7 @@ public class CompanyBranchOffice implements BranchOffice {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "branch_entry_created", nullable = false, updatable = false)
-	private Calendar branchCreated;
+	private Date branchCreated;
 
 	/**
 	 * Branch office's main email address (example: branch-name@company.com)
@@ -329,13 +329,13 @@ public class CompanyBranchOffice implements BranchOffice {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getBranchCreated () {
+	public Date getBranchCreated () {
 		return this.branchCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setBranchCreated (final Calendar branchCreated) {
+	public void setBranchCreated (final Date branchCreated) {
 		this.branchCreated = branchCreated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java
index c5fe6e8..25429f4 100644
--- a/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java
+++ b/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.department;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -32,16 +32,16 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice;
 import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData;
+import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData;
 
 /**
  * A POJO for company departments
@@ -86,7 +86,7 @@ public class CompanyDepartment implements Department {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "department_entry_created", nullable = false, updatable = false)
-	private Calendar departmentCreated;
+	private Date departmentCreated;
 
 	/**
 	 * Id number
@@ -170,13 +170,13 @@ public class CompanyDepartment implements Department {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getDepartmentCreated () {
+	public Date getDepartmentCreated () {
 		return this.departmentCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setDepartmentCreated (final Calendar departmentCreated) {
+	public void setDepartmentCreated (final Date departmentCreated) {
 		this.departmentCreated = departmentCreated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/department/Department.java b/src/org/mxchange/jcontactsbusiness/model/department/Department.java
index 9ca6f9b..f0550fb 100644
--- a/src/org/mxchange/jcontactsbusiness/model/department/Department.java
+++ b/src/org/mxchange/jcontactsbusiness/model/department/Department.java
@@ -17,12 +17,12 @@
 package org.mxchange.jcontactsbusiness.model.department;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
+import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.employee.Employee;
-import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * A POJI for company departments
@@ -134,14 +134,14 @@ public interface Department extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getDepartmentCreated ();
+	Date getDepartmentCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param departmentCreated Timestamp when this entry has been created
 	 */
-	void setDepartmentCreated (final Calendar departmentCreated);
+	void setDepartmentCreated (final Date departmentCreated);
 
 	@Override
 	boolean equals (final Object object);
diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java
index 04eba99..cda90b1 100644
--- a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java
+++ b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.employee;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -92,7 +92,7 @@ public class CompanyEmployee implements Employee {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "employee_entry_created", nullable = false, updatable = false)
-	private Calendar employeeCreated;
+	private Date employeeCreated;
 
 	/**
 	 * Department the employee works at
@@ -207,13 +207,13 @@ public class CompanyEmployee implements Employee {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getEmployeeCreated () {
+	public Date getEmployeeCreated () {
 		return this.employeeCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setEmployeeCreated (final Calendar employeeCreated) {
+	public void setEmployeeCreated (final Date employeeCreated) {
 		this.employeeCreated = employeeCreated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java
index 87c7a05..965573c 100644
--- a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java
+++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.employee;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
@@ -207,14 +207,14 @@ public interface Employee extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getEmployeeCreated ();
+	Date getEmployeeCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param employeeCreated Timestamp when this entry has been created
 	 */
-	void setEmployeeCreated (final Calendar employeeCreated);
+	void setEmployeeCreated (final Date employeeCreated);
 
 	@Override
 	boolean equals (final Object object);
diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java
index bd44445..1bd660a 100644
--- a/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java
+++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersData.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.headquarters;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -76,7 +76,7 @@ public class CompanyHeadquartersData implements HeadquartersData {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "headquarters_entry_created", nullable = false, updatable = false)
-	private Calendar headquartersCreated;
+	private Date headquartersCreated;
 
 	/**
 	 * Headquarters' fax number
@@ -193,13 +193,13 @@ public class CompanyHeadquartersData implements HeadquartersData {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getHeadquartersCreated () {
+	public Date getHeadquartersCreated () {
 		return this.headquartersCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setHeadquartersCreated (final Calendar headquartersCreated) {
+	public void setHeadquartersCreated (final Date headquartersCreated) {
 		this.headquartersCreated = headquartersCreated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java
index 03a9b7f..e87b0d4 100644
--- a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java
+++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.headquarters;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
@@ -189,14 +189,14 @@ public interface HeadquartersData extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getHeadquartersCreated ();
+	Date getHeadquartersCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param headquartersCreated Timestamp when this entry has been created
 	 */
-	void setHeadquartersCreated (final Calendar headquartersCreated);
+	void setHeadquartersCreated (final Date headquartersCreated);
 
 	@Override
 	boolean equals (final Object object);
diff --git a/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java
index 76733c3..a930f18 100644
--- a/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java
+++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/EmployeePosition.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.jobposition;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.Column;
@@ -53,7 +53,7 @@ public class EmployeePosition implements JobPosition {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "job_position_created", nullable = false, updatable = false)
-	private Calendar jobPositionCreated;
+	private Date jobPositionCreated;
 
 	/**
 	 * Id number
@@ -75,7 +75,7 @@ public class EmployeePosition implements JobPosition {
 	 */
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "job_position_updated", insertable = false)
-	private Calendar jobPositionUpdated;
+	private Date jobPositionUpdated;
 
 	@Override
 	public boolean equals (final Object object) {
@@ -100,13 +100,13 @@ public class EmployeePosition implements JobPosition {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getJobPositionCreated () {
+	public Date getJobPositionCreated () {
 		return this.jobPositionCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setJobPositionCreated (final Calendar jobPositionCreated) {
+	public void setJobPositionCreated (final Date jobPositionCreated) {
 		this.jobPositionCreated = jobPositionCreated;
 	}
 
@@ -132,13 +132,13 @@ public class EmployeePosition implements JobPosition {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getJobPositionUpdated () {
+	public Date getJobPositionUpdated () {
 		return this.jobPositionUpdated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setJobPositionUpdated (final Calendar jobPositionUpdated) {
+	public void setJobPositionUpdated (final Date jobPositionUpdated) {
 		this.jobPositionUpdated = jobPositionUpdated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java b/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java
index 3048c8f..20a3d0e 100644
--- a/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java
+++ b/src/org/mxchange/jcontactsbusiness/model/jobposition/JobPosition.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.jobposition;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 
 /**
  * A POJI for job positions
@@ -59,28 +59,28 @@ public interface JobPosition extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getJobPositionCreated ();
+	Date getJobPositionCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param jobPositionCreated Timestamp when this entry has been created
 	 */
-	void setJobPositionCreated (final Calendar jobPositionCreated);
+	void setJobPositionCreated (final Date jobPositionCreated);
 
 	/**
 	 * Getter for timestamp when this entry has been updated
 	 * <p>
 	 * @return Timestamp when this entry has been updated
 	 */
-	Calendar getJobPositionUpdated ();
+	Date getJobPositionUpdated ();
 
 	/**
 	 * Setter for timestamp when this entry has been updated
 	 * <p>
 	 * @param jobPositionUpdated Timestamp when this entry has been updated
 	 */
-	void setJobPositionUpdated (final Calendar jobPositionUpdated);
+	void setJobPositionUpdated (final Date jobPositionUpdated);
 
 	@Override
 	boolean equals (final Object object);
diff --git a/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java
index f899901..043e7f2 100644
--- a/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java
+++ b/src/org/mxchange/jcontactsbusiness/model/logo/BusinessLogo.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.logo;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jusercore.model.user.User;
 
 /**
@@ -74,14 +74,14 @@ public interface BusinessLogo extends Serializable {
 	 * <p>
 	 * @return Timestamp when this entry has been created
 	 */
-	Calendar getLogoCreated ();
+	Date getLogoCreated ();
 
 	/**
 	 * Setter for timestamp when this entry has been created
 	 * <p>
 	 * @param logoCreated Timestamp when this entry has been created
 	 */
-	void setLogoCreated (final Calendar logoCreated);
+	void setLogoCreated (final Date logoCreated);
 
 	@Override
 	boolean equals (final Object object);
diff --git a/src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.java b/src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.java
index 0549435..f4067d4 100644
--- a/src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.java
+++ b/src/org/mxchange/jcontactsbusiness/model/logo/CompanyLogo.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.logo;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -56,7 +56,7 @@ public class CompanyLogo implements BusinessLogo {
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
 	@Column (name = "logo_entry_created", nullable = false, updatable = false)
-	private Calendar logoCreated;
+	private Date logoCreated;
 
 	/**
 	 * Local file name of the logo (relative to /resources/logos/)
@@ -103,13 +103,13 @@ public class CompanyLogo implements BusinessLogo {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getLogoCreated () {
+	public Date getLogoCreated () {
 		return this.logoCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setLogoCreated (final Calendar logoCreated) {
+	public void setLogoCreated (final Date logoCreated) {
 		this.logoCreated = logoCreated;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.java b/src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.java
index dbb950d..09eba67 100644
--- a/src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.java
+++ b/src/org/mxchange/jcontactsbusiness/model/opening_times/BusinessOpeningTimes.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jcontactsbusiness.model.opening_times;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.Column;
@@ -61,7 +61,7 @@ public class BusinessOpeningTimes implements OpeningTimes {
 	@Basic (optional = false)
 	@Column (name = "opening_times_end_time", nullable = false)
 	@Temporal (TemporalType.TIME)
-	private Calendar endTime;
+	private Date endTime;
 
 	/**
 	 * Id number
@@ -85,7 +85,7 @@ public class BusinessOpeningTimes implements OpeningTimes {
 	@Basic (optional = false)
 	@Column (name = "opening_times_start_time", nullable = false)
 	@Temporal (TemporalType.TIME)
-	private Calendar startTime;
+	private Date startTime;
 
 	/**
 	 * Default constructor
@@ -102,7 +102,7 @@ public class BusinessOpeningTimes implements OpeningTimes {
 	 * @param startDay  Start day
 	 * @param startTime Start time
 	 */
-	public BusinessOpeningTimes (final DayOfTheWeek endDay, final Calendar endTime, final Long id, final DayOfTheWeek startDay, final Calendar startTime) {
+	public BusinessOpeningTimes (final DayOfTheWeek endDay, final Date endTime, final Long id, final DayOfTheWeek startDay, final Date startTime) {
 		// Call other constructor
 		this(endDay, endTime, startDay, startTime);
 
@@ -118,7 +118,7 @@ public class BusinessOpeningTimes implements OpeningTimes {
 	 * @param startDay  Start day
 	 * @param startTime Start time
 	 */
-	public BusinessOpeningTimes (final DayOfTheWeek endDay, final Calendar endTime, final DayOfTheWeek startDay, final Calendar startTime) {
+	public BusinessOpeningTimes (final DayOfTheWeek endDay, final Date endTime, final DayOfTheWeek startDay, final Date startTime) {
 		// Set all fields
 		this.endDay = endDay;
 		this.endTime = endTime;
@@ -165,13 +165,13 @@ public class BusinessOpeningTimes implements OpeningTimes {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getEndTime () {
+	public Date getEndTime () {
 		return this.endTime;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setEndTime (final Calendar endTime) {
+	public void setEndTime (final Date endTime) {
 		this.endTime = endTime;
 	}
 
@@ -197,13 +197,13 @@ public class BusinessOpeningTimes implements OpeningTimes {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Calendar getStartTime () {
+	public Date getStartTime () {
 		return this.startTime;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setStartTime (final Calendar startTime) {
+	public void setStartTime (final Date startTime) {
 		this.startTime = startTime;
 	}
 
diff --git a/src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java b/src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java
index f5111e8..f62b63b 100644
--- a/src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java
+++ b/src/org/mxchange/jcontactsbusiness/model/opening_times/OpeningTimes.java
@@ -17,7 +17,7 @@
 package org.mxchange.jcontactsbusiness.model.opening_times;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jcontactsbusiness.model.opening_times.dayofweek.DayOfTheWeek;
 
 /**
@@ -74,28 +74,28 @@ public interface OpeningTimes extends Serializable {
 	 * <p>
 	 * @return Starting time
 	 */
-	Calendar getStartTime ();
+	Date getStartTime ();
 
 	/**
 	 * Setter for starting time
 	 * <p>
 	 * @param startTime Starting time
 	 */
-	void setStartTime (final Calendar startTime);
+	void setStartTime (final Date startTime);
 
 	/**
 	 * Getter for ending time
 	 * <p>
 	 * @return Ending time
 	 */
-	Calendar getEndTime ();
+	Date getEndTime ();
 
 	/**
 	 * Setter for ending time
 	 * <p>
 	 * @param endTime Ending time
 	 */
-	void setEndTime (final Calendar endTime);
+	void setEndTime (final Date endTime);
 
 	@Override
 	boolean equals (final Object obj);
-- 
2.39.5