Don't cherry-pick:

- replaced FaceletException with FacesException

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

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 b365c782ba7d953bd5d9a617c5e7c964b1da796e..504056dfd05d1c4bd342ca8a08518bb3d0dfb454 100644 (file)
--- 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 422bae2e5ff92781006d1a00efb071e9fc9c617d..eb2a0be4e9da0907e07d984c7282f3a60bbde18e 100644 (file)
--- 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 afaff5aa8d2384db430012063dc282d080a4620d..aff6b0a0e32831f5d3ea65aa5a4284d5eb7ca68d 100644 (file)
--- 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 075353ac04b53fd1944fea5e932a7bd91e49cb30..aebad4b08d739febbf890f5228233df53c55044b 100644 (file)
--- 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 e3c0224b82aed87a4246ee91e1db9964975d8d2a..a25f9e32ffdf0f13af6f08327b74115afd16a5db 100644 (file)
--- 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 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"