From 509e29ba68cef3a7ba35db718df56274b4b98bb2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 14 Jul 2017 14:42:04 +0200
Subject: [PATCH] it is beanHelper, not just adminHelper
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../PizzaAdminCustomerWebRequestBean.java     | 12 ++--
 .../customer/admin_customer_delete.xhtml      |  4 +-
 web/admin/customer/admin_customer_edit.xhtml  |  8 +--
 web/admin/customer/admin_customer_list.xhtml  |  2 +-
 web/admin/customer/admin_customer_show.xhtml  | 58 +++++++++----------
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
index c54df4fa..eda423ac 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
@@ -70,7 +70,7 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem
 	 * Bean helper instance
 	 */
 	@Inject
-	private PizzaWebRequestHelperController adminHelper;
+	private PizzaWebRequestHelperController beanHelper;
 
 	/**
 	 * An event being fired when an administrator has added a new customer
@@ -105,7 +105,7 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem
 	@Override
 	public String addCustomer () {
 		// Are at least some fields added?
-		if ((this.adminHelper.getContact() == null) && (!this.isCustomerDataSet())) {
+		if ((this.beanHelper.getContact() == null) && (!this.isCustomerDataSet())) {
 			// Not all customer data is set
 			throw new FaceletException("Please provide minimum personal data: gender, first_name, family_name"); //NOI18N
 		}
@@ -114,9 +114,9 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem
 		Contact contact;
 
 		// Is the contact set in helper?
-		if (this.adminHelper.getContact() instanceof Contact) {
+		if (this.beanHelper.getContact() instanceof Contact) {
 			// Get from helper
-			contact = this.adminHelper.getContact();
+			contact = this.beanHelper.getContact();
 		} else {
 			// Get new contact instance
 			contact = this.adminContactController.createContactInstance();
@@ -133,12 +133,12 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem
 
 		try {
 			// Add/link customer and return updated
-			if (this.adminHelper.getContact() instanceof Contact) {
+			if (this.beanHelper.getContact() instanceof Contact) {
 				// Link customer
 				updatedCustomer = this.adminCustomerBean.linkCustomer(customer);
 
 				// Remove contact instance
-				this.adminHelper.setContact(null);
+				this.beanHelper.setContact(null);
 			} else {
 				// Add new customer instance
 				updatedCustomer = this.adminCustomerBean.addCustomer(customer);
diff --git a/web/admin/customer/admin_customer_delete.xhtml b/web/admin/customer/admin_customer_delete.xhtml
index 96ea5af1..97a00fee 100644
--- a/web/admin/customer/admin_customer_delete.xhtml
+++ b/web/admin/customer/admin_customer_delete.xhtml
@@ -9,8 +9,8 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-		<f:viewAction action="#{adminHelper.copyCustomerToController()}" />
+		<f:viewParam name="customerId" value="#{beanHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyCustomerToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
diff --git a/web/admin/customer/admin_customer_edit.xhtml b/web/admin/customer/admin_customer_edit.xhtml
index c7c6d802..31f92a8e 100644
--- a/web/admin/customer/admin_customer_edit.xhtml
+++ b/web/admin/customer/admin_customer_edit.xhtml
@@ -9,8 +9,8 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-		<f:viewAction action="#{adminHelper.copyCustomerToController()}" />
+		<f:viewParam name="customerId" value="#{beanHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyCustomerToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -23,9 +23,9 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.customer}" />
 
-			<h:form id="form_admin_edit_customer" rendered="#{not empty adminHelper.customer}">
+			<h:form id="form_admin_edit_customer" rendered="#{not empty beanHelper.customer}">
 				<div class="table">
 					<div class="table_header">
 						<h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index 91d0bdc8..4dce8ecb 100644
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -98,7 +98,7 @@
 								</div>
 
 								<div class="table_right_medium">
-									<h:selectOneMenu class="select" id="customerContact" value="#{adminHelper.contact}" converter="ContactConverter">
+									<h:selectOneMenu class="select" id="customerContact" value="#{beanHelper.contact}" converter="ContactConverter">
 										<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 										<f:selectItems value="#{customerController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
 									</h:selectOneMenu>
diff --git a/web/admin/customer/admin_customer_show.xhtml b/web/admin/customer/admin_customer_show.xhtml
index c056eca9..d73f4624 100644
--- a/web/admin/customer/admin_customer_show.xhtml
+++ b/web/admin/customer/admin_customer_show.xhtml
@@ -9,8 +9,8 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-		<f:viewAction action="#{adminHelper.copyCustomerToController()}" />
+		<f:viewParam name="customerId" value="#{beanHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewAction action="#{beanHelper.copyCustomerToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -23,31 +23,31 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.customer}" />
 
-			<h:panelGrid id="customer_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminHelper.customer}">
+			<h:panelGrid id="customer_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.customer}">
 				<f:facet name="header">
 					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-						<f:param value="#{adminHelper.customer.customerId}" />
+						<f:param value="#{beanHelper.customer.customerId}" />
 					</h:outputFormat>
 				</f:facet>
 
 				<h:column>
 					<h:outputLabel for="customerId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />
 
-					<h:outputText id="customerId" styleClass="data_field" value="#{adminHelper.customer.customerId}" />
+					<h:outputText id="customerId" styleClass="data_field" value="#{beanHelper.customer.customerId}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="customerName" styleClass="data_label" value="#{msg.ADMIN_USER_NUMBER}" />
 
-					<h:outputText id="customerName" styleClass="data_field" value="#{adminHelper.customer.customerNumber}" />
+					<h:outputText id="customerName" styleClass="data_field" value="#{beanHelper.customer.customerNumber}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="customerCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />
 
-					<h:outputText id="customerCreated" styleClass="data_field" value="#{adminHelper.customer.customerCreated.time}">
+					<h:outputText id="customerCreated" styleClass="data_field" value="#{beanHelper.customer.customerCreated.time}">
 						<f:convertDateTime for="customerCreated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -55,7 +55,7 @@
 				<h:column>
 					<h:outputLabel for="customerUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-					<h:outputText id="customerUpdated" styleClass="data_field" value="#{adminHelper.customer.customerUpdated.time}">
+					<h:outputText id="customerUpdated" styleClass="data_field" value="#{beanHelper.customer.customerUpdated.time}">
 						<f:convertDateTime for="customerUpdated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -63,13 +63,13 @@
 				<h:column>
 					<h:outputLabel for="customerAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-					<h:outputText id="customerAccountStatus" styleClass="data_field #{adminHelper.customer.customerAccountStatus.styleClass}" value="#{msg[adminHelper.customer.customerAccountStatus.messageKey]}" />
+					<h:outputText id="customerAccountStatus" styleClass="data_field #{beanHelper.customer.customerAccountStatus.styleClass}" value="#{msg[beanHelper.customer.customerAccountStatus.messageKey]}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="customerLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
-					<h:outputText id="customerLastLocked" styleClass="data_field" value="#{adminHelper.customer.customerLastLocked.time}">
+					<h:outputText id="customerLastLocked" styleClass="data_field" value="#{beanHelper.customer.customerLastLocked.time}">
 						<f:convertDateTime for="customerLastLocked" type="both" />
 					</h:outputText>
 				</h:column>
@@ -77,13 +77,13 @@
 				<h:column>
 					<h:outputLabel for="customerLastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
-					<h:outputText id="customerLastLockedReason" styleClass="data_field" value="#{adminHelper.customer.customerLastLockedReason}" />
+					<h:outputText id="customerLastLockedReason" styleClass="data_field" value="#{beanHelper.customer.customerLastLockedReason}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
 
-					<h:outputText id="contactCreated" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactCreated.time}">
+					<h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactCreated.time}">
 						<f:convertDateTime for="contactCreated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -91,7 +91,7 @@
 				<h:column>
 					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
 
-					<h:outputText id="contactUpdated" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactUpdated.time}">
+					<h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactUpdated.time}">
 						<f:convertDateTime for="contactUpdated" type="both" />
 					</h:outputText>
 				</h:column>
@@ -99,69 +99,69 @@
 				<h:column>
 					<h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
-					<h:outputText id="isOwnContact" styleClass="data_field" value="#{adminHelper.customer.customerContact.isOwnContact()}" />
+					<h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.customer.customerContact.isOwnContact()}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
 
-					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[adminHelper.customer.customerContact.contactGender.messageKey]}" />
+					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.customer.customerContact.contactGender.messageKey]}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
 
-					<h:outputText id="contactTitle" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactTitle}" />
+					<h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactTitle}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-					<h:outputText id="contactFirstName" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactFirstName}" />
+					<h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactFirstName}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactFamilyName}" />
+					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactFamilyName}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
-					<h:outputText id="contactStreet" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactStreet}" />
+					<h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactStreet}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
-					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactHouseNumber}" />
+					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactHouseNumber}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
-					<h:outputText id="contactZipCode" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactZipCode}" />
+					<h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactZipCode}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
 
-					<h:outputText id="contactCity" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactCity}" />
+					<h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactCity}" />
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{adminHelper.customer.customerContact.contactEmailAddress}">
-						<h:outputText value="#{adminHelper.customer.customerContact.contactEmailAddress}" />
+					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.customer.customerContact.contactEmailAddress}">
+						<h:outputText value="#{beanHelper.customer.customerContact.contactEmailAddress}" />
 					</h:outputLink>
 				</h:column>
 
 				<h:column>
 					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-					<h:outputText id="contactBirthday" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactBirthday.time}">
+					<h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.customer.customerContact.contactBirthday.time}">
 						<f:convertDateTime for="contactBirthday" type="date" />
 					</h:outputText>
 				</h:column>
@@ -169,14 +169,14 @@
 
 			<div>
 				<ui:include src="/WEB-INF/templates/admin/customer/admin_customer_links.tpl">
-					<ui:param name="customer" value="#{adminHelper.customer}" />
+					<ui:param name="customer" value="#{beanHelper.customer}" />
 				</ui:include>
 			</div>
 
 			<div>
 				<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
-					<ui:param name="mobileNumber" value="#{adminHelper.customer.customerContact.contactCellphoneNumber}" />
-					<ui:param name="contact" value="#{adminHelper.customer.customerContact}" />
+					<ui:param name="mobileNumber" value="#{beanHelper.customer.customerContact.contactCellphoneNumber}" />
+					<ui:param name="contact" value="#{beanHelper.customer.customerContact}" />
 				</ui:include>
 			</div>
 		</ui:define>
-- 
2.39.5