From 266c973f81895eae08fdb5f537d5b5bc2894f137 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 25 Sep 2015 14:34:15 +0200
Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20category=20converter=20?=
 =?utf8?q?-=20updated=20controller=20properties=20to=20latest=20API=20chan?=
 =?utf8?q?ges=20(e.g.=20house=20number=20can=20be=20Short)=20-=20renamed?=
 =?utf8?q?=20some=20attributes=20for=20better=20reading=20-=20handled=20ov?=
 =?utf8?q?er=20updated=20objects=20other=20beans=20-=20added=20<f:selectIt?=
 =?utf8?q?em=20/>=20to=20have=20a=20"null=20category"=20back,=20thanks=20t?=
 =?utf8?q?o=20my=20teacher=20-=20removed=20no=20longer=20"null=20category"?=
 =?utf8?q?=20stuff=20from=20controller=20-=20renamed=20more=20in=20templat?=
 =?utf8?q?es=20-=20updated=20jars=20Signed-off-by:Roland=20H=C3=A4der=20<r?=
 =?utf8?q?oland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcore.jar                                 | Bin 31990 -> 32286 bytes
 lib/jcoreee.jar                               | Bin 17745 -> 17745 bytes
 lib/jshop-core.jar                            | Bin 46076 -> 48641 bytes
 lib/jshop-ee-lib.jar                          | Bin 7308 -> 7400 bytes
 .../beans/category/AdminCategoryWebBean.java  |   6 +++---
 .../beans/customer/CustomerWebBean.java       |   6 +++---
 .../beans/customer/CustomerWebController.java |   4 ++--
 .../beans/product/AdminProductWebBean.java    |  12 ++++++------
 .../beans/shop/ShopWebBean.java               |  13 +------------
 .../admin/admin_category_selection_box.tpl    |   6 +++---
 .../admin_parent_category_selection_box.tpl   |   3 ++-
 11 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 2223e57f31b8a3d8f755f4d75191b1e49172076b..a59d0c6d95b82ca1a27d0f31a2525956e8ba2819 100644
GIT binary patch
delta 7115
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

