From: Roland Haeder <roland@mxchange.org>
Date: Mon, 31 Aug 2015 07:25:19 +0000 (+0200)
Subject: updated jshop+ got rid of another (large) scriptlet
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5a343ef4f8f7f568395456613492f900a9cb1bbd;p=pizzaservice-war.git

updated jshop+ got rid of another (large) scriptlet
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jshop.jar b/lib/jshop.jar
index b7b2cbcb..5aa5fc1d 100644
Binary files a/lib/jshop.jar and b/lib/jshop.jar differ
diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
index 38ecddb5..a283f8d6 100644
--- a/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
+++ b/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
@@ -44,12 +44,12 @@ public interface PizzaApplication extends Application {
 	public static final String HTTP_PARAM_AMOUNT = "amount"; //NOI18N
 
 	/**
-	 * HTTP parameter "item_id"
+	 * HTTP parameter "itemId"
 	 */
 	public static final String HTTP_PARAM_ITEM_ID = "itemId"; //NOI18N
 
 	/**
-	 * HTTP parameter "type"
+	 * HTTP parameter "itemType"
 	 */
 	public static final String HTTP_PARAM_ITEM_TYPE = "itemType"; //NOI18N
 
diff --git a/web/index.jsp b/web/index.jsp
index f1ffc9a3..705f81bb 100644
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -68,75 +68,55 @@
 					</tr>
 				</table>
 
-				<%
-				// Get Iterator
-				Iterator<Product> iterator = controller.getAvailableProducts();
-
-				// "Walk" through all products and unmark them as ordered
-				while (iterator.hasNext()) {
-					// Get product instance
-					Product product = iterator.next();
-
-					// Debug message
-					controller.getLogger().debug("product=" + product);
-
-					// Create an item instance form this product
-					AddableBasketItem item = controller.getBasket().getItem(product);
-
-					// Debug message
-					controller.getLogger().debug("item=" + item);
-
-					// Has it been already added to the basket?
-					if (item != null) {
-						// Item was added to basket
-						%>
-						<table class="table">
-							<tbody>
-									<tr>
-										<td class="table_data_column">
-											<a href="${basePath}/basket.jsp" title="Zum Warenkorb">Warenkorb</a>
-										</td>
-										<td class="table_data_column">
-											<%=item.getAmount()%>
-										</td>
-										<td class="table_data_column">
-											<%=product.getTitle()%>
-										</td>
-										<td class="table_data_column" align="right">
-											<fmt:formatNumber type="currency" minFractionDigits="2" maxFractionDigits="2" value="<%=product.getPrice()%>" />
-										</td>
-									</tr>
-							</tbody>
-						</table>
-						<%
-					} else {
-						%>
-						<form action="${basePath}/form_handler/add_item.jsp" accept-charset="utf-8" id="form" method="post">
-						<table class="table">
-							<tbody>
-									<tr>
-										<td class="table_data_column">
-											<input class="submit" type="submit" name="add" value="Hinzuf&uuml;gen" />
-											<input type="hidden" name="<%=PizzaApplication.HTTP_PARAM_ITEM_ID%>" value="<%=product.getItemId()%>" />
-											<input type="hidden" name="<%=PizzaApplication.HTTP_PARAM_ITEM_TYPE%>" value="Product" />
-										</td>
-										<td class="table_data_column">
-											<input class="input" type="text" name="<%=PizzaApplication.HTTP_PARAM_AMOUNT%>" size="3" maxlength="20" />
-										</td>
-										<td class="table_data_column">
-											<%=product.getTitle()%>
-										</td>
-										<td class="table_data_column" align="right">
-											<fmt:formatNumber type="currency" minFractionDigits="2" maxFractionDigits="2" value="<%=product.getPrice()%>" />
-										</td>
-									</tr>
-							</tbody>
-						</table>
-						</form>
-				<%
-					}
-				}
-			%>
+				<c:forEach var="product" items="${controller.availableProducts}">
+					<c:choose>
+						<c:when test="${controller.basket.isAdded(product)}">
+							<c:set var="item" value="${controller.basket.item}" />
+							<table class="table">
+								<tbody>
+										<tr>
+											<td class="table_data_column">
+												<a href="${basePath}/basket.jsp" title="Zum Warenkorb">Warenkorb</a>
+											</td>
+											<td class="table_data_column">
+												${item.amount}
+											</td>
+											<td class="table_data_column">
+												${product.title}
+											</td>
+											<td class="table_data_column" align="right">
+												<fmt:formatNumber type="currency" minFractionDigits="2" maxFractionDigits="2" value="${product.price}" />
+											</td>
+										</tr>
+								</tbody>
+							</table>
+						</c:when>
+						<c:otherwise>
+							<form action="${basePath}/form_handler/add_item.jsp" accept-charset="utf-8" id="form" method="post">
+							<table class="table">
+								<tbody>
+										<tr>
+											<td class="table_data_column">
+												<input class="submit" type="submit" name="add" value="Hinzuf&uuml;gen" />
+												<input type="hidden" name="<%=PizzaApplication.HTTP_PARAM_ITEM_ID%>" value="${product.itemId}" />
+												<input type="hidden" name="<%=PizzaApplication.HTTP_PARAM_ITEM_TYPE%>" value="Product" />
+											</td>
+											<td class="table_data_column">
+												<input class="input" type="text" name="<%=PizzaApplication.HTTP_PARAM_AMOUNT%>" size="3" maxlength="20" />
+											</td>
+											<td class="table_data_column">
+												${product.title}
+											</td>
+											<td class="table_data_column" align="right">
+												<fmt:formatNumber type="currency" minFractionDigits="2" maxFractionDigits="2" value="${product.price}" />
+											</td>
+										</tr>
+								</tbody>
+							</table>
+							</form>
+						</c:otherwise>
+					</c:choose>
+				</c:forEach>
 			</div>
 		</div>