From 0f7f7b5045590a143eb53acaa71ff45f2e1177cd Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 12 Oct 2015 17:15:18 +0200 Subject: [PATCH] non-final, better? --- .../beans/category/AdminCategoryWebBean.java | 17 ++++----- .../beans/country/CountryWebBean.java | 2 +- .../beans/customer/CustomerWebBean.java | 2 +- .../beans/product/AdminProductWebBean.java | 35 ++++++++++--------- .../servlet/receipt/PdfReceiptServlet.java | 2 +- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java index 33b3d1d7..33ceaca5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java @@ -47,14 +47,7 @@ public class AdminCategoryWebBean implements AdminCategoryWebController { /** * Remote bean for categories */ - private final AdminCategorySessionBeanRemote categoryBean; - - ////////////////////// Bean injections /////////////////////// - /** - * Shop bean - */ - @Inject - private ShopWebController shopController; + private AdminCategorySessionBeanRemote categoryBean; /////////////////////// Properties ///////////////////// /** @@ -67,6 +60,14 @@ public class AdminCategoryWebBean implements AdminCategoryWebController { */ private Category parentCategory; + ////////////////////// Bean injections /////////////////////// + + /** + * Shop bean + */ + @Inject + private ShopWebController shopController; + /** * Default constructor */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java index bba9b955..e55683b3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java @@ -45,7 +45,7 @@ public class CountryWebBean implements CountryWebController { /** * Remote country EJB */ - private final CountrySingletonBeanRemote countryBean; + private CountrySingletonBeanRemote countryBean; /** * List of all countries diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index 1774208d..7e0710b9 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -71,7 +71,7 @@ public class CustomerWebBean implements CustomerWebController { /** * Remote customer bean */ - private final CustomerSessionBeanRemote customerBean; + private CustomerSessionBeanRemote customerBean; /** * Email address diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java index 0ec98444..3d2b74c5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java @@ -46,18 +46,6 @@ public class AdminProductWebBean implements AdminProductWebController { */ private static final long serialVersionUID = 5_819_375_183_472_871L; - /** - * Remote bean for products - */ - private final AdminProductSessionBeanRemote productRemoteBean; - - ////////////////////// Bean injections /////////////////////// - /** - * Shop bean - */ - @Inject - private ShopWebController shopController; - /////////////////////// Properties ///////////////////// /** * Available @@ -74,11 +62,24 @@ public class AdminProductWebBean implements AdminProductWebController { */ private Float productPrice; + /** + * Remote bean for products + */ + private AdminProductSessionBeanRemote productRemoteBean; + /** * Property productTitle */ private String productTitle; + ////////////////////// Bean injections /////////////////////// + + /** + * Shop bean + */ + @Inject + private ShopWebController shopController; + /** * Default constructor */ @@ -131,6 +132,11 @@ public class AdminProductWebBean implements AdminProductWebController { return this.productRemoteBean.getAllProducts(); } + @Override + public Boolean getProductAvailability () { + return this.productAvailability; + } + @Override public void setProductAvailability (final Boolean productAvailability) { this.productAvailability = productAvailability; @@ -165,9 +171,4 @@ public class AdminProductWebBean implements AdminProductWebController { public void setProductTitle (final String productTitle) { this.productTitle = productTitle; } - - @Override - public Boolean getProductAvailability () { - return this.productAvailability; - } } diff --git a/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java b/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java index db32ccae..a1e9827f 100644 --- a/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java +++ b/src/java/org/mxchange/pizzaapplication/servlet/receipt/PdfReceiptServlet.java @@ -43,7 +43,7 @@ public class PdfReceiptServlet extends HttpServlet { /** * Remote bean */ - private final ReceiptBeanRemote receiptBean; + private ReceiptBeanRemote receiptBean; /** * Public constructor -- 2.39.5