delta 7072
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
bGg~ow?C2gEKW$Ttyun}G86Q~G!@d6p(F)k)

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 37a902e7e287344bf9e0d02609a517bc832822dc..648886a7db3c89adffaf81a8a240feabc2ae530a 100644
GIT binary patch
delta 333
zcmccE#dxuckte{LnT3mifrEkJVah}vO{NDa6V0bH0ofN6K;$P)AURo<(GWxhFj|AC
zUPcEHb)L}=M9DKbL3oCf1DMz+>GGf$36wURyv~Jv@@pn8kh1Sg9zbfdBXckdh@QrN
zmIFkm3QXbw(LZI>SV6R+(tb`5{Yd)_SltDKMzFeI%YPvL<X}5Xpi3wB*@0bh!Oj3A
z$YgH`qHOIQK~#giH;6iG9{{4{9pXS#y+aU$Co}oI1K8d54l<Md9nC<Z?T!&3>Y-yW
lh%$3Z0a0_DvOpAvb0diAcFqJ*-<-=qRK80#h`Qra3ILF@f205a

delta 333
zcmccE#dxuckte{LnT3mifrEj;H+mwECX-L}MDyuPK=uU%5cx?HNKTezGz3urjMgBk
zm(c-4ooDm|QSwYq5T4=W04DZHx;!XG0;LTnuXACa{F;dir0hGB2awwA$Q;Z9qNlN+
z<p9yC0+V<^^iLTzRuHYIw4W11Khk~!R(HXm5v(rQ@*jvlIoQq;=+eo3c3_uWurmM&
zGTB>#C|i3+5Y=Gs4WiE42Y@Jfhd2;b?+^sx$xMFl0Cso1gUn=qM>CLUyJG~1dgvGo
lqRgC9K-3(kED*)v+z6t&oijnyH|KH?mG6=bqVBkq0sv~&XB+?k

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index 539bac1dd5b4261de6f544241490c07f02820210..95145fbb52578c38bb7fb40734674103bf1fd9b4 100644
GIT binary patch
delta 4728
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

delta 3124
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
GN%{{(%$1Y?

diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index fd9eff88281d61484ea708bcc35363f55d3fd80b..780a05cc5b021339a9863f60c0bee0a9ba6f471d 100644
GIT binary patch
delta 587
zcmeCNd|}BG;LXg!#lXP9z|dPfkw=rMr+A|IbS5DCf&z&AqzNP^%Q6~+s31m55Y@}*
z0HV$_x`C)@CWFZrI5;NzGjTz<P9SPNlOu%EpS(bj1I3ojs?0e|yuHPi?#xEBxs8|@
z7>p**W36UPn#{<e05nRFQFHP}4uj3UZ0i|;W^De){tisP<6Ofe2-0S*Iw5U6P#Xw)
zOipA}m>kEaI{5?7GR8Qd5%QDscm=>l$bnd!Pw?&nYj5Fy4W<hP`I$k+Hi>Y6_>+4?
zErFh%d|VXlDNZp1kf5~~*r#P;&LG}yF;5W1CLREyBE-W$)CTb&2qiOFLBb5gTrD9p
zxkSPg!VCma|0HtJJX#@{tpM`FeE014y^O#>2Vz$S1X$9j$T7K5P=4}x4#CNG9O9GX
zC3!$5MM%jo337pD6j%f&>v4f)z(%122f`$VC5`)ez#1T-!v-_TQCf!S3O`t;PTB};
v#2?XrbG8FR6NGJ0j5sI=RA>j&DkCGqbV&p#qCQzylz(!8j2PQ3QIL87#<{6x

delta 548
zcmaE1*<;BQ;LXg!#lXP9z>pa|kw=p$BYL9wbS5DCf&z&AqzNP^%Q6~+s31m55Y@}*
z0HV$_x`C)@CWFcUIXEW!GjTz<P9SPNlOu%EpWGnCfnv*MRpuNf-ppuA_aBzA8O%%!
z49t_~u~su0PiACM02(F8q#3rkhHX6~(16Xl9PhxiEY}()L6DyEdj+eSfO<gKV{#&+
z!eo8{j>$RF%9G!-a!%Icoz7?oG)EpN%Fk>KG)RSS7ubLY{I9|ESwVhgkiqvvI6(Z#
zFGMYYex9r>2KG~`m;p#|x)|7_m&BYwJaKVP5S1hz0HU^thk>XB37N?n5@rx)5LiMY
z5Ja&{f~hFUTr@vkk<13kJ4(qgePW;dfnR=dos@|J$WN0V$iDCf`Uiwv84zGe<0DS6
zLIoDV$+2AGlVo_n>QTY~p`2k!;{+a{dUarM=!2}9D=ouR!4DL11?mI|@X5$9r3!+L
f1jfo_79o(4Ac+c~M41RwLVWTW88NmxQIN?1Cxe*8

diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
index 3232a844..ba3a6445 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
@@ -54,7 +54,7 @@ public class AdminCategoryWebBean implements AdminCategoryWebController {
 	 * Shop bean
 	 */
 	@Inject
-	private ShopWebController controller;
+	private ShopWebController shopController;
 
 	/////////////////////// Properties /////////////////////
 	/**
@@ -93,10 +93,10 @@ public class AdminCategoryWebBean implements AdminCategoryWebController {
 			category.setCategoryTitle(this.getCategoryTitle());
 
 			// Deligate to remote bean
-			this.categoryBean.doAdminAddCategory(category);
+			Category updatedCategory = this.categoryBean.doAdminAddCategory(category);
 
 			// Also send it to the controller bean
-			this.controller.addCategory(category);
+			this.shopController.addCategory(updatedCategory);
 		} catch (final CategoryTitleAlreadyUsedException | CannotAddCategoryException ex) {
 			// Continue to throw
 			throw new FaceletException(ex);
diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
index b9ccd5cc..eb946987 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -102,7 +102,7 @@ public class CustomerWebBean implements CustomerWebController {
 	/**
 	 * House number
 	 */
-	private Long houseNumber;
+	private Short houseNumber;
 
 	/**
 	 * Phone number
@@ -261,12 +261,12 @@ public class CustomerWebBean implements CustomerWebController {
 	}
 
 	@Override
-	public Long getHouseNumber () {
+	public Short getHouseNumber () {
 		return this.houseNumber;
 	}
 
 	@Override
-	public void setHouseNumber (final Long houseNumber) {
+	public void setHouseNumber (final Short houseNumber) {
 		this.houseNumber = houseNumber;
 	}
 
diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
index cc6c07ea..cdc51756 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
@@ -165,14 +165,14 @@ public interface CustomerWebController extends Serializable {
 	 *
 	 * @return the houseNumber
 	 */
-	public Long getHouseNumber ();
+	public Short getHouseNumber ();
 
 	/**
 	 * House number
 	 *
 	 * @param houseNumber the houseNumber to set
 	 */
-	public void setHouseNumber (final Long houseNumber);
+	public void setHouseNumber (final Short houseNumber);
 
 	/**
 	 * Phone number
diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java
index 8c6b654c..49392973 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java
@@ -49,14 +49,14 @@ public class AdminProductWebBean implements AdminProductWebController {
 	/**
 	 * Remote bean for products
 	 */
-	private final AdminProductSessionBeanRemote productBean;
+	private final AdminProductSessionBeanRemote productRemoteBean;
 
 	////////////////////// Bean injections ///////////////////////
 	/**
 	 * Shop bean
 	 */
 	@Inject
-	private ShopWebController controller;
+	private ShopWebController shopController;
 
 	/////////////////////// Properties /////////////////////
 	/**
@@ -89,7 +89,7 @@ public class AdminProductWebBean implements AdminProductWebController {
 			Context context = new InitialContext();
 
 			// Try to lookup the bean
-			this.productBean = (AdminProductSessionBeanRemote) context.lookup("ejb/stateless-admin-product"); //NOI18N
+			this.productRemoteBean = (AdminProductSessionBeanRemote) context.lookup("ejb/stateless-admin-product"); //NOI18N
 		} catch (final NamingException e) {
 			// Throw it again
 			throw new FaceletException(e);
@@ -109,10 +109,10 @@ public class AdminProductWebBean implements AdminProductWebController {
 			product.setProductTitle(this.getProductTitle());
 
 			// Call bean
-			this.productBean.doAdminAddProduct(product);
+			Product updatedProduct = this.productRemoteBean.doAdminAddProduct(product);
 
 			// Add to shop controller
-			this.controller.addProduct(product);
+			this.shopController.addProduct(updatedProduct);
 
 			// Set all to null
 			this.setProductAvailability(Boolean.FALSE);
@@ -128,7 +128,7 @@ public class AdminProductWebBean implements AdminProductWebController {
 	@Override
 	public List<Product> getAllProducts () throws FaceletException {
 		// Call bean
-		return this.productBean.getAllProducts();
+		return this.productRemoteBean.getAllProducts();
 	}
 
 	@Override
diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java
index 5ed8e8a3..1dd2ac50 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java
@@ -29,7 +29,6 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jshopcore.model.category.Category;
 import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote;
-import org.mxchange.jshopcore.model.category.ProductCategory;
 import org.mxchange.jshopcore.model.product.Product;
 import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote;
 import org.mxchange.pizzaapplication.beans.AbstractWebBean;
@@ -83,17 +82,7 @@ public class ShopWebBean extends AbstractWebBean implements ShopWebController {
 	@Override
 	public List<Category> getAllCategoriesParent () throws FaceletException {
 		// Get regular list
-		List<Category> list = new LinkedList<>();
-
-		// Create null category
-		Category nullCategory = new ProductCategory();
-		nullCategory.setCategoryTitle(this.getMessageStringFromKey("ADMIN_CATEGORY_HAS_NO_PARENT")); //NOI18N
-
-		// Add it
-		list.add(nullCategory);
-
-		// Add all
-		list.addAll(this.getAllCategories());
+		List<Category> list = new LinkedList<>(this.getAllCategories());
 
 		// Return it
 		return list;
diff --git a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl
index d91cc209..9235e952 100644
--- a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl
+++ b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl
@@ -4,8 +4,8 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 
-	<h:selectOneMenu class="select" id="parentId" value="#{admin_product.productCategory}" required="true" requiredMessage="#{msg.ADMIN_CATEGORY_MUST_BE_SELECTED}">
-		<f:selectItems value="#{controller.allCategories}" var="cat" itemValue="#{cat.categoryId}" itemLabel="#{cat.categoryTitle}" />
-		<f:validateLongRange for="parentId" minimum="0" maximum="1000" />
+	<h:selectOneMenu class="select" id="productCategory" value="#{admin_product.productCategory}" required="true" requiredMessage="#{msg.ADMIN_CATEGORY_MUST_BE_SELECTED}" converter="category">
+		<f:selectItems value="#{controller.allCategories}" var="cat" itemValue="#{cat}" itemLabel="#{cat.categoryTitle}" />
+		<f:validateLongRange for="productCategory" minimum="0" maximum="1000" />
 	</h:selectOneMenu>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
index 15ce79e4..94fb50b5 100644
--- a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
+++ b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
@@ -4,7 +4,8 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 
-	<h:selectOneMenu class="select" id="parentId" value="#{admin_category.parentCategory}" required="true" requiredMessage="#{msg.ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL}">
+	<h:selectOneMenu class="select" id="parentCategory" value="#{admin_category.parentCategory}">
+		<f:selectItem itemValue="" itemLabel="#{msg.ADMIN_CATEGORY_HAS_NO_PARENT}" />
 		<f:selectItems value="#{controller.allCategoriesParent}" var="parent_category" itemValue="#{parent_category.categoryId}" itemLabel="#{parent_category.categoryTitle}" />
 	</h:selectOneMenu>
 </ui:composition>
-- 
2.39.5