From: Roland Haeder <roland@mxchange.org>
Date: Fri, 28 Aug 2015 09:48:41 +0000 (+0200)
Subject: Renamed getCategories() to getAllCategories() to make its purpose more clear
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fe3ba87c08dd5c2531803279056f4254b113041a;p=pizzaservice-war.git

Renamed getCategories() to getAllCategories() to make its purpose more clear
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
index 8515db3f..9f72fb87 100644
--- a/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
+++ b/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
@@ -267,7 +267,7 @@ public interface PizzaApplication extends Application {
 	 * @return All categories
 	 * @throws javax.servlet.ServletException If anything went wrong
 	 */
-	public Iterator<Category> getCategories () throws ServletException;
+	public Iterator<Category> getAllCategories () throws ServletException;
 
 	/**
 	 * Checks if given Product instance is available and returns a printable
diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
index eb222f5f..7ca4f5e7 100644
--- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
+++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
@@ -542,7 +542,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P
 	 * @return All categories
 	 */
 	@Override
-	public Iterator<Category> getCategories () throws ServletException {
+	public Iterator<Category> getAllCategories () throws ServletException {
 		// Trace message
 		this.getLogger().trace("CALLED!");
 
diff --git a/src/java/org/mxchange/pizzaapplication/beans/PizzaBean.java b/src/java/org/mxchange/pizzaapplication/beans/PizzaBean.java
index 84a35600..142e678b 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/PizzaBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/PizzaBean.java
@@ -233,7 +233,7 @@ public interface PizzaBean extends Serializable {
 	 * @return All categories
 	 * @throws javax.servlet.ServletException If anything went wrong
 	 */
-	public Iterator<Category> getCategories () throws ServletException;
+	public Iterator<Category> getAllCategories () throws ServletException;
 
 	/**
 	 * Checks if given Product instance is available and returns a printable
diff --git a/src/java/org/mxchange/pizzaapplication/beans/PizzaServiceBean.java b/src/java/org/mxchange/pizzaapplication/beans/PizzaServiceBean.java
index b077f1cf..17843ba1 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/PizzaServiceBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/PizzaServiceBean.java
@@ -255,8 +255,8 @@ public class PizzaServiceBean implements PizzaBean {
 	 * @return All categories
 	 */
 	@Override
-	public Iterator<Category> getCategories () throws ServletException {
-		return this.app.getCategories();
+	public Iterator<Category> getAllCategories () throws ServletException {
+		return this.app.getAllCategories();
 	}
 
 	/**
diff --git a/web/admin/category.jsp b/web/admin/category.jsp
index 089eb06f..744b04bb 100644
--- a/web/admin/category.jsp
+++ b/web/admin/category.jsp
@@ -60,7 +60,7 @@
 						</thead>
 
 						<tbody>
-							<c:forEach var="category" items="${controller.categories}">
+							<c:forEach var="category" items="${controller.allCategories}">
 							<tr>
 								<td>
 									${category.categoryId}:
diff --git a/web/static/admin/admin_category_selection_box.jsp b/web/static/admin/admin_category_selection_box.jsp
index 9d280a68..d6187af5 100644
--- a/web/static/admin/admin_category_selection_box.jsp
+++ b/web/static/admin/admin_category_selection_box.jsp
@@ -11,7 +11,7 @@
 <jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.PizzaBean" />
 
 <select class="select" name="<%=CategoryFrontend.COLUMN_ID%>" size="1">
-	<c:forEach var="category" items="${controller.categories}">
+	<c:forEach var="category" items="${controller.allCategories}">
 		<option value="${category.categoryId}">${category.decodedTitle}</option>
 	</c:forEach>
 </select>
diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp
index b2e379b4..8eb9f79a 100644
--- a/web/static/admin/admin_parent_category_selection_box.jsp
+++ b/web/static/admin/admin_parent_category_selection_box.jsp
@@ -12,7 +12,7 @@
 
 <select class="select" name="<%=CategoryFrontend.COLUMN_PARENT%>" size="1">
 	<option value="">Ist oberste Kategorie</option>
-	<c:forEach var="category" items="${controller.categories}">
+	<c:forEach var="category" items="${controller.allCategories}">
 		<option value="${category.categoryId}">${category.decodedTitle}</option>
 	</c:forEach>
 </select>