From 30e3c915cb945fd5bfc056892e05a2ebfedbaf5c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 18 Aug 2015 11:45:36 +0200 Subject: [PATCH] =?utf8?q?Continued=20with=20project:=20-=20no=20flush,=20?= =?utf8?q?maybe=20better=3F=20-=20space=20removed=20-=20Renamed=20variable?= =?utf8?q?=20"value"=20to=20"customerGender"=20for=20making=20it=20more=20?= =?utf8?q?clear=20-=20Some=20more=20debug=20logging=20-=20Added=20missing?= =?utf8?q?=20error=20handler=20(but=20commented=20out=20for=20developing)?= =?utf8?q?=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../application/PizzaServiceApplication.java | 6 + web/admin/category.jsp | 8 +- web/admin/index.jsp | 4 +- web/admin/product.jsp | 8 +- web/bye.jsp | 4 +- web/customer/login.jsp | 7 +- web/customer/lost_passwd.jsp | 5 +- web/customer/register.jsp | 10 +- web/errorHandler.jsp | 8 +- web/finished.jsp | 4 +- web/form_handler/add_item.jsp | 4 +- web/form_handler/admin/do_category.jsp | 2 +- web/form_handler/admin/do_product.jsp | 2 +- web/form_handler/do_order.jsp | 4 +- web/form_handler/do_preview.jsp | 4 +- web/imprint.jsp | 4 +- web/index.jsp | 6 +- web/preview.jsp | 143 +----------------- web/privacy.jsp | 6 +- web/static/admin/category_selection_box.jsp | 2 +- .../admin/parent_category_selection_box.jsp | 2 +- web/static/gender_selection_box.jsp | 4 +- web/terms.jsp | 6 +- 23 files changed, 64 insertions(+), 189 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index d94e23b3..b81e142a 100644 --- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -93,6 +93,9 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P if (object instanceof PizzaApplication) { // Instance is set, so casting should work instance = (PizzaApplication) object; + + // Debug message + instance.getLogger().debug(MessageFormat.format("Using existing instance {0} ...", object)); } else if (object instanceof Object) { // Not correct instance throw new ServletException("app is not set correctly"); //NOI18N @@ -100,6 +103,9 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P try { // "service" is null, so initialize it instance = new PizzaServiceApplication(context); + + // Debug message + instance.getLogger().debug(MessageFormat.format("Created new instance {0} ...", object)); } catch (final UnsupportedDatabaseBackendException | SQLException | IOException | BadTokenException ex) { throw new ServletException(ex); } diff --git a/web/admin/category.jsp b/web/admin/category.jsp index 4ebcc9a6..57417eba 100644 --- a/web/admin/category.jsp +++ b/web/admin/category.jsp @@ -4,7 +4,7 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page import="org.mxchange.pizzaapplication.category.Category"%> <%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%> @@ -32,7 +32,7 @@ - +
@@ -113,7 +113,7 @@
- +
@@ -136,6 +136,6 @@
- + diff --git a/web/admin/index.jsp b/web/admin/index.jsp index c28f4f4c..df4969ee 100644 --- a/web/admin/index.jsp +++ b/web/admin/index.jsp @@ -31,7 +31,7 @@ - +
@@ -43,6 +43,6 @@
- + diff --git a/web/admin/product.jsp b/web/admin/product.jsp index 4e9f0da8..3cd489e2 100644 --- a/web/admin/product.jsp +++ b/web/admin/product.jsp @@ -4,7 +4,7 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="java.util.Iterator"%> @@ -34,7 +34,7 @@ - +
@@ -140,7 +140,7 @@
- +
@@ -178,6 +178,6 @@
- + diff --git a/web/bye.jsp b/web/bye.jsp index dc9df94f..c4ec4921 100644 --- a/web/bye.jsp +++ b/web/bye.jsp @@ -22,7 +22,7 @@ - +
@@ -45,6 +45,6 @@
- + diff --git a/web/customer/login.jsp b/web/customer/login.jsp index 8a3ecb05..ed349fde 100644 --- a/web/customer/login.jsp +++ b/web/customer/login.jsp @@ -4,6 +4,7 @@ Author : Roland Haeder --%> +<%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> @@ -22,7 +23,7 @@ - +
@@ -35,7 +36,7 @@
- +
@@ -44,6 +45,6 @@
- + diff --git a/web/customer/lost_passwd.jsp b/web/customer/lost_passwd.jsp index d726dc07..37813f7a 100644 --- a/web/customer/lost_passwd.jsp +++ b/web/customer/lost_passwd.jsp @@ -4,6 +4,7 @@ Author : Roland Haeder --%> +<%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> @@ -22,7 +23,7 @@ - +
@@ -84,6 +85,6 @@
- + diff --git a/web/customer/register.jsp b/web/customer/register.jsp index 6f2cb057..ea441607 100644 --- a/web/customer/register.jsp +++ b/web/customer/register.jsp @@ -4,7 +4,9 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +<%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> @@ -23,7 +25,7 @@ - +
@@ -52,7 +54,7 @@
- +
@@ -281,6 +283,6 @@
- + diff --git a/web/errorHandler.jsp b/web/errorHandler.jsp index 5cb88450..6bb7e636 100644 --- a/web/errorHandler.jsp +++ b/web/errorHandler.jsp @@ -7,8 +7,8 @@ <%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> <%@page import="java.io.PrintWriter"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> @@ -26,7 +26,7 @@ - +
@@ -46,6 +46,6 @@
- + diff --git a/web/finished.jsp b/web/finished.jsp index 26d3b050..b239762d 100644 --- a/web/finished.jsp +++ b/web/finished.jsp @@ -37,7 +37,7 @@ - +
@@ -162,6 +162,6 @@
- + diff --git a/web/form_handler/add_item.jsp b/web/form_handler/add_item.jsp index 0fc27125..2b13c70b 100644 --- a/web/form_handler/add_item.jsp +++ b/web/form_handler/add_item.jsp @@ -33,8 +33,8 @@

<%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler

- + - + diff --git a/web/form_handler/admin/do_category.jsp b/web/form_handler/admin/do_category.jsp index 1bb64d71..40f23f91 100644 --- a/web/form_handler/admin/do_category.jsp +++ b/web/form_handler/admin/do_category.jsp @@ -33,7 +33,7 @@

<%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler

- +
diff --git a/web/form_handler/admin/do_product.jsp b/web/form_handler/admin/do_product.jsp index 65fb17cf..d6be5ce7 100644 --- a/web/form_handler/admin/do_product.jsp +++ b/web/form_handler/admin/do_product.jsp @@ -32,7 +32,7 @@

<%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler

- +
diff --git a/web/form_handler/do_order.jsp b/web/form_handler/do_order.jsp index 6afcf1f6..503e9ede 100644 --- a/web/form_handler/do_order.jsp +++ b/web/form_handler/do_order.jsp @@ -46,8 +46,8 @@

<%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler

- + - + diff --git a/web/form_handler/do_preview.jsp b/web/form_handler/do_preview.jsp index 61c6cfdb..6eebc903 100644 --- a/web/form_handler/do_preview.jsp +++ b/web/form_handler/do_preview.jsp @@ -64,8 +64,8 @@

<%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler

- + - + diff --git a/web/imprint.jsp b/web/imprint.jsp index 7631c911..b1643a6e 100644 --- a/web/imprint.jsp +++ b/web/imprint.jsp @@ -22,7 +22,7 @@
- +
@@ -33,6 +33,6 @@
- + diff --git a/web/index.jsp b/web/index.jsp index ae7eb483..69f8b768 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -11,7 +11,7 @@ <%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%> <%@page import="org.mxchange.pizzaapplication.product.Product"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <% // Init application instance @@ -32,7 +32,7 @@ - +
@@ -97,6 +97,6 @@
- + diff --git a/web/preview.jsp b/web/preview.jsp index bd670ba3..ca5c788e 100644 --- a/web/preview.jsp +++ b/web/preview.jsp @@ -4,7 +4,7 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> @@ -37,7 +37,7 @@ - +
@@ -124,142 +124,7 @@ -
- Bitte Ihre Daten eingeben: - -
-
- -
- -
- - -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
- -
-
- -
- -
- /> -
- -
-
-
+ <%-- @TODO Add navigation to login and registration form --%> @@ -275,6 +140,6 @@
- + diff --git a/web/privacy.jsp b/web/privacy.jsp index fa5d2d61..b62b9fe6 100644 --- a/web/privacy.jsp +++ b/web/privacy.jsp @@ -4,7 +4,7 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> @@ -23,7 +23,7 @@ - +
@@ -34,6 +34,6 @@
- + diff --git a/web/static/admin/category_selection_box.jsp b/web/static/admin/category_selection_box.jsp index 0de4d8c0..ff55de65 100644 --- a/web/static/admin/category_selection_box.jsp +++ b/web/static/admin/category_selection_box.jsp @@ -4,7 +4,7 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%> diff --git a/web/static/admin/parent_category_selection_box.jsp b/web/static/admin/parent_category_selection_box.jsp index 2f5b2ee7..ed7d6fef 100644 --- a/web/static/admin/parent_category_selection_box.jsp +++ b/web/static/admin/parent_category_selection_box.jsp @@ -4,7 +4,7 @@ Author : Roland Haeder --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%> <%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%> diff --git a/web/static/gender_selection_box.jsp b/web/static/gender_selection_box.jsp index 14ccaadc..dfd0a2f9 100644 --- a/web/static/gender_selection_box.jsp +++ b/web/static/gender_selection_box.jsp @@ -22,10 +22,10 @@ %>