From 4594de3cf123c1559a8dbd2eb80d641f18d37f0c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 2 May 2016 12:04:11 +0200
Subject: [PATCH] renamed converter to make them more clear (in JSF page)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@haeder.net>
Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../country/PizzaCountryConverter.java        |  2 +-
 .../admin/contact/admin_form_contact_data.tpl | 58 ++++++++++---------
 .../admin_form_mobile_provider.tpl            |  2 +-
 .../templates/generic/form_personal_data.tpl  |  6 +-
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java b/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java
index 15db8b6e..0387a1c7 100644
--- a/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java
+++ b/src/java/org/mxchange/pizzaapplication/converter/country/PizzaCountryConverter.java
@@ -36,7 +36,7 @@ import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
-@FacesConverter (value = "country")
+@FacesConverter (value = "CountryConverter")
 public class PizzaCountryConverter implements Converter {
 
 	/**
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 8baf888e..b1c484b1 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -10,11 +10,11 @@
 			<legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}</legend>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="gender" value="#{msg.ADMIN_PERSONAL_DATA_GENDER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table_right">
 					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
@@ -24,35 +24,39 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
+				<div class="table_right">
+					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" required="true">
+						<f:validator for="firstName" validatorId="NameValidator" />
+					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
+				<div class="table_right">
+					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" required="true">
+						<f:validator for="familyName" validatorId="NameValidator" />
+					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table_right">
 					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
 				</div>
 
@@ -60,11 +64,11 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table_right">
 					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
@@ -74,11 +78,11 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table_right">
 					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
 					</h:inputText>
@@ -88,11 +92,11 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table_right">
 					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
 				</div>
 
@@ -100,12 +104,12 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu class="select" id="country" value="#{adminContactController.country}" converter="country">
+				<div class="table_right">
+					<h:selectOneMenu class="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
@@ -115,12 +119,12 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="country">
+				<div class="table_right">
+					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
@@ -138,12 +142,12 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu class="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="country">
+				<div class="table_right">
+					<h:selectOneMenu class="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
@@ -161,11 +165,11 @@
 			</div>
 
 			<div class="table_row">
-				<div class="table_left_medium">
+				<div class="table_left">
 					<h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table_right">
 					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
 						<ui:param name="targetController" value="#{adminContactController}" />
 					</ui:include>
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 086ab151..5858d1b1 100644
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -59,7 +59,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu class="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="country">
+					<h:selectOneMenu class="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index 39ca0137..cd04d70a 100644
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -117,7 +117,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="country" value="#{contactController.country}" converter="country">
+					<h:selectOneMenu class="select" id="country" value="#{contactController.country}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
@@ -132,7 +132,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="country">
+					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
@@ -155,7 +155,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="country">
+					<h:selectOneMenu class="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
-- 
2.39.2