From 2ee4ee83097b861eaba40542cf6d90463e71d3ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Apr 2020 02:11:09 +0200 Subject: [PATCH] Don't cherry-pick: - replaced FaceletException with FacesException MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/receipt/FinancialsReceiptWebRequestBean.java | 6 +++--- .../action/FinancialAdminReceiptActionWebViewBean.java | 8 ++++---- .../FinancialAdminReceiptItemWebRequestBean.java | 6 +++--- .../receipt_item/FinancialsReceiptItemWebRequestBean.java | 6 +++--- .../financial/receipt_item/admin_receipt_item_list.xhtml | 3 --- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java index b365c782..504056df 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java @@ -22,7 +22,7 @@ import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; -import javax.faces.view.facelets.FaceletException; +import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; @@ -154,7 +154,7 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen // Is the receipt already there? if (this.receiptListController.isReceiptAdded(receipt)) { // Receipt has already been added - throw new FaceletException(MessageFormat.format("Receipt for receiptBranchOffice={0},receiptIssued={1},receiptNumber={2} has already been added.", this.getReceiptBranchOffice().getBranchId(), this.getReceiptIssued().toString(), this.getReceiptNumber())); //NOI18N + throw new FacesException(MessageFormat.format("Receipt for receiptBranchOffice={0},receiptIssued={1},receiptNumber={2} has already been added.", this.getReceiptBranchOffice().getBranchId(), this.getReceiptIssued().toString(), this.getReceiptNumber())); //NOI18N } // Init variable @@ -166,7 +166,7 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen updatedReceipt = this.receiptBean.addReceipt(receipt); } catch (final ReceiptAlreadyAddedException ex) { // Throw it again - throw new FaceletException(ex); + throw new FacesException(ex); } // Fire event with updated instance diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java index 422bae2e..eb2a0be4 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java @@ -22,9 +22,9 @@ import java.util.Objects; import javax.ejb.EJB; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; +import javax.faces.FacesException; import javax.faces.application.FacesMessage; import javax.faces.view.ViewScoped; -import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; @@ -188,7 +188,7 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i // Is the receipt already there? if (this.receiptListController.isReceiptAdded(receipt)) { // Receipt has already been added - throw new FaceletException(MessageFormat.format( + throw new FacesException(MessageFormat.format( "Receipt for receiptBranchOffice={0},receiptIssued={1},receiptNumber={2} has already been added.", //NOI18N this.getReceiptBranchOffice().getBranchId(), this.getReceiptIssued().toString(), @@ -205,7 +205,7 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i updatedReceipt = this.adminReceiptBean.addReceipt(receipt); } catch (final ReceiptAlreadyAddedException ex) { // Throw it again - throw new FaceletException(ex); + throw new FacesException(ex); } // Fire event with updated instance @@ -511,7 +511,7 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i updatedReceipt = this.adminReceiptBean.updateReceipt(this.getCurrentReceipt()); } catch (final ReceiptNotFoundException ex) { // Throw as cause - throw new FaceletException(ex); + throw new FacesException(ex); } // Fire event diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java index afaff5aa..aff6b0a0 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java @@ -22,7 +22,7 @@ import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; -import javax.faces.view.facelets.FaceletException; +import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; @@ -158,7 +158,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean // Is the receipt already there? if (this.receiptItemListController.isReceiptItemAdded(receiptItem)) { // Receipt has already been added - throw new FaceletException(MessageFormat.format("Receipt for itemReceipt.receiptId={0},itemProduct.productId={1},itemProductQuantity={2} has already been added.", receiptItem.getItemReceipt().getReceiptId(), receiptItem.getItemProduct().getProductId(), receiptItem.getItemProductQuantity())); //NOI18N + throw new FacesException(MessageFormat.format("Receipt for itemReceipt.receiptId={0},itemProduct.productId={1},itemProductQuantity={2} has already been added.", receiptItem.getItemReceipt().getReceiptId(), receiptItem.getItemProduct().getProductId(), receiptItem.getItemProductQuantity())); //NOI18N } // Init variable @@ -170,7 +170,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean updatedReceiptItem = this.adminReceiptItemBean.addReceiptItem(receiptItem); } catch (final ReceiptItemAlreadyAddedException ex) { // Throw it again - throw new FaceletException(ex); + throw new FacesException(ex); } // Fire event with updated instance diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java index 075353ac..aebad4b0 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java @@ -21,7 +21,7 @@ import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; -import javax.faces.view.facelets.FaceletException; +import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jfinancials.beans.BaseFinancialsBean; @@ -101,7 +101,7 @@ public class FinancialsReceiptItemWebRequestBean extends BaseFinancialsBean impl // Is the receipt already there? if (this.receiptItemListController.isReceiptItemAdded(receiptItem)) { // Receipt has already been added - throw new FaceletException(MessageFormat.format("Receipt for itemReceipt.receiptId={0},itemProduct.productId={1},itemProductQuantity={2} has already been added.", receiptItem.getItemReceipt().getReceiptId(), receiptItem.getItemProduct().getProductId(), receiptItem.getItemProductQuantity())); //NOI18N + throw new FacesException(MessageFormat.format("Receipt for itemReceipt.receiptId={0},itemProduct.productId={1},itemProductQuantity={2} has already been added.", receiptItem.getItemReceipt().getReceiptId(), receiptItem.getItemProduct().getProductId(), receiptItem.getItemProductQuantity())); //NOI18N } // Init variable @@ -113,7 +113,7 @@ public class FinancialsReceiptItemWebRequestBean extends BaseFinancialsBean impl updatedReceiptItem = this.receiptItemBean.addReceiptItem(receiptItem); } catch (final ReceiptItemAlreadyAddedException ex) { // Throw it again - throw new FaceletException(ex); + throw new FacesException(ex); } // Fire event with updated instance diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml index e3c0224b..a25f9e32 100644 --- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml +++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml @@ -2,9 +2,6 @@