needs to be renamed as well ... (please cherry-pick)

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

diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java
index 94f65c4734771bec27f3cf4572b8ee979df7cf5c..5f70dd180041fc334b2ea046916403241387e1a5 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java
+++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java
@@ -111,9 +111,6 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
 
                // Set all fields: user
                this.adminContactController.copyContactToController(this.getContact());
-
-               // Log message
-               //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyContactToController - EXIT!"); //NOI18N
        }
 
        @Override
@@ -121,28 +118,28 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
                // Validate mobile instance
                if (this.getMobileNumber() == null) {
                        // Throw NPE
-                       throw new NullPointerException("this.cellPhoneNumber is null");
+                       throw new NullPointerException("this.mobileNumber is null");
                } else if (this.getMobileNumber().getPhoneId() == null) {
                        // Throw again
-                       throw new NullPointerException("this.cellPhoneNumber.phoneId is null");
+                       throw new NullPointerException("this.mobileNumber.phoneId is null");
                } else if (this.getMobileNumber().getPhoneId() < 1) {
                        // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.phoneId={0} is not valid", this.getMobileNumber().getPhoneId()));
+                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.phoneId={0} is not valid", this.getMobileNumber().getPhoneId()));
                } else if (this.getMobileNumber().getMobileProvider() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("this.cellPhoneNumber.mobileProvider is null");
+                       throw new NullPointerException("this.mobileNumber.mobileProvider is null");
                } else if (this.getMobileNumber().getMobileProvider().getProviderId() == null) {
                        // ... throw again
-                       throw new NullPointerException("this.cellPhoneNumber.mobileProvider.providerId is null");
+                       throw new NullPointerException("this.mobileNumber.mobileProvider.providerId is null");
                } else if (this.getMobileNumber().getMobileProvider().getProviderId() < 1) {
                        // Invalid id
-                       throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.mobileProvider.providerId={0} is invalid", this.getMobileNumber().getMobileProvider().getProviderId()));
+                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.mobileProvider.providerId={0} is invalid", this.getMobileNumber().getMobileProvider().getProviderId()));
                } else if (this.getMobileNumber().getPhoneNumber() == null) {
                        // Throw NPE again ...
-                       throw new NullPointerException("this.cellPhoneNumber.phoneNumber is null");
+                       throw new NullPointerException("this.mobileNumber.phoneNumber is null");
                } else if (this.getMobileNumber().getPhoneNumber() < 1) {
                        // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.phoneNumber={0} is not valid", this.getMobileNumber().getPhoneNumber()));
+                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.phoneNumber={0} is not valid", this.getMobileNumber().getPhoneNumber()));
                }
 
                // Copy all (changeable) data fields to admin controller
@@ -178,9 +175,6 @@ public class JobsWebRequestHelper implements JobsWebRequestController {
 
                // Set all fields: user
                this.userController.setUserName(this.getUser().getUserName());
-
-               // Log message
-               //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyUserToController - EXIT!"); //NOI18N
        }
 
        @Override

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
index dfcbea2af4615391394567c736d7093f52782717..66728ce6ac8aa7af6a8bdd3d26fd22be37be9efb 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
@@ -70,14 +70,14 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
         */
        @Inject
        @Any
-       private Event<AdminDeletedMobileNumberEvent> cellPhoneNumberDeletedEvent;
+       private Event<AdminDeletedMobileNumberEvent> mobileNumberDeletedEvent;
 
        /**
         * Event being fired when an administrator has updated mobile number
         */
        @Inject
        @Any
-       private Event<AdminUpdatedMobileNumberEvent> cellPhoneNumberUpdatedEvent;
+       private Event<AdminUpdatedMobileNumberEvent> mobileNumberUpdatedEvent;
 
        /**
         * Cell phone number
@@ -170,7 +170,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
                this.adminPhoneBean.deleteMobileData(this.beanHelper.getMobileNumber());
 
                // Fire event
-               this.cellPhoneNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(this.beanHelper.getMobileNumber()));
+               this.mobileNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(this.beanHelper.getMobileNumber()));
 
                // All fine, redirect
                return "admin_list_mobile?faces-redirect=true&includeViewParams=true"; //NOI18N
@@ -233,7 +233,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
                DialableMobileNumber updatedNumber = this.adminPhoneBean.updateMobileData(this.beanHelper.getMobileNumber());
 
                // Fire event
-               this.cellPhoneNumberUpdatedEvent.fire(new AdminMobileNumberUpdatedEvent(updatedNumber));
+               this.mobileNumberUpdatedEvent.fire(new AdminMobileNumberUpdatedEvent(updatedNumber));
 
                // All fine, redirect
                return "admin_edit_mobile?faces-redirect=true&includeViewParams=true"; //NOI18N

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
index 59e5b24fb0f83f1e2dcb47e2325832bb00456962..e96f209a874871596c57700c5467e48047d2ad49 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
 
        <div class="para">
                <fieldset class="fieldset" id="phone_data">
@@ -19,7 +19,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:outputText id="mobileNumberId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                       <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index 3735c9057341eea051729aa062f4bcc058ce4201..f3ecc47f579a64c4baf72a725a6f4a2d129eda17 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -5,9 +5,9 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.cellPhoneNumber}">
+       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
                <f:facet name="header">
                        <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
                </f:facet>
@@ -16,7 +16,7 @@
                        <h:panelGroup>
                                <h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
 
-                               <h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                               <h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneId}" />
 
                                <h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
@@ -26,15 +26,15 @@
                        <h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
                        <h:link outcome="admin_show_mobile_provider">
-                               <f:param name="providerId" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerId}" />
-                               <h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerName}" />
+                               <f:param name="providerId" value="#{beanHelper.mobileNumber.mobileProvider.providerId}" />
+                               <h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
                        </h:link>
                </h:column>
 
                <h:column>
                        <h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.mobileProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
+                       <h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
index 098677e9b1da340ce482a27dc9fcb78a87d1c864..18fcec5b9b144a4fdb56b1d6d2fd49a18bc4a8b1 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -5,15 +5,15 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <ui:fragment rendered="#{not empty beanHelper.cellPhoneNumber}">
+       <ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
                <ul class="mini_nav">
                        <ui:fragment rendered="#{empty isShowPage or not isShowPage}">
                                <li class="mini_link">
                                        <h:link outcome="admin_show_mobile">
                                                <h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
-                                               <f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                        </h:link>
                                </li>
                        </ui:fragment>
@@ -21,7 +21,7 @@
                        <li class="mini_link">
                                <h:link outcome="admin_edit_mobile">
                                        <h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
-                                       <f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </h:link>
                        </li>
 
@@ -29,7 +29,7 @@
                                <li class="mini_link">
                                        <h:link outcome="admin_unlink_contact_mobile">
                                                <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                               <f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </h:link>
                                </li>
@@ -38,7 +38,7 @@
                        <li class="mini_link">
                                <h:link outcome="admin_delete_mobile">
                                        <h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-                                       <f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </h:link>
                        </li>
                </ul>

diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index 55946ea21fd8acca6ccdb1d349e76e1a81f829ad..beedcd7b0c29add7a5b8e11ef9f58a672fa5bee5 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -8,7 +8,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
                <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
        </f:metadata>
 
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.cellPhoneNumber}">
+                       <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.mobileNumber}">
                                <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
@@ -50,12 +50,12 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
 
                        <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.cellPhoneNumber}">
-                               <f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.mobileNumber}">
+                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </ui:define>

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 721ecfba1ca3ad834cdf858efe60c68d2211b602..e019280096eb974211bc04c7ff8924e9c950f661 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -8,7 +8,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -19,7 +19,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
+                       <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                                <h:panelGroup styleClass="table" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
@@ -42,7 +42,7 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 59293a7345bfaf01f31197f69c19b81139edd467..8b51bc60727c895b8d6e69821d1ef18210be5fb1 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -8,7 +8,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
                <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
        </f:metadata>
 
@@ -20,7 +20,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
+                       <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
                                <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
                                                #{msg.ADMIN_EDIT_MOBILE_TITLE}
@@ -35,7 +35,7 @@
                                </h:panelGroup>
                        </h:form>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
                </ui:define>
        </ui:composition>
 </html>

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 3823a92c8b45a8308dc25e777755948975219768..7ea9fa79fa913ff6057913a50e6cde065adda109 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -8,7 +8,7 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -26,7 +26,7 @@
                        <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
                                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_LINKS}">
-                                               <f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
                                        </h:outputFormat>
                                </f:facet>
 
@@ -79,7 +79,7 @@
                                                        <li class="mini_link">
                                                                <h:link outcome="admin_unlink_contact_mobile">
                                                                        <h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-                                                                       <f:param name="phoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                                                       <f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
                                                                        <f:param name="contactId" value="#{contact.contactId}" />
                                                                </h:link>
                                                        </li>