From: Roland Häder <roland@mxchange.org>
Date: Fri, 24 Apr 2020 16:07:00 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ecd23d6e8bbad0a1c26810d62e52922e7ae7cd3d;p=jfinancials-core.git

Don't cherry-pick:
- renamed receiptCreated to receiptEntryCreated
- renamed receiptUpdated to receiptEntryUpdated

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
index b85d220..478a10c 100644
--- a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
@@ -64,28 +64,28 @@ public interface BillableReceipt extends Comparable<BillableReceipt>, Serializab
 	 * <p>
 	 * @return Receipt creation timestamp
 	 */
-	Date getReceiptCreated ();
+	Date getReceiptEntryCreated ();
 
 	/**
 	 * Setter for when this receipt has been created in database
 	 * <p>
 	 * @param receiptUpdated Receipt updated timestamp
 	 */
-	void setReceiptUpdated (final Date receiptUpdated);
+	void setReceiptEntryUpdated (final Date receiptUpdated);
 
 	/**
 	 * Getter for when this receipt has been updated in database
 	 * <p>
 	 * @return Receipt updated timestamp
 	 */
-	Date getReceiptUpdated ();
+	Date getReceiptEntryUpdated ();
 
 	/**
 	 * Setter for when this receipt has been updated in database
 	 * <p>
 	 * @param receiptCreated Receipt creation timestamp
 	 */
-	void setReceiptCreated (final Date receiptCreated);
+	void setReceiptEntryCreated (final Date receiptCreated);
 
 	/**
 	 * Getter for when this receipt has been issued (as written on it)
diff --git a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
index 24f000b..eb8ffc6 100644
--- a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
@@ -101,8 +101,15 @@ public class FinancialReceipt implements BillableReceipt {
 	 */
 	@Basic (optional = false)
 	@Temporal (TemporalType.TIMESTAMP)
-	@Column (name = "receipt_created", nullable = false)
-	private Date receiptCreated;
+	@Column (name = "receipt_entrt_created", nullable = false)
+	private Date receiptEntryCreated;
+
+	/**
+	 * When this receipt entry has been updated
+	 */
+	@Temporal (TemporalType.TIMESTAMP)
+	@Column (name = "receipt_entry_updated")
+	private Date receiptEntryUpdated;
 
 	/**
 	 * Primary key
@@ -159,13 +166,6 @@ public class FinancialReceipt implements BillableReceipt {
 	@Column (name = "receipt_transaction_number")
 	private Long receiptTransactionNumber;
 
-	/**
-	 * When this receipt entry has been updated
-	 */
-	@Temporal (TemporalType.TIMESTAMP)
-	@Column (name = "receipt_updated")
-	private Date receiptUpdated;
-
 	/**
 	 * Which user this receipt belongs to
 	 */
@@ -361,14 +361,26 @@ public class FinancialReceipt implements BillableReceipt {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Date getReceiptCreated () {
-		return this.receiptCreated;
+	public Date getReceiptEntryCreated () {
+		return this.receiptEntryCreated;
+	}
+
+	@Override
+	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
+	public void setReceiptEntryCreated (final Date receiptEntryCreated) {
+		this.receiptEntryCreated = receiptEntryCreated;
+	}
+
+	@Override
+	@SuppressWarnings ("ReturnOfDateField")
+	public Date getReceiptEntryUpdated () {
+		return this.receiptEntryUpdated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setReceiptCreated (final Date receiptCreated) {
-		this.receiptCreated = receiptCreated;
+	public void setReceiptEntryUpdated (final Date receiptEntryUpdated) {
+		this.receiptEntryUpdated = receiptEntryUpdated;
 	}
 
 	@Override
@@ -453,18 +465,6 @@ public class FinancialReceipt implements BillableReceipt {
 		this.receiptTransactionNumber = receiptTransactionNumber;
 	}
 
-	@Override
-	@SuppressWarnings ("ReturnOfDateField")
-	public Date getReceiptUpdated () {
-		return this.receiptUpdated;
-	}
-
-	@Override
-	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setReceiptUpdated (final Date receiptUpdated) {
-		this.receiptUpdated = receiptUpdated;
-	}
-
 	@Override
 	public User getReceiptUser () {
 		return this.receiptUser;
diff --git a/src/org/mxchange/jfinancials/model/receipt/Receipts.java b/src/org/mxchange/jfinancials/model/receipt/Receipts.java
index 32b1c86..fe9748d 100644
--- a/src/org/mxchange/jfinancials/model/receipt/Receipts.java
+++ b/src/org/mxchange/jfinancials/model/receipt/Receipts.java
@@ -81,7 +81,8 @@ public class Receipts implements Serializable {
 		targetReceipt.setReceiptBarCodeNumber(sourceReceipt.getReceiptBarCodeNumber());
 		targetReceipt.setReceiptBonusCard(sourceReceipt.getReceiptBonusCard());
 		targetReceipt.setReceiptBranchOffice(sourceReceipt.getReceiptBranchOffice());
-		targetReceipt.setReceiptCreated(sourceReceipt.getReceiptCreated());
+		targetReceipt.setReceiptEntryCreated(sourceReceipt.getReceiptEntryCreated());
+		targetReceipt.setReceiptEntryUpdated(sourceReceipt.getReceiptEntryUpdated());
 		targetReceipt.setReceiptId(sourceReceipt.getReceiptId());
 		targetReceipt.setReceiptIssued(sourceReceipt.getReceiptIssued());
 		targetReceipt.setReceiptNumber(sourceReceipt.getReceiptNumber());
@@ -90,7 +91,6 @@ public class Receipts implements Serializable {
 		targetReceipt.setReceiptSellerEmployee(sourceReceipt.getReceiptSellerEmployee());
 		targetReceipt.setReceiptSequenceNumber(sourceReceipt.getReceiptSequenceNumber());
 		targetReceipt.setReceiptTransactionNumber(sourceReceipt.getReceiptTransactionNumber());
-		targetReceipt.setReceiptUpdated(sourceReceipt.getReceiptUpdated());
 		targetReceipt.setReceiptUser(sourceReceipt.getReceiptUser());
 	}