Removed more deprecated stuff + marked more as deprecated

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 a283f8d60169ad9dd44d2ed1463be21a04e97cfd..ffae7095da94fbe51254ca68c637def8564273c4 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
+++ b/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java
@@ -40,24 +40,11 @@ import org.mxchange.jshop.product.Product;
 public interface PizzaApplication extends Application {
        /**
         * HTTP parameter "amount"
+        * @deprecated Don't use this in upcoming JSF
         */
+       @Deprecated
        public static final String HTTP_PARAM_AMOUNT = "amount"; //NOI18N
 
-       /**
-        * HTTP parameter "itemId"
-        */
-       public static final String HTTP_PARAM_ITEM_ID = "itemId"; //NOI18N
-
-       /**
-        * HTTP parameter "itemType"
-        */
-       public static final String HTTP_PARAM_ITEM_TYPE = "itemType"; //NOI18N
-
-       /**
-        * Session key "ordered"
-        */
-       public static final String SESSION_ORDERED = "ordered"; //NOI18N
-
        /**
         * Mask for all parameters
         * @deprecated Please refacture!
@@ -76,18 +63,6 @@ public interface PizzaApplication extends Application {
         */
        public void init (final ServletContext context) throws UnsupportedDatabaseBackendException, SQLException, IOException, BadTokenException;
 
-       /**
-        * Checks whether the given product is choosen, request overules session.
-        *
-        * @param product Product instance
-        * @param request Request instance
-        * @param session Session instance
-        * @return Whether the product is choosen
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public boolean isProductChoosen (final Product product, final HttpServletRequest request, final HttpSession session);
-
        /**
         * Some "getter" for HTML code 'checked="checked"' if the product is choosen
         *

diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
index d3b98bea5372113c45e4ff205b2fd4c479d4e49c..4154800559d314ddf999a6106bb178b2c2976509 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
+++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
@@ -346,9 +346,8 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P
                }
        }
 
-       @Override
        @Deprecated
-       public boolean isProductChoosen (final Product product, final HttpServletRequest request, final HttpSession session) {
+       private boolean isProductChoosen (final Product product, final HttpServletRequest request, final HttpSession session) {
                throw new UnsupportedOperationException("This method is deprecated and shall not be called");
        }
 
@@ -373,7 +372,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P
         * @param session Session instance
         * @param attribute Attribute to get value from
         * @return Value from session
-        * @deprecated 
+        * @deprecated Old lost code
         */
        @Deprecated
        private Object getValueFromSession (final Product product, final HttpSession session, final String attribute) {

diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java
index 1fc01c602940e6367322611ed492519f49b4bcba..c896ff3e88dca46014242e87aa3e02e266ebc192 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaBean.java
@@ -44,18 +44,6 @@ public interface PizzaBean extends FrameworkBean {
         */
        public void init () throws FacesException;
 
-       /**
-        * Checks whether the given product is choosen, request overules session.
-        *
-        * @param product Product instance
-        * @param request Request instance
-        * @param session Session instance
-        * @return Whether the product is choosen
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public boolean isProductChoosen (final Product product, final HttpServletRequest request, final HttpSession session);
-
        /**
         * Some "getter" for HTML code 'checked="checked"' if the product is choosen
         *

diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java
index b5e5f205c35bc13e01c6d86d7c7d3c9b04371f7d..e29720fb62e7d2581fa3a10d1bf3e55025e73a5b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceBean.java
@@ -161,20 +161,6 @@ public class PizzaServiceBean extends BaseFrameworkBean implements PizzaBean {
                return this.app.getAllCategories();
        }
 
-       /**
-        * Checks whether the given product is choosen, request overules session.
-        *
-        * @param product Product instance
-        * @param request Request instance
-        * @param session Session instance
-        * @return Whether the product is choosen
-        */
-       @Override
-       @Deprecated
-       public boolean isProductChoosen (final Product product, final HttpServletRequest request, final HttpSession session) {
-               return this.app.isProductChoosen(product, request, session);
-       }
-
        /**
         * Somewhat setter in session
         *

diff --git a/web/index.jsp b/web/index.jsp
index 705f81bbafb3167db4be62a7480dc9e81f0c6643..662e3fa0592a5bf92a9ed03e3d0f4f92634d7004 100644 (file)
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -98,11 +98,11 @@
                                                                                <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" />
+                                                                                               <input type="hidden" name="itemId%>" value="${product.itemId}" />
+                                                                                               <input type="hidden" name="itemType" value="Product" />
                                                                                        </td>
                                                                                        <td class="table_data_column">
-                                                                                               <input class="input" type="text" name="<%=PizzaApplication.HTTP_PARAM_AMOUNT%>" size="3" maxlength="20" />
+                                                                                               <input class="input" type="text" name="amount" size="3" maxlength="20" />
                                                                                        </td>
                                                                                        <td class="table_data_column">
                                                                                                ${product.title}