Continued:

- opps, wrong check on null ...
- minor: sorted fields/attributes
- minor: wording fixed

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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 55692816e06d1c83ac92376a013143140ef8cd33..e3ad74390e5e079040ab23fb755893306b4c4148 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -127,7 +127,7 @@ PRIVACY_TERMS_LEGEND_TITLE=Bitte die AGBs und Datenschutzbestimmungen lesen und
 PRIVACY_TERMS_LEGEND=Rechtliches:
 PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen.
 TERMS_NOT_ACCEPTED_MESSAGE=Bitte den AGBs zustimmen.
-PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein:
+PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer an.
 PERSONAL_DATA_GENDER=Anrede:
 PERSONAL_DATA_COMPANY_NAME=Firmenname:
 PERSONAL_DATA_FIRST_NAME=Vorname:

diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java
index 213cc9246f4fdfd403cc5d09b8c925427e76ca40..d9c540d4273ba6617dfe9c6bb96b55e8ee2d00eb 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java
@@ -48,11 +48,6 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl
         */
        private static final long serialVersionUID = 5_476_347_320_198L;
 
-       /**
-        * Ordered amount
-        */
-       private Long amount;
-
        /**
         * Instance of wrapped basket
         */
@@ -63,6 +58,12 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl
         */
        private final BasketSessionBeanRemote basketBean;
 
+       /////////////////////// Properties /////////////////////
+       /**
+        * Ordered amount
+        */
+       private Long amount;
+
        /**
         * Current item
         */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
index 3284178082e54ffaabcb2075b6f7be49e5679e5f..18fce240e9bebb17a21c5998ad91247216cf13c1 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
@@ -49,12 +49,14 @@ public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCate
         */
        private final AdminCategorySessionBeanRemote categoryBean;
 
+       ////////////////////// Bean injections ///////////////////////
        /**
         * Shop bean
         */
        @Inject
        private ShopWebController controller;
 
+       /////////////////////// Properties /////////////////////
        /**
         * Category title
         */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java
index 28808ea1dfb6cb5cd1e706ef646ed0b3e5505631..d36c25953d24ebf6667f5717b4f381b3d8931d24 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java
@@ -147,7 +147,7 @@ public class CheckoutWebBean extends BaseFrameworkBean implements CheckoutWebCon
        @Override
        public String doCheckout () {
                // Is the bean set?
-               if (this.basketController != null) {
+               if (null == this.basketController) {
                        // Abort here
                        throw new NullPointerException("basketController is null"); //NOI18N
                }

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
index 9c4425a52090a8ad74d11df714df4ad98dece8be..6adf22c0e264ddc9bdac2886f9e5bc3d63839362 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -44,6 +44,7 @@ public class CustomerWebBean extends BaseFrameworkBean implements CustomerWebCon
         */
        private final CustomerSessionBeanRemote customerBean;
 
+       /////////////////////// Properties /////////////////////
        /**
         * Cellphone number
         */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java
index 891cce60fd745277009b468a7a6587fc57a00429..211dbbac8bdb549ebbcae7c1c4ad914ea894713a 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java
@@ -47,30 +47,32 @@ public class AdminProductWebBean extends BaseFrameworkBean implements AdminProdu
        private static final long serialVersionUID = 5_819_375_183_472_871L;
 
        /**
-        * Property available
+        * Remote bean for products
         */
-       private Boolean available;
+       private final AdminProductSessionBeanRemote productBean;
 
+       ////////////////////// Bean injections ///////////////////////
        /**
-        * Category id
+        * Shop bean
         */
-       private Long id;
+       @Inject
+       private ShopWebController controller;
 
+       /////////////////////// Properties /////////////////////
        /**
-        * Property price
+        * Available
         */
-       private Float price;
+       private Boolean available;
 
        /**
-        * Remote bean for products
+        * Category id
         */
-       private final AdminProductSessionBeanRemote productBean;
+       private Long id;
 
        /**
-        * Shop bean
+        * Property price
         */
-       @Inject
-       private ShopWebController controller;
+       private Float price;
 
        /**
         * Property title