From 85f229129793c770879adc6bb937a379f56fe005 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 23 Apr 2020 03:10:30 +0200 Subject: [PATCH] Product-only: - moved converter to deeper packages - some renderFoo() methods have extra parameters, added MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialsGenericProductConverter.java | 14 +++++++------- .../FinancialsProductCategoryConverter.java | 14 +++++++------- .../admin_form_generic_product_data.tpl | 2 +- .../admin_generic_product_list.xhtml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) rename src/java/org/mxchange/jfinancials/converter/{ => product}/generic_product/FinancialsGenericProductConverter.java (97%) rename src/java/org/mxchange/jfinancials/converter/{ => product}/product_category/FinancialsProductCategoryConverter.java (97%) diff --git a/src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java b/src/java/org/mxchange/jfinancials/converter/product/generic_product/FinancialsGenericProductConverter.java similarity index 97% rename from src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java rename to src/java/org/mxchange/jfinancials/converter/product/generic_product/FinancialsGenericProductConverter.java index cfb67b04..ba66faf4 100644 --- a/src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/product/generic_product/FinancialsGenericProductConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.converter.generic_product; +package org.mxchange.jfinancials.converter.product.generic_product; import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; @@ -42,12 +42,6 @@ public class FinancialsGenericProductConverter implements Converter { @Override public Product getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { - // Is the instance there? - if (null == PRODUCT_LIST_CONTROLLER) { - // Get bean from CDI directly - PRODUCT_LIST_CONTROLLER = CDI.current().select(FinancialsProductListWebViewBean.class).get(); - } - // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message @@ -60,6 +54,12 @@ public class FinancialsGenericProductConverter implements Converter { // Init instance Product product = null; + // Is the instance there? + if (null == PRODUCT_LIST_CONTROLLER) { + // Get bean from CDI directly + PRODUCT_LIST_CONTROLLER = CDI.current().select(FinancialsProductListWebViewBean.class).get(); + } + try { // Try to parse the value as long final Long productId = Long.valueOf(submittedValue); diff --git a/src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java b/src/java/org/mxchange/jfinancials/converter/product/product_category/FinancialsProductCategoryConverter.java similarity index 97% rename from src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java rename to src/java/org/mxchange/jfinancials/converter/product/product_category/FinancialsProductCategoryConverter.java index 8d4cb67e..e6484e3b 100644 --- a/src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/product/product_category/FinancialsProductCategoryConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.converter.product_category; +package org.mxchange.jfinancials.converter.product.product_category; import javax.enterprise.inject.spi.CDI; import javax.faces.component.UIComponent; @@ -42,12 +42,6 @@ public class FinancialsProductCategoryConverter implements Converter { @Override public Category getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { - // Is the instance there? - if (null == CATEGORY_LIST_CONTROLLER) { - // Get bean from CDI directly - CATEGORY_LIST_CONTROLLER = CDI.current().select(FinancialsCategoryListWebViewBean.class).get(); - } - // Is the value null or empty? if ((null == submittedValue) || (submittedValue.trim().isEmpty())) { // Warning message @@ -60,6 +54,12 @@ public class FinancialsProductCategoryConverter implements Converter { // Init instance Category category = null; + // Is the instance there? + if (null == CATEGORY_LIST_CONTROLLER) { + // Get bean from CDI directly + CATEGORY_LIST_CONTROLLER = CDI.current().select(FinancialsCategoryListWebViewBean.class).get(); + } + try { // Try to parse the value as long final Long categoryId = Long.valueOf(submittedValue); diff --git a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl index 1c4903cf..c016be80 100644 --- a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl +++ b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl @@ -119,7 +119,7 @@ value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" - itemLabel="#{beanHelper.renderBasicData(basicData, true)}" + itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}" /> diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml index 79e12d4f..8343e6f8 100644 --- a/web/admin/generic_product/admin_generic_product_list.xhtml +++ b/web/admin/generic_product/admin_generic_product_list.xhtml @@ -217,14 +217,14 @@ value="#{basicDataListController.allBasicData}" var="basicData" itemValue="#{basicData}" - itemLabel="#{beanHelper.renderBasicData(basicData, true)}" + itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}" /> -- 2.39.5