Continued:

- need to change java.util.Calendar (bye bye) to java.util.Date in favour of
  PrimeFaces' p:calendar [!] tag

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

diff --git a/src/org/mxchange/jfinancials/model/income/BillableIncome.java b/src/org/mxchange/jfinancials/model/income/BillableIncome.java
index bd166a3540200e7133783eff7ffa3b80e55d172f..7953247aa292ea1f8d7af4857d159b18a69bf2f9 100644 (file)
--- a/src/org/mxchange/jfinancials/model/income/BillableIncome.java
+++ b/src/org/mxchange/jfinancials/model/income/BillableIncome.java
@@ -17,7 +17,7 @@
 package org.mxchange.jfinancials.model.income;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
 import org.mxchange.jusercore.model.user.User;
 
@@ -47,14 +47,14 @@ public interface BillableIncome extends Serializable {
         * <p>
         * @return Income-created timestamp
         */
-       Calendar getIncomeCreated ();
+       Date getIncomeCreated ();
 
        /**
         * Setter for income-created timestamp
         * <p>
         * @param incomeCreated Income-created timestamp
         */
-       void setIncomeCreated (final Calendar incomeCreated);
+       void setIncomeCreated (final Date incomeCreated);
 
        /**
         * Getter for whether income is enabled
@@ -117,14 +117,14 @@ public interface BillableIncome extends Serializable {
         * <p>
         * @return Income-updated timestamp
         */
-       Calendar getIncomeUpdated ();
+       Date getIncomeUpdated ();
 
        /**
         * Setter for income-updated timestamp
         * <p>
         * @param incomeUpdated Income-updated timestamp
         */
-       void setIncomeUpdated (final Calendar incomeUpdated);
+       void setIncomeUpdated (final Date incomeUpdated);
 
        /**
         * Getter for connected user account

diff --git a/src/org/mxchange/jfinancials/model/income/FinancialIncome.java b/src/org/mxchange/jfinancials/model/income/FinancialIncome.java
index cce75477b4f6f2bfbcd45ffc2d590fa6078c3c22..73dfc9652d55b8cefe8bb8b5f39ee9a8132d13b9 100644 (file)
--- a/src/org/mxchange/jfinancials/model/income/FinancialIncome.java
+++ b/src/org/mxchange/jfinancials/model/income/FinancialIncome.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jfinancials.model.income;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -59,7 +59,7 @@ public class FinancialIncome implements BillableIncome {
        @Basic (optional = false)
        @Temporal (TemporalType.TIMESTAMP)
        @Column (name = "income_created", nullable = false, updatable = false)
-       private Calendar incomeCreated;
+       private Date incomeCreated;
 
        /**
         * Income enabled (default) or disabled (no longer receiving income but need
@@ -104,7 +104,7 @@ public class FinancialIncome implements BillableIncome {
         */
        @Temporal (TemporalType.TIMESTAMP)
        @Column (name = "income_updated", insertable = false)
-       private Calendar incomeUpdated;
+       private Date incomeUpdated;
 
        /**
         * Connected user account
@@ -166,13 +166,13 @@ public class FinancialIncome implements BillableIncome {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getIncomeCreated () {
+       public Date getIncomeCreated () {
                return this.incomeCreated;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setIncomeCreated (Calendar incomeCreated) {
+       public void setIncomeCreated (Date incomeCreated) {
                this.incomeCreated = incomeCreated;
        }
 
@@ -228,13 +228,13 @@ public class FinancialIncome implements BillableIncome {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getIncomeUpdated () {
+       public Date getIncomeUpdated () {
                return this.incomeUpdated;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setIncomeUpdated (Calendar incomeUpdated) {
+       public void setIncomeUpdated (Date incomeUpdated) {
                this.incomeUpdated = incomeUpdated;
        }
 

diff --git a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
index 06b33ff7f82efea74a1ab8744fd176d09221c60a..cb58bf65656cd1be259c2d0cdf31dafb700ab221 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
@@ -17,7 +17,7 @@
 package org.mxchange.jfinancials.model.receipt;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jproduct.model.payment.PaymentType;
 import org.mxchange.jusercore.model.user.User;
@@ -34,28 +34,28 @@ public interface BillableReceipt extends Serializable {
         * <p>
         * @return Receipt creation timestamp
         */
-       Calendar getReceiptCreated ();
+       Date getReceiptCreated ();
 
        /**
         * Setter for when this receipt has been created in database
         * <p>
         * @param receiptCreated Receipt creation timestamp
         */
-       void setReceiptCreated (final Calendar receiptCreated);
+       void setReceiptCreated (final Date receiptCreated);
 
        /**
         * Getter for when this receipt has been issued (as written on it)
         * <p>
         * @return Receipt issue timestamp
         */
-       Calendar getReceiptIssued ();
+       Date getReceiptIssued ();
 
        /**
         * Setter for when this receipt has been issued (as written on it)
         * <p>
         * @param receiptIssued Receipt issue timestamp
         */
-       void setReceiptIssued (final Calendar receiptIssued);
+       void setReceiptIssued (final Date receiptIssued);
 
        /**
         * Getter for primary key

diff --git a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
index ede7bedfa8154107a5893ee317d80fe2326c2690..7993c96a9f41d7a9fa58494715d57c98bd21f29c 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
@@ -17,7 +17,7 @@
 package org.mxchange.jfinancials.model.receipt;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -78,7 +78,7 @@ public class FinancialReceipt implements BillableReceipt {
        @Basic (optional = false)
        @Temporal (TemporalType.TIMESTAMP)
        @Column (name = "receipt_created", nullable = false)
-       private Calendar receiptCreated;
+       private Date receiptCreated;
 
        /**
         * Primary key
@@ -94,7 +94,7 @@ public class FinancialReceipt implements BillableReceipt {
        @Basic (optional = false)
        @Temporal (TemporalType.DATE)
        @Column (name = "receipt_issued", nullable = false)
-       private Calendar receiptIssued;
+       private Date receiptIssued;
 
        /**
         * Receipt number
@@ -134,7 +134,7 @@ public class FinancialReceipt implements BillableReceipt {
         * @throws NullPointerException If user instance is not set
         * @throws IllegalArgumentException If user instance's userId is invalid
         */
-       public FinancialReceipt (final PaymentType receiptPaymentType, final BranchOffice receiptBranchOffice, final User receiptUser, final Calendar receiptIssued) {
+       public FinancialReceipt (final PaymentType receiptPaymentType, final BranchOffice receiptBranchOffice, final User receiptUser, final Date receiptIssued) {
                // Call other constructor first
                this(receiptPaymentType, receiptBranchOffice, receiptIssued);
 
@@ -164,7 +164,7 @@ public class FinancialReceipt implements BillableReceipt {
         * @throws NullPointerException If user instance is not set
         * @throws IllegalArgumentException If branchId is invalid
         */
-       public FinancialReceipt (final PaymentType receiptPaymentType, final BranchOffice receiptBranchOffice, final Calendar receiptIssued) {
+       public FinancialReceipt (final PaymentType receiptPaymentType, final BranchOffice receiptBranchOffice, final Date receiptIssued) {
                // Call other constructor first
                this();
 
@@ -234,13 +234,13 @@ public class FinancialReceipt implements BillableReceipt {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getReceiptCreated () {
+       public Date getReceiptCreated () {
                return this.receiptCreated;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setReceiptCreated (final Calendar receiptCreated) {
+       public void setReceiptCreated (final Date receiptCreated) {
                this.receiptCreated = receiptCreated;
        }
 
@@ -256,13 +256,13 @@ public class FinancialReceipt implements BillableReceipt {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getReceiptIssued () {
+       public Date getReceiptIssued () {
                return this.receiptIssued;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setReceiptIssued (final Calendar receiptIssued) {
+       public void setReceiptIssued (final Date receiptIssued) {
                this.receiptIssued = receiptIssued;
        }
 

diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java
index 4564c541ccac73b1d34fb5274ebeddcb9314499e..98020675b27ae9b090677874d902081e68207811 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java
+++ b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java
@@ -17,7 +17,7 @@
 package org.mxchange.jfinancials.model.receipt.entry;
 
 import java.io.Serializable;
-import java.util.Calendar;
+import java.util.Date;
 import org.mxchange.jfinancials.model.receipt.BillableReceipt;
 import org.mxchange.jproduct.model.product.Product;
 
@@ -33,14 +33,14 @@ public interface BillableReceiptEntry extends Serializable {
         * <p>
         * @return When this entry has been created
         */
-       Calendar getEntryCreated ();
+       Date getEntryCreated ();
 
        /**
         * Setter when this receipt entry has been created in database
         * <p>
         * @param entryCreated When this entry has been created
         */
-       void setEntryCreated (final Calendar entryCreated);
+       void setEntryCreated (final Date entryCreated);
 
        /**
         * Getter for primary key

diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java
index c0bc97748a7b7f3d898e7928338dca71bc720963..b17f7ce079012fdd938c5ae69fd074106cb0c745 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java
+++ b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java
@@ -16,7 +16,7 @@
  */
 package org.mxchange.jfinancials.model.receipt.entry;
 
-import java.util.Calendar;
+import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -64,7 +64,7 @@ public class ReceiptEntry implements BillableReceiptEntry {
        @Basic (optional = false)
        @Temporal (TemporalType.TIMESTAMP)
        @Column (name = "entry_created", nullable = false)
-       private Calendar entryCreated;
+       private Date entryCreated;
 
        /**
         * Primary key
@@ -156,13 +156,13 @@ public class ReceiptEntry implements BillableReceiptEntry {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getEntryCreated () {
+       public Date getEntryCreated () {
                return this.entryCreated;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setEntryCreated (final Calendar entryCreated) {
+       public void setEntryCreated (final Date entryCreated) {
                this.entryCreated = entryCreated;
        }