From 157152536c4476ed1ca1e2ca53cf70502afbd2fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 7 Oct 2022 20:05:28 +0200 Subject: [PATCH] updated references MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../receipt/BaseFinancialsReceiptEnterpriseBean.java | 4 ++-- .../receipt_item/BaseFinancialsReceiptItemEnterpriseBean.java | 4 ++-- .../model/receipt/FinancialReceiptSessionBean.java | 3 ++- .../receipt_item/FinancialAdminReceiptItemSessionBean.java | 3 ++- .../model/receipt_item/FinancialReceiptItemSessionBean.java | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/enterprise/financial/receipt/BaseFinancialsReceiptEnterpriseBean.java b/src/java/org/mxchange/jfinancials/enterprise/financial/receipt/BaseFinancialsReceiptEnterpriseBean.java index 176cb87..a423839 100644 --- a/src/java/org/mxchange/jfinancials/enterprise/financial/receipt/BaseFinancialsReceiptEnterpriseBean.java +++ b/src/java/org/mxchange/jfinancials/enterprise/financial/receipt/BaseFinancialsReceiptEnterpriseBean.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import java.util.Date; import org.mxchange.jfinancials.enterprise.product.BaseFinancialsProductEnterpriseBean; import org.mxchange.jfinancials.model.receipt.BillableReceipt; -import org.mxchange.jfinancials.model.receipt.Receipts; +import org.mxchange.jfinancials.model.utils.ReceiptUtils; /** * A general bean for receipt-related methods that can be generalized. @@ -74,7 +74,7 @@ public abstract class BaseFinancialsReceiptEnterpriseBean extends BaseFinancials this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeReceipt: foundReceipt.receiptId={0}", foundReceipt.getReceiptId())); //NOI18N // Copy all - Receipts.copyReceiptData(detachedReceipt, foundReceipt); + ReceiptUtils.copyReceiptData(detachedReceipt, foundReceipt); // Merge receipt instance final BillableReceipt managedReceipt = this.getEntityManager().merge(foundReceipt); diff --git a/src/java/org/mxchange/jfinancials/enterprise/financial/receipt_item/BaseFinancialsReceiptItemEnterpriseBean.java b/src/java/org/mxchange/jfinancials/enterprise/financial/receipt_item/BaseFinancialsReceiptItemEnterpriseBean.java index 4ad3656..1ddca30 100644 --- a/src/java/org/mxchange/jfinancials/enterprise/financial/receipt_item/BaseFinancialsReceiptItemEnterpriseBean.java +++ b/src/java/org/mxchange/jfinancials/enterprise/financial/receipt_item/BaseFinancialsReceiptItemEnterpriseBean.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import java.util.Date; import org.mxchange.jfinancials.enterprise.product.BaseFinancialsProductEnterpriseBean; import org.mxchange.jfinancials.model.receipt_item.BillableReceiptItem; -import org.mxchange.jfinancials.model.receipt_item.ReceiptItems; +import org.mxchange.jfinancials.model.utils.ReceiptItemUtils; /** * A general bean for receipt item related methods that can be generalized. @@ -74,7 +74,7 @@ public abstract class BaseFinancialsReceiptItemEnterpriseBean extends BaseFinanc this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeReceipt: foundReceiptItem.itemId={0}", foundReceiptItem.getItemId())); //NOI18N // Copy all - ReceiptItems.copyReceiptItemData(detachedReceiptItem, foundReceiptItem); + ReceiptItemUtils.copyReceiptItemData(detachedReceiptItem, foundReceiptItem); // Merge receipt item instance final BillableReceiptItem managedReceiptItem = this.getEntityManager().merge(foundReceiptItem); diff --git a/src/java/org/mxchange/jfinancials/model/receipt/FinancialReceiptSessionBean.java b/src/java/org/mxchange/jfinancials/model/receipt/FinancialReceiptSessionBean.java index 598fc1a..a19e126 100644 --- a/src/java/org/mxchange/jfinancials/model/receipt/FinancialReceiptSessionBean.java +++ b/src/java/org/mxchange/jfinancials/model/receipt/FinancialReceiptSessionBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.jfinancials.model.receipt; +import org.mxchange.jfinancials.model.utils.ReceiptUtils; import java.text.MessageFormat; import java.util.Date; import java.util.LinkedList; @@ -168,7 +169,7 @@ public class FinancialReceiptSessionBean extends BaseFinancialsEnterpriseBean im // Yes, then stop searching isFound = true; break; - } else if (Receipts.isSameReceipt(foundReceipt, receipt)) { + } else if (ReceiptUtils.isSameReceipt(foundReceipt, receipt)) { // Yes, then stop searching isFound = true; break; diff --git a/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialAdminReceiptItemSessionBean.java b/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialAdminReceiptItemSessionBean.java index 20c16cc..5fae61e 100644 --- a/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialAdminReceiptItemSessionBean.java +++ b/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialAdminReceiptItemSessionBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.jfinancials.model.receipt_item; +import org.mxchange.jfinancials.model.utils.ReceiptItemUtils; import java.text.MessageFormat; import java.util.Date; import java.util.Objects; @@ -169,7 +170,7 @@ public class FinancialAdminReceiptItemSessionBean extends BaseFinancialsReceiptI */ for (final BillableReceiptItem currentReceiptItem : this.receiptItemBean.fetchReceiptItemsByReceipt(receiptItem.getItemReceipt())) { // Is it the same item? - if (((checkOnlyPrimaryKey && Objects.equals(currentReceiptItem.getItemId(), receiptItem.getItemId())) || ReceiptItems.isSameReceiptItem(currentReceiptItem, receiptItem)) && (checkDiscountRefund || !currentReceiptItem.getItemIsRefund())) { + if (((checkOnlyPrimaryKey && Objects.equals(currentReceiptItem.getItemId(), receiptItem.getItemId())) || ReceiptItemUtils.isSameReceiptItem(currentReceiptItem, receiptItem)) && (checkDiscountRefund || !currentReceiptItem.getItemIsRefund())) { // Found it isFound = true; break; diff --git a/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItemSessionBean.java b/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItemSessionBean.java index e15d154..83daf93 100644 --- a/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItemSessionBean.java +++ b/src/java/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItemSessionBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.jfinancials.model.receipt_item; +import org.mxchange.jfinancials.model.utils.ReceiptItemUtils; import java.text.MessageFormat; import java.util.Date; import java.util.LinkedList; @@ -176,7 +177,7 @@ public class FinancialReceiptItemSessionBean extends BaseFinancialsEnterpriseBea */ for (final BillableReceiptItem item : this.fetchReceiptItemsByReceipt(receiptItem.getItemReceipt())) { // Is it the same item? - if (ReceiptItems.isSameReceiptItem(item, receiptItem)) { + if (ReceiptItemUtils.isSameReceiptItem(item, receiptItem)) { // Found it isFound = true; break; -- 2.39.5