From: Roland Häder <roland@mxchange.org>
Date: Sun, 27 Aug 2017 13:21:06 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=593423b33d1c92d40886efcf572908c1a20a28ca;p=addressbook-war.git

Please cherry-pick:
- converted administrative fax, land-line and mobile number data templates as
  custom JSF tags, having again more type-safe tags instead of outputting
  messages on missing bean properties

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
new file mode 100644
index 00000000..4d773ad2
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
+		<fieldset class="fieldset" id="fax_data">
+			<legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:outputText id="faxNumberId" value="#{faxNumber.phoneId}" />
+				</div>
+			</h:panelGroup>
+
+			<widgets:outputFaxInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
+		</fieldset>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
new file mode 100644
index 00000000..8461e52e
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
+		<fieldset class="fieldset" id="landline_data">
+			<legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:outputText id="landLineNumberId" value="#{landLineNumber.phoneId}" />
+				</div>
+			</h:panelGroup>
+
+			<widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
+		</fieldset>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
new file mode 100644
index 00000000..6e454c15
--- /dev/null
+++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
+		<fieldset class="fieldset" id="mobile_data">
+			<legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:outputText id="mobileNumberId" value="#{mobileNumber.phoneId}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
+						<f:converter converterId="MobileProviderConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
+					</h:selectOneMenu>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="mobileProvider" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+			</h:panelGroup>
+		</fieldset>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
deleted file mode 100644
index 78e7d6e5..00000000
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.faxNumber}">
-		<fieldset class="fieldset" id="fax_data">
-			<legend title="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
-
-			<widgets:outputFaxInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
deleted file mode 100644
index 6c9a55a4..00000000
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.landLineNumber}">
-		<fieldset class="fieldset" id="landline_data">
-			<legend title="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
-
-			<widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
deleted file mode 100644
index 9eb576d1..00000000
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.mobileNumber}">
-		<fieldset class="fieldset" id="mobile_data">
-			<legend title="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND_TITLE}">
-				<h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
-			</legend>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
-						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
-					</h:selectOneMenu>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="mobileProvider" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-				</div>
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
-			</h:panelGroup>
-		</fieldset>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index 66d02b6b..11287cce 100644
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -138,6 +138,57 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<type>java.lang.Boolean</type>
 		</attribute>
 	</tag>
+	<tag>
+		<tag-name>outputAdminFaxDataFormFields</tag-name>
+		<description>This tag renders a fieldset for administrative purposes of fax data.</description>
+		<source>resources/tags/admin/form_data/fax/admin_form_fax_data.tpl</source>
+		<attribute>
+			<name>faxNumber</name>
+			<description>The fax instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminLandLineDataFormFields</tag-name>
+		<description>This tag renders a fieldset for administrative purposes of land-line data.</description>
+		<source>resources/tags/admin/form_data/landline/admin_form_landline_data.tpl</source>
+		<attribute>
+			<name>landLineNumber</name>
+			<description>The fax instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
+	<tag>
+		<tag-name>outputAdminMobileDataFormFields</tag-name>
+		<description>This tag renders a fieldset for administrative purposes of mobile data.</description>
+		<source>resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl</source>
+		<attribute>
+			<name>mobileNumber</name>
+			<description>The mobile instance that provides the data for this tag.</description>
+			<required>true</required>
+			<type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
+		</attribute>
+		<attribute>
+			<name>rendered</name>
+			<description>Whether this tag is being rendered by JSF engine.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+	</tag>
 	<tag>
 		<tag-name>outputAdminUserDataFormFields</tag-name>
 		<description>This tag renders a fieldset for administrative purposes of user data.</description>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 81562422..8df391cf 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -30,7 +30,7 @@
 					</h:outputFormat>
 				</div>
 
-				<ui:include src="/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl" />
+				<widgets:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 42cc7150..7d0c91e9 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -30,7 +30,7 @@
 					</h:outputFormat>
 				</div>
 
-				<ui:include src="/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl" />
+				<widgets:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 411e9dde..48811996 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -30,7 +30,7 @@
 					</h:outputFormat>
 				</div>
 
-				<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
+				<widgets:outputAdminMobileDataFormFields mobileNumber="#{beanHelper.mobileNumber}" />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />