From e9f9d9381dcb49429f147a8f0b5dd77bff4759a4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 31 Aug 2015 11:43:31 +0200 Subject: [PATCH] =?utf8?q?updated=20jshop=20+=20renamed=20some=20form=20fi?= =?utf8?q?elds=20due=20to=20jshop=20change=20Signed-off-by:Roland=20H?= =?utf8?q?=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jshop.jar | Bin 77052 -> 77130 bytes .../application/PizzaServiceApplication.java | 28 +++++++++--------- .../admin_parent_category_selection_box.jsp | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/jshop.jar b/lib/jshop.jar index e0179deb3401947f1176332a70f5a40ef332f019..63867a3568abaeafb02c3ddeac202c43e73837f2 100644 GIT binary patch delta 6177 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 delta 6099 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 diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index 818b6735..233163c5 100644 --- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -480,10 +480,10 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P // Get all fields String title = request.getParameter(CategoryFrontend.COLUMN_TITLE); - String parent = request.getParameter(CategoryFrontend.COLUMN_PARENT); + String parentId = request.getParameter(CategoryFrontend.COLUMN_PARENT); // Debug message - this.getLogger().debug(MessageFormat.format("title={0},parent={1}", title, parent)); //NOI18N + this.getLogger().debug(MessageFormat.format("title={0},parentId={1}", title, parentId)); //NOI18N // Init variables for casting Integer id = 0; @@ -495,10 +495,10 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P } else if (title.isEmpty()) { // Is left empty throw new IllegalArgumentException(MessageFormat.format("{0} is empty.", CategoryFrontend.COLUMN_TITLE)); //NOI18N - } else if ((parent != null) && (!parent.isEmpty())) { + } else if ((parentId != null) && (!parentId.isEmpty())) { // "parent" is set, so check it try { - id = Integer.parseInt(parent); + id = Integer.parseInt(parentId); } catch (final NumberFormatException e) { // Not valid number throw new IllegalArgumentException(e); @@ -541,11 +541,11 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P // Get title, price and category id String title = request.getParameter(ProductFrontend.COLUMN_TITLE); String price = request.getParameter(ProductFrontend.COLUMN_PRICE); - String category = request.getParameter(ProductFrontend.COLUMN_CATEGORY); + String categoryId = request.getParameter(ProductFrontend.COLUMN_CATEGORY); String available = request.getParameter(ProductFrontend.COLUMN_AVAILABLE); // Debug message - this.getLogger().debug(MessageFormat.format("title={0},price={1},category={2},available={3}", title, price, category, available)); //NOI18N + this.getLogger().debug(MessageFormat.format("title={0},price={1},categoryId={2},available={3}", title, price, categoryId, available)); //NOI18N // Variables for converting Long id = null; @@ -564,10 +564,10 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P } else if (price.isEmpty()) { // Is left empty throw new IllegalArgumentException(MessageFormat.format("{0} is empty.", ProductFrontend.COLUMN_PRICE)); //NOI18N - } else if (null == category) { + } else if (null == categoryId) { // "title" not set throw new IllegalArgumentException(MessageFormat.format("{0} is not set.", ProductFrontend.COLUMN_CATEGORY)); //NOI18N - } else if (category.isEmpty()) { + } else if (categoryId.isEmpty()) { // Is left empty throw new IllegalArgumentException(MessageFormat.format("{0} is empty.", ProductFrontend.COLUMN_CATEGORY)); //NOI18N } else if (null == available) { @@ -583,7 +583,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P // Parse numbers try { - id = Long.parseLong(category); + id = Long.parseLong(categoryId); p = Float.parseFloat(price); } catch (final NumberFormatException e) { // Not valid number @@ -619,7 +619,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P @Override public String generateLinkForParent (final Category category) { // Trace message - this.getLogger().trace(MessageFormat.format("category={0} - CALLED!", category)); //NOI18N + this.getLogger().trace(MessageFormat.format("categoryId={0} - CALLED!", category)); //NOI18N // category must not be null if (null == category) { @@ -628,12 +628,12 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P } // Get parent id - Long parent = category.getParent(); + Long parentId = category.getParentId(); // Is the id set? - if (parent > 0) { + if (parentId > 0) { // Product HTML code for link - throw new UnsupportedOperationException(MessageFormat.format("parent={0} - Unfinished!", parent)); //NOI18N + throw new UnsupportedOperationException(MessageFormat.format("parentId={0} - Unfinished!", parentId)); //NOI18N } // No parent set @@ -662,7 +662,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P } // Debug message - this.getLogger().debug(MessageFormat.format("category={0}", category)); //NOI18N + this.getLogger().debug(MessageFormat.format("categoryId={0}", category)); //NOI18N String title = null; try { diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp index 75fb2ba9..eb98e8de 100644 --- a/web/static/admin/admin_parent_category_selection_box.jsp +++ b/web/static/admin/admin_parent_category_selection_box.jsp @@ -9,7 +9,7 @@ <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> - -- 2.39.5