From dbc595c0564955cabd20c237def7549e119ad500 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 9 Sep 2015 12:02:40 +0200
Subject: [PATCH] =?utf8?q?Renamed=20controller=20method=20(still=20no=20cl?=
 =?utf8?q?ue,=20how=20this=20should=20work)=20=20+=20updated=20jcore-ee-lo?=
 =?utf8?q?gger.jar=20+=20a=20little=20rewrite=20on=20index.xhtml=20(maybe?=
 =?utf8?q?=20working)=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxchan?=
 =?utf8?q?ge.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcore-ee-logger.jar                       | Bin 7793 -> 7793 bytes
 .../beans/category/AdminCategoryWebBean.java  |   4 +-
 .../category/AdminCategoryWebController.java  |   2 +-
 web/index.xhtml                               |  80 +++++++++---------
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index 6a5ff51e99f32a7569a071da9273c33111266a92..3e788337a890557ed0c1448c736d39a5d5ed6013 100644
GIT binary patch
delta 211
zcmexp^U;PUz?+$ci-CcIfk7%}B9A7MWXweK=}bWO1qBfKNfSs;mSr>tQDKa>AZjY3
zGl;sy=mn%Ut1-neg6I}zWfl;<lHHIAMBm~3!U3W$37LcVi@8Nvfz)JPDNCRolRcyy
zK)fy~0}!<bC<vs!OSyw62Wejr)h`_kqMk@cfdyskKvaW_8Hm~;lMJF{WwSt3r))lm
I`XyTq0OSNYMgRZ+

delta 211
zcmexp^U;PUz?+$ci-CcIfk7a0B9A5$f8<2-=}bWO1qBfKNfSs;mSr>tQDKa>AZjY3
zGl;sy=mn%Ut1-neg6I}zWfl;<lHHIAMBm~3!U3W$37LcVi@8Nvfz)JPDNCRolRcyy
zK)fy~0}!<bC<vs!OSyw62Wejr)h`_kqMk@cfdyskKvaW_8Hm~;lMJF{WwSt3r))lm
I`XyTq08=S9+5i9m

diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
index 9c5875d5..9d76d3d9 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
@@ -55,11 +55,11 @@ public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCate
 		InitialContext context = new InitialContext();
 
 		// Try to lookup the bean
-		this.category = (CategorySessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N
+		this.category = (CategorySessionBeanRemote) context.lookup("ejb/stateless-category"); //NOI18N
 	}
 
 	@Override
-	public void doAdminAddCategory (final Category category) throws FaceletException {
+	public void addCategory (final Category category) throws FaceletException {
 		try {
 			// Deligate to bean
 			this.category.doAdminAddCategory(category);
diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java
index c38dcdb5..934c2dc3 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java
@@ -32,5 +32,5 @@ public interface AdminCategoryWebController {
 	 * @param category Category instance
 	 * @throws javax.faces.view.facelets.FaceletException If something unexpected happened
 	 */
-	public void doAdminAddCategory (final Category category) throws FaceletException;
+	public void addCategory (final Category category) throws FaceletException;
 }
diff --git a/web/index.xhtml b/web/index.xhtml
index c8885c1e..c7f13834 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -31,40 +31,40 @@
 			</h:panelGrid>
 			//-->
 
-			<h:form acceptcharset="utf-8" id="add_item">
-				<table class="basket_item_table">
-					<thead>
-						<tr>
-							<th colspan="5" class="table_header">
-								Folgendes kann bestellt werden:
-							</th>
-						</tr>
-
-						<tr>
-							<th class="table_header_column">
-								Bestellen?
-							</th>
-
-							<th class="table_header_column">
-								Anzahl:
-							</th>
-
-							<th class="table_header_column">
-								Produkt:
-							</th>
-
-							<th class="table_header_column">
-								Einzelpreis:
-							</th>
-
-							<th class="table_header_column">
-								Zwischensumme:
-							</th>
-						</tr>
-					</thead>
-
-					<tbody>
-						<ui:repeat var="product" value="#{controller.availableProducts}">
+			<table class="basket_item_table">
+				<thead>
+					<tr>
+						<th colspan="5" class="table_header">
+							Folgendes kann bestellt werden:
+						</th>
+					</tr>
+
+					<tr>
+						<th class="table_header_column">
+							Bestellen?
+						</th>
+
+						<th class="table_header_column">
+							Anzahl:
+						</th>
+
+						<th class="table_header_column">
+							Produkt:
+						</th>
+
+						<th class="table_header_column">
+							Einzelpreis:
+						</th>
+
+						<th class="table_header_column">
+							Zwischensumme:
+						</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<ui:repeat var="product" value="#{controller.availableProducts}">
+						<h:form acceptcharset="utf-8" id="add_item">
 
 							<f:viewAction action="#{basket.setCurrentProduct(product)}" />
 
@@ -75,7 +75,7 @@
 									</td>
 
 									<td class="table_data_column">
-										#{basket.item.amount}
+										#{basket.currentItem.amount}
 									</td>
 
 									<td class="table_data_column">
@@ -89,7 +89,7 @@
 									</td>
 
 									<td class="table_data_column" align="right">
-										<h:outputText class="price" value="#{basket.item.calculateTotalPrice()}">
+										<h:outputText class="price" value="#{controller.calculateTotalPrice(basket.currentItem)}">
 											<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
 										</h:outputText>
 									</td>
@@ -128,10 +128,10 @@
 									</td>
 								</tr>
 							</ui:fragment>
-						</ui:repeat>
-					</tbody>
-				</table>
-			</h:form>
+						</h:form>
+					</ui:repeat>
+				</tbody>
+			</table>
 		</ui:define>
 
 		<ui:define name="footer">
-- 
2.39.5