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 8515db3f9044889c1211b5913697d3fadfdb998c..9f72fb876923a4147148cf66b0430eee7c21bb90 100644 (file)
--- 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 eb222f5f69dc6c57bb15add2d0632b7d6b6903ea..7ca4f5e78de0274d707e450bae483fe0379b0d0e 100644 (file)
--- 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 84a356006a16f27326b16b445d0cded5756f7c64..142e678b4c6ebe365a07d6443a7a15af17726c77 100644 (file)
--- 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 b077f1cfb3f76c7db6a174620b618a8b182ffcaa..17843ba1feaf8be9627a99364d1cc491347ebd8d 100644 (file)
--- 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 089eb06f1756478b06b8ade7b02a551c4d118ede..744b04bb1e0f8cc2aa89fc58d0b67a8fce9606ad 100644 (file)
--- 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 9d280a689ed7af963806f12b807917266fab973c..d6187af5fbd8bd21eb78cd9b7bc16818da44fac5 100644 (file)
--- 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 b2e379b49416f02d26ccdd5232a2e1aba37d4c7e..8eb9f79a17446fbd61979bc5b67755e0d4303f34 100644 (file)
--- 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>