From afddf82c9c097629ae3fd560c56b13b7d6a67185 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 22 Jul 2016 10:19:07 +0200
Subject: [PATCH] Continued a bit: (please cherry-pick this) - don't use the
 converter attribute, better use <f:converter converterId="FooConverter" />

---
 .../templates/admin/contact/admin_form_contact_data.tpl  | 9 ++++++---
 .../admin/mobile_provider/admin_form_mobile_provider.tpl | 3 ++-
 web/WEB-INF/templates/contact/form_contact_data.tpl      | 9 ++++++---
 web/WEB-INF/templates/generic/mobile_selection_box.tpl   | 3 ++-
 web/admin/user/admin_user_list.xhtml                     | 3 ++-
 5 files changed, 18 insertions(+), 9 deletions(-)

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 46b9f7f5..60cb517b 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
@@ -195,7 +195,8 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
+					<h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
 					</h:selectOneMenu>
@@ -214,7 +215,8 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
@@ -237,7 +239,8 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
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 a6889e35..860e960a 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
@@ -65,7 +65,8 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 009cd9db..7973bb5c 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -210,7 +210,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
@@ -229,7 +230,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
@@ -252,7 +254,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}">
+						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index 46eee37a..2985f768 100644
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -6,7 +6,8 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
+		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}">
+			<f:converter converterId="MobileProviderConverter" />
 			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 			<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
 		</h:selectOneMenu>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index fbe3d66f..89f6c70d 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -103,7 +103,8 @@
 								</div>
 
 								<div class="table_right_medium">
-									<h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
+									<h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}">
+										<f:converter converterId="ContactConverter" />
 										<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 										<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
 									</h:selectOneMenu>
-- 
2.39.5