From bafca5c6afc6e17bb6063866708b9c3307f5efd1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 8 Apr 2020 20:39:21 +0200
Subject: [PATCH] Product-only: - renamed
 adminGenericProductActionController.product ->  
 adminGenericProductActionController.currentProduct - p:message is here not
 required as p:growl does the job nicely already - reformatted
 p:outputLabel/p:inputText to have each attribute in separate line
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/product.jsf.taglib.xml            | 18 ---------
 .../admin_form_generic_product_data.tpl       | 40 +++++++++----------
 .../admin_generic_product_delete.xhtml        |  2 +-
 .../admin_generic_product_edit.xhtml          | 21 +++-------
 .../admin_generic_product_list.xhtml          | 18 ++++++---
 .../admin_generic_product_show.xhtml          |  2 +-
 .../admin_product_category_list.xhtml         | 19 +++++++--
 7 files changed, 56 insertions(+), 64 deletions(-)
 rename web/WEB-INF/{resources/tags/forms => templates/admin}/generic_product/admin_form_generic_product_data.tpl (82%)

diff --git a/web/WEB-INF/product.jsf.taglib.xml b/web/WEB-INF/product.jsf.taglib.xml
index 420bc19a..d9254e25 100644
--- a/web/WEB-INF/product.jsf.taglib.xml
+++ b/web/WEB-INF/product.jsf.taglib.xml
@@ -40,22 +40,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
 		</attribute>
 	</tag>
-	<tag>
-		<tag-name>genericProductForm</tag-name>
-		<description>A tag for generic product forms.</description>
-		<source>resources/tags/forms/generic_product/admin_form_generic_product_data.tpl</source>
-		<attribute>
-			<name>targetController</name>
-			<description>A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in.</description>
-			<required>true</required>
-			<!-- @TODO Find an interface for BaseFacesBean and set it here instead -->
-			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
-		</attribute>
-		<attribute>
-			<name>allowDuplicates</name>
-			<description>Whether to allow duplicate i18n keys.</description>
-			<required>false</required>
-			<type>java.lang.Boolean</type>
-		</attribute>
-	</tag>
 </facelet-taglib>
diff --git a/web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
similarity index 82%
rename from web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl
rename to web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
index 69bd1176..3d0c8231 100644
--- a/web/WEB-INF/resources/tags/forms/generic_product/admin_form_generic_product_data.tpl
+++ b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
@@ -20,7 +20,7 @@
 			<p:outputLabel for="productCategory" value="#{product.ADMIN_ASSIGN_PRODUCT_CATEGORY}" />
 			<p:selectOneMenu
 				id="productCategory"
-				value="#{targetController.productCategory}"
+				value="#{adminGenericProductActionController.productCategory}"
 				filter="true"
 				filterMatchMode="contains"
 				required="true"
@@ -43,7 +43,7 @@
 			<p:outputLabel for="productI18nKey" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY}" />
 			<p:inputText
 				id="productI18nKey"
-				value="#{targetController.productI18nKey}"
+				value="#{adminGenericProductActionController.productI18nKey}"
 				maxlength="255"
 				required="true"
 				requiredMessage="#{product.ADMIN_PRODUCT_I18N_KEY_REQUIRED}"
@@ -57,7 +57,7 @@
 			<p:outputLabel for="productNumber" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_NUMBER}" />
 			<p:inputText
 				id="productNumber"
-				value="#{targetController.productNumber}"
+				value="#{adminGenericProductActionController.productNumber}"
 				size="20"
 				maxlength="20"
 				title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE}"
@@ -66,7 +66,7 @@
 			<p:outputLabel for="productBarCodeNumber" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER}" />
 			<p:inputText
 				id="productBarCodeNumber"
-				value="#{targetController.productBarCodeNumber}"
+				value="#{adminGenericProductActionController.productBarCodeNumber}"
 				size="30"
 				maxlength="255"
 				title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER_TITLE}"
@@ -75,7 +75,7 @@
 			<p:outputLabel for="productAgeGroup" value="#{product.ADMIN_SELECT_PRODUCT_AGE_GROUP}" />
 			<p:selectOneMenu
 				id="productAgeGroup"
-				value="#{targetController.productAgeGroup}"
+				value="#{adminGenericProductActionController.productAgeGroup}"
 				filter="true"
 				filterMatchMode="contains"
 				title="#{product.ADMIN_SELECT_PRODUCT_AGE_GROUP_TITLE}"
@@ -96,7 +96,7 @@
 			<p:outputLabel for="productSize" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_SIZE}" />
 			<p:inputText
 				id="productSize"
-				value="#{targetController.productSize}"
+				value="#{adminGenericProductActionController.productSize}"
 				size="5"
 				maxlength="10"
 				title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_SIZE_TITLE}"
@@ -105,7 +105,7 @@
 			<p:outputLabel for="productManufacturer" value="#{product.ADMIN_ASSIGN_PRODUCT_MANUFACTURER}" />
 			<p:selectOneMenu
 				id="productManufacturer"
-				value="#{targetController.productManufacturer}"
+				value="#{adminGenericProductActionController.productManufacturer}"
 				filter="true"
 				filterMatchMode="contains"
 				title="#{product.ADMIN_ASSIGN_PRODUCT_MANUFACTURER_TITLE}"
@@ -126,19 +126,19 @@
 			<p:outputLabel for="productAvailability" value="#{product.ADMIN_ENABLE_PRODUCT_AVAILABILITY}" />
 			<p:selectBooleanCheckbox
 				id="productAvailability"
-				value="#{targetController.productAvailability}"
+				value="#{adminGenericProductActionController.productAvailability}"
 				required="true"
 				requiredMessage="#{product.ADMIN_GENERIC_PRODUCT_AVAILABILITY_REQUIRED}"
 				title="#{product.ADMIN_ENABLE_PRODUCT_AVAILABILITY_TITLE}"
 				/>
 
 			<p:outputLabel value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_PRICE}" />
-			<product:inputProductPricePanelGrid targetController="#{targetController}" />
+			<product:inputProductPricePanelGrid targetController="#{adminGenericProductActionController}" />
 
 			<p:outputLabel for="productCurrencyCode" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE}" />
 			<p:inputText
 				id="productCurrencyCode"
-				value="#{targetController.productCurrencyCode}"
+				value="#{adminGenericProductActionController.productCurrencyCode}"
 				size="3"
 				maxlength="3"
 				title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE_TITLE}"
@@ -149,7 +149,7 @@
 			<p:outputLabel for="productUnitAmount" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT}" />
 			<p:inputNumber
 				id="productUnitAmount"
-				value="#{targetController.productUnitAmount}"
+				value="#{adminGenericProductActionController.productUnitAmount}"
 				size="20"
 				minValue="0.001"
 				maxValue="20000.000"
@@ -161,15 +161,15 @@
 				/>
 
 			<p:outputLabel for="productUnitI18nKey" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY}" />
-				<p:inputText
-					id="productUnitI18nKey"
-					value="#{targetController.productUnitI18nKey}"
-					size="20"
-					maxlength="255"
-					title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE}"
-					required="true"
-					requiredMessage="#{product.ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED}"
+			<p:inputText
+				id="productUnitI18nKey"
+				value="#{adminGenericProductActionController.productUnitI18nKey}"
+				size="20"
+				maxlength="255"
+				title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE}"
+				required="true"
+				requiredMessage="#{product.ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED}"
 				/>
-			</p:panelGrid>
+		</p:panelGrid>
 	</p:fieldset>
 </ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_delete.xhtml b/web/admin/generic_product/admin_generic_product_delete.xhtml
index 20c7a40b..0aba7fc3 100644
--- a/web/admin/generic_product/admin_generic_product_delete.xhtml
+++ b/web/admin/generic_product/admin_generic_product_delete.xhtml
@@ -13,7 +13,7 @@
 			<f:viewParam
 				id="productId"
 				name="productId"
-				value="#{adminGenericProductActionController.product}"
+				value="#{adminGenericProductActionController.currentProduct}"
 				converter="GenericProductConverter"
 				required="true"
 				requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
diff --git a/web/admin/generic_product/admin_generic_product_edit.xhtml b/web/admin/generic_product/admin_generic_product_edit.xhtml
index 3841ebbb..3974b99d 100644
--- a/web/admin/generic_product/admin_generic_product_edit.xhtml
+++ b/web/admin/generic_product/admin_generic_product_edit.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
 	template="/WEB-INF/templates/admin/admin_base.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:product="http://mxchange.org/jsf/jproduct/widgets"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -12,9 +11,8 @@
 	<ui:define name="metadata">
 		<f:metadata>
 			<f:viewParam
-				id="productId"
 				name="productId"
-				value="#{adminGenericProductActionController.product}"
+				value="#{adminGenericProductActionController.currentProduct}"
 				converter="GenericProductConverter"
 				required="true"
 				requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
@@ -36,13 +34,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<p:message
-			for="productId"
-			showSummary="true"
-			rendered="#{empty adminGenericProductActionController.product}"
-			/>
-
-		<h:form rendered="#{not empty adminGenericProductActionController.product}">
+		<h:form rendered="#{not empty adminGenericProductActionController.currentProduct}">
 			<h:inputHidden value="#{adminGenericProductActionController.productId}" />
 
 			<p:panelGrid
@@ -52,9 +44,9 @@
 				<f:facet name="header">
 					<h:outputFormat
 						value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_TITLE}"
-						title="#{local[adminGenericProductActionController.product.productI18nKey]}"
+						title="#{local[adminGenericProductActionController.productI18nKey]}"
 						>
-						<f:param value="#{adminGenericProductActionController.product.productId}" />
+						<f:param value="#{adminGenericProductActionController.productId}" />
 					</h:outputFormat>
 				</f:facet>
 
@@ -62,10 +54,7 @@
 					<h:outputText value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA}" />
 				</h:panelGroup>
 
-				<product:genericProductForm
-					targetController="#{adminGenericProductActionController}"
-					allowDuplicates="true"
-					/>
+				<ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl" />
 
 				<f:facet name="footer">
 					<p:panelGrid columns="2" layout="grid">
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 6a2775d9..77c97c08 100644
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
 	template="/WEB-INF/templates/admin/admin_base.tpl"
 	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:product="http://mxchange.org/jsf/jproduct/widgets"
 	xmlns:product-links="http://mxchange.org/jsf/jproduct/links"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -55,8 +54,17 @@
 							layout="grid"
 							styleClass="ui-noborder"
 							>
-							<p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
-							<p:inputText id="globalFilter" onkeyup="PF('productList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+							<p:outputLabel
+								for="globalFilter"
+								value="#{msg.SEARCH_ALL_FIELDS}"
+								style="float: right"
+								/>
+
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('productList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
 						</p:panelGrid>
 
 						<p:outputPanel>
@@ -368,7 +376,7 @@
 					<h:outputText value="#{product.ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA}" />
 				</h:panelGroup>
 
-				<product:genericProductForm targetController="#{adminGenericProductController}" />
+				<ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl" />
 
 				<f:facet name="footer">
 					<p:panelGrid columns="2" layout="grid">
@@ -380,7 +388,7 @@
 						<p:commandButton
 							type="submit"
 							value="#{product.BUTTON_ADMIN_ADD_GENERIC_PRODUCT}"
-							action="#{adminGenericProductController.addProduct()}"
+							action="#{adminGenericProductActionController.addProduct()}"
 							update=":master:form-list-products:productList"
 							/>
 					</p:panelGrid>
diff --git a/web/admin/generic_product/admin_generic_product_show.xhtml b/web/admin/generic_product/admin_generic_product_show.xhtml
index 3069dcb1..0a73f314 100644
--- a/web/admin/generic_product/admin_generic_product_show.xhtml
+++ b/web/admin/generic_product/admin_generic_product_show.xhtml
@@ -13,7 +13,7 @@
 			<f:viewParam
 				id="productId"
 				name="productId"
-				value="#{adminGenericProductActionController.product}"
+				value="#{adminGenericProductActionController.currentProduct}"
 				converter="GenericProductConverter"
 				required="true"
 				requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml
index 9a60a843..4dc6d579 100644
--- a/web/admin/product_category/admin_product_category_list.xhtml
+++ b/web/admin/product_category/admin_product_category_list.xhtml
@@ -41,7 +41,11 @@
 				>
 
 				<f:facet name="header">
-					<p:panelGrid columns="3" layout="grid" columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2">
+					<p:panelGrid
+						columns="3"
+						layout="grid"
+						columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+						>
 						<p:spacer />
 
 						<p:panelGrid
@@ -50,8 +54,17 @@
 							layout="grid"
 							styleClass="ui-noborder"
 							>
-							<p:outputLabel for="globalFilter" value="#{msg.SEARCH_ALL_FIELDS}" style="float: right" />
-							<p:inputText id="globalFilter" onkeyup="PF('categoryList').filter()" placeholder="#{msg.ENTER_KEYWORD}"/>
+							<p:outputLabel
+								for="globalFilter"
+								value="#{msg.SEARCH_ALL_FIELDS}"
+								style="float: right"
+								/>
+
+							<p:inputText
+								id="globalFilter"
+								onkeyup="PF('departmentList').filter()"
+								placeholder="#{msg.ENTER_KEYWORD}"
+								/>
 						</p:panelGrid>
 
 						<p:outputPanel>
-- 
2.39.5