From: Roland Haeder <roland@mxchange.org>
Date: Wed, 16 Sep 2015 09:02:13 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96ec2c3853f6f2c0822425ce4cda91b88fc117ce;p=pizzaservice-war.git

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 55692816..e3ad7439 100644
--- 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 213cc924..d9c540d4 100644
--- 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 32841780..18fce240 100644
--- 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 28808ea1..d36c2595 100644
--- 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 9c4425a5..6adf22c0 100644
--- 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 891cce60..211dbbac 100644
--- 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