From e5a7e0c7b4d40a5c32a5a9742848f340fc4c8173 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Apr 2020 18:09:34 +0200 Subject: [PATCH] Continued: - renamed categoryCreated to categoryEntryCreated - renamed categoryUpdated to categoryEntryUpdated MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../jproduct/model/category/Category.java | 34 ++++++------- .../model/category/ProductCategory.java | 50 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/org/mxchange/jproduct/model/category/Category.java b/src/org/mxchange/jproduct/model/category/Category.java index 86e4ea5..f358783 100644 --- a/src/org/mxchange/jproduct/model/category/Category.java +++ b/src/org/mxchange/jproduct/model/category/Category.java @@ -26,20 +26,6 @@ import java.util.Date; */ public interface Category extends Comparable, Serializable { - /** - * Getter for created timestamp - *

- * @return Created timestamp - */ - Date getCategoryCreated (); - - /** - * Setter for created timestamp - *

- * @param categoryCreated Created timestamp - */ - void setCategoryCreated (final Date categoryCreated); - /** * Id number of category *

@@ -97,19 +83,33 @@ public interface Category extends Comparable, Serializable { */ void setCategoryI18nKey (final String title); + /** + * Getter for created timestamp + *

+ * @return Created timestamp + */ + Date getCategoryEntryCreated (); + + /** + * Setter for created timestamp + *

+ * @param categoryEntryCreated Created timestamp + */ + void setCategoryEntryCreated (final Date categoryEntryCreated); + /** * Getter for updated timestamp *

* @return Updated timestamp */ - Date getCategoryUpdated (); + Date getCategoryEntryUpdated (); /** * Setter for updated timestamp *

- * @param categoryUpdated Updated timestamp + * @param categoryEntryUpdated Updated timestamp */ - void setCategoryUpdated (final Date categoryUpdated); + void setCategoryEntryUpdated (final Date categoryEntryUpdated); @Override boolean equals (final Object object); diff --git a/src/org/mxchange/jproduct/model/category/ProductCategory.java b/src/org/mxchange/jproduct/model/category/ProductCategory.java index dcc45b7..e21f3f8 100644 --- a/src/org/mxchange/jproduct/model/category/ProductCategory.java +++ b/src/org/mxchange/jproduct/model/category/ProductCategory.java @@ -60,9 +60,16 @@ public class ProductCategory implements Category { * When this entry has been created */ @Basic (optional = false) - @Column (name = "category_created", updatable = false, nullable = false) + @Column (name = "category_entry_created", updatable = false, nullable = false) @Temporal (TemporalType.TIMESTAMP) - private Date categoryCreated; + private Date categoryEntryCreated; + + /** + * When this entry has been created + */ + @Column (name = "category_entry_updated") + @Temporal (TemporalType.TIMESTAMP) + private Date categoryEntryUpdated; /** * I18n key of category @@ -86,13 +93,6 @@ public class ProductCategory implements Category { @Column (name = "category_in_statistics", nullable = false) private Boolean categoryShownInStatistics; - /** - * When this entry has been created - */ - @Column (name = "category_updated") - @Temporal (TemporalType.TIMESTAMP) - private Date categoryUpdated; - /** * Parent category */ @@ -171,14 +171,26 @@ public class ProductCategory implements Category { @Override @SuppressWarnings ("ReturnOfDateField") - public Date getCategoryCreated () { - return this.categoryCreated; + public Date getCategoryEntryCreated () { + return this.categoryEntryCreated; + } + + @Override + @SuppressWarnings ("AssignmentToDateFieldFromParameter") + public void setCategoryEntryCreated (final Date categoryEntryCreated) { + this.categoryEntryCreated = categoryEntryCreated; + } + + @Override + @SuppressWarnings ("ReturnOfDateField") + public Date getCategoryEntryUpdated () { + return this.categoryEntryUpdated; } @Override @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setCategoryCreated (final Date categoryCreated) { - this.categoryCreated = categoryCreated; + public void setCategoryEntryUpdated (final Date categoryEntryUpdated) { + this.categoryEntryUpdated = categoryEntryUpdated; } @Override @@ -211,18 +223,6 @@ public class ProductCategory implements Category { this.categoryShownInStatistics = categoryShownInStatistics; } - @Override - @SuppressWarnings ("ReturnOfDateField") - public Date getCategoryUpdated () { - return this.categoryUpdated; - } - - @Override - @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setCategoryUpdated (final Date categoryUpdated) { - this.categoryUpdated = categoryUpdated; - } - @Override public Category getParentCategory () { return this.parentCategory; -- 2.39.5