From 63aa46fc7b3024502f76ad0e397dcb8ae83ab36a Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 31 Aug 2015 09:38:39 +0200 Subject: [PATCH] =?utf8?q?Removed=20more=20deprecated=20stuff=20+=20marked?= =?utf8?q?=20more=20as=20deprecated=20Signed-off-by:Roland=20H=C3=A4der=20?= =?utf8?q??= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../application/PizzaApplication.java | 29 ++----------------- .../application/PizzaServiceApplication.java | 5 ++-- .../beans/controller/PizzaBean.java | 12 -------- .../beans/controller/PizzaServiceBean.java | 14 --------- web/index.jsp | 6 ++-- 5 files changed, 7 insertions(+), 59 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaApplication.java index a283f8d6..ffae7095 100644 --- 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 d3b98bea..41548005 100644 --- 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 1fc01c60..c896ff3e 100644 --- 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 b5e5f205..e29720fb 100644 --- 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 705f81bb..662e3fa0 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -98,11 +98,11 @@ - - + + - + ${product.title} -- 2.39.5