From 6c7e153f939c7226154be3eb0e4dba6942d614ae Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 24 Sep 2015 11:38:42 +0200 Subject: [PATCH] =?utf8?q?also=20needs=20to=20be=20changed=20here,=20too.?= =?utf8?q?=20Good!=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../mxchange/jshopcore/model/customer/Customer.java | 9 +++++---- .../jshopcore/model/customer/ShopCustomer.java | 13 +++++++------ .../mxchange/jshopcore/model/order/Orderable.java | 5 +++-- .../mxchange/jshopcore/model/order/ShopOrder.java | 7 ++++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/org/mxchange/jshopcore/model/customer/Customer.java b/src/org/mxchange/jshopcore/model/customer/Customer.java index d2b4f76..9cee5f7 100644 --- a/src/org/mxchange/jshopcore/model/customer/Customer.java +++ b/src/org/mxchange/jshopcore/model/customer/Customer.java @@ -17,6 +17,7 @@ package org.mxchange.jshopcore.model.customer; import java.io.Serializable; +import java.util.Calendar; import org.mxchange.jcore.model.contact.Contact; /** @@ -66,28 +67,28 @@ public interface Customer extends Serializable { * * @return "created" timestamp */ - public String getCustomerCreated (); + public Calendar getCustomerCreated (); /** * Setter for "created" timestamp * * @param customerCreated "created" timestamp */ - public void setCustomerCreated (final String customerCreated); + public void setCustomerCreated (final Calendar customerCreated); /** * Getter for "locked" timestamp * * @return "locked" timestamp */ - public String getCustomerLocked (); + public Calendar getCustomerLocked (); /** * Getter for "locked" timestamp * * @param customerLocked "locked" timestamp */ - public void setCustomerLocked (final String customerLocked); + public void setCustomerLocked (final Calendar customerLocked); /** * Setter for customer number diff --git a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java index 954988a..678cbb8 100644 --- a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java +++ b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java @@ -16,6 +16,7 @@ */ package org.mxchange.jshopcore.model.customer; +import java.util.Calendar; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; @@ -72,14 +73,14 @@ public class ShopCustomer implements Customer { @Basic(optional = false) @Temporal (TemporalType.TIMESTAMP) @Column (name = "customer_created", nullable = false) - private String customerCreated; + private Calendar customerCreated; /** * "locked" timestamp */ @Temporal (TemporalType.TIMESTAMP) @Column (name = "customer_locked") - private String customerLocked; + private Calendar customerLocked; /** * Customer number, this is different to the database entry customerId. @@ -134,22 +135,22 @@ public class ShopCustomer implements Customer { } @Override - public String getCustomerCreated () { + public Calendar getCustomerCreated () { return this.customerCreated; } @Override - public void setCustomerCreated (final String customerCreated) { + public void setCustomerCreated (final Calendar customerCreated) { this.customerCreated = customerCreated; } @Override - public String getCustomerLocked () { + public Calendar getCustomerLocked () { return this.customerLocked; } @Override - public void setCustomerLocked (final String customerLocked) { + public void setCustomerLocked (final Calendar customerLocked) { this.customerLocked = customerLocked; } diff --git a/src/org/mxchange/jshopcore/model/order/Orderable.java b/src/org/mxchange/jshopcore/model/order/Orderable.java index fbd7136..47f60ed 100644 --- a/src/org/mxchange/jshopcore/model/order/Orderable.java +++ b/src/org/mxchange/jshopcore/model/order/Orderable.java @@ -17,6 +17,7 @@ package org.mxchange.jshopcore.model.order; import java.io.Serializable; +import java.util.Calendar; import java.util.List; import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.customer.Customer; @@ -75,14 +76,14 @@ public interface Orderable extends Serializable { * * @return Created timestamp */ - public String getCreated (); + public Calendar getCreated (); /** * Setter for created timestamp * * @param created Created timestamp */ - public void setCreated (final String created); + public void setCreated (final Calendar created); /** * Getter for list of ordered basket items diff --git a/src/org/mxchange/jshopcore/model/order/ShopOrder.java b/src/org/mxchange/jshopcore/model/order/ShopOrder.java index d2e8bc6..09c69b8 100644 --- a/src/org/mxchange/jshopcore/model/order/ShopOrder.java +++ b/src/org/mxchange/jshopcore/model/order/ShopOrder.java @@ -16,6 +16,7 @@ */ package org.mxchange.jshopcore.model.order; +import java.util.Calendar; import java.util.List; import javax.persistence.Basic; import javax.persistence.Column; @@ -74,7 +75,7 @@ public class ShopOrder implements Orderable { @Basic (optional = false) @Temporal (TemporalType.TIMESTAMP) @Column (nullable = false) - private String created; + private Calendar created; /** * Item list, don't save this @@ -93,12 +94,12 @@ public class ShopOrder implements Orderable { } @Override - public String getCreated () { + public Calendar getCreated () { return this.created; } @Override - public void setCreated (final String created) { + public void setCreated (final Calendar created) { this.created = created; } -- 2.39.5