Renamed more: (please cherry-pick)

- renamed mobileId -> mobileNumberId
- renamed faxId -> faxNumberId

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
index 8b8cd79af0331554e007f449cccfb59525a6e7c1..83e517dcbf78cac02bf6c4e88144dba380c0c8bc 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
@@ -90,11 +90,6 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
         */
        private Date birthday;
 
-       /**
-        * Mobile id number
-        */
-       private Long mobileId;
-
        /**
         * City
         */
@@ -154,14 +149,14 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
        private Country faxCountry;
 
        /**
-        * Fax id number
+        * Fax number
         */
-       private Long faxId;
+       private Long faxNumber;
 
        /**
-        * Fax number
+        * Fax id number
         */
-       private Long faxNumber;
+       private Long faxNumberId;
 
        /**
         * First name
@@ -208,6 +203,11 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
         */
        private Long mobileNumber;
 
+       /**
+        * Mobile id number
+        */
+       private Long mobileNumberId;
+
        /**
         * Mobile provider
         */
@@ -374,14 +374,14 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
 
                // ... mobile data
                if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
-                       this.setMobileId(contact.getContactMobileNumber().getPhoneId());
+                       this.setMobileNumberId(contact.getContactMobileNumber().getPhoneId());
                        this.setMobileProvider(contact.getContactMobileNumber().getMobileProvider());
                        this.setMobileNumber(contact.getContactMobileNumber().getPhoneNumber());
                }
 
                // ... fax data
                if (contact.getContactFaxNumber() instanceof DialableFaxNumber) {
-                       this.setFaxId(contact.getContactFaxNumber().getPhoneId());
+                       this.setFaxNumberId(contact.getContactFaxNumber().getPhoneId());
                        this.setFaxAreaCode(contact.getContactFaxNumber().getPhoneAreaCode());
                        this.setFaxCountry(contact.getContactFaxNumber().getPhoneCountry());
                        this.setFaxNumber(contact.getContactFaxNumber().getPhoneNumber());
@@ -609,23 +609,23 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
        }
 
        @Override
-       public Long getFaxId () {
-               return this.faxId;
+       public Long getFaxNumber () {
+               return this.faxNumber;
        }
 
        @Override
-       public void setFaxId (final Long faxId) {
-               this.faxId = faxId;
+       public void setFaxNumber (final Long faxNumber) {
+               this.faxNumber = faxNumber;
        }
 
        @Override
-       public Long getFaxNumber () {
-               return this.faxNumber;
+       public Long getFaxNumberId () {
+               return this.faxNumberId;
        }
 
        @Override
-       public void setFaxNumber (final Long faxNumber) {
-               this.faxNumber = faxNumber;
+       public void setFaxNumberId (final Long faxNumberId) {
+               this.faxNumberId = faxNumberId;
        }
 
        @Override
@@ -679,23 +679,23 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
        }
 
        @Override
-       public Long getMobileId () {
-               return this.mobileId;
+       public Long getMobileNumber () {
+               return this.mobileNumber;
        }
 
        @Override
-       public void setMobileId (final Long mobileId) {
-               this.mobileId = mobileId;
+       public void setMobileNumber (Long mobileNumber) {
+               this.mobileNumber = mobileNumber;
        }
 
        @Override
-       public Long getMobileNumber () {
-               return this.mobileNumber;
+       public Long getMobileNumberId () {
+               return this.mobileNumberId;
        }
 
        @Override
-       public void setMobileNumber (Long mobileNumber) {
-               this.mobileNumber = mobileNumber;
+       public void setMobileNumberId (final Long mobileNumberId) {
+               this.mobileNumberId = mobileNumberId;
        }
 
        @Override

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java
index 8e154ec4308777dfb8f6caee524467a115d60bab..127f1218455c25a24d94dd67f6d184d1a0fe0c00 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java
@@ -83,28 +83,28 @@ public interface JobsAdminContactWebRequestController extends Serializable {
         * <p>
         * @return Mobile id
         */
-       Long getMobileId ();
+       Long getMobileNumberId ();
 
        /**
-        * Setter for mobile id
+        * Setter for mobile number id
         * <p>
-        * @param mobileId Mobile id
+        * @param mobileNumberId Mobile number id
         */
-       void setMobileId (final Long mobileId);
+       void setMobileNumberId (final Long mobileNumberId);
 
        /**
         * Getter for fax id
         * <p>
         * @return Fax id
         */
-       Long getFaxId ();
+       Long getFaxNumberId ();
 
        /**
-        * Setter for fax id
+        * Setter for fax number id
         * <p>
-        * @param faxId Fax id
+        * @param faxNumberId Fax number id
         */
-       void setFaxId (final Long faxId);
+       void setFaxNumberId (final Long faxNumberId);
 
        /**
         * Getter for land-line id

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
index d36f4093af1a79f35b0e7411d45edf7ec357149f..77c204204bde1463cbcf24e1802404a34b396074 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
@@ -196,7 +196,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl
                        updatedContact = this.adminPhoneBean.unlinkMobileDataFromContact(this.beanHelper.getContact(), this.beanHelper.getMobileNumber());
                } catch (final MobileNumberNotLinkedException ex) {
                        // Did not work
-                       this.showFacesMessage("form_unlink_contact_mobile:mobileId", ex); //NOI18N
+                       this.showFacesMessage("form_unlink_contact_mobile:mobileNumberId", ex); //NOI18N
                        return ""; //NOI18N
                }
 

diff --git a/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java b/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java
index abc5831d4fa06206df6376caf7cc0b4e6ef087c8..74bd6a2e9893d15cd3bc64ca8ae6c1175efed7eb 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/cellphone/JobsMobileConverter.java
@@ -90,10 +90,10 @@ public class JobsMobileConverter implements Converter {
 
                try {
                        // Try to parse the value as long
-                       Long mobileId = Long.valueOf(submittedValue);
+                       Long mobileNumberId = Long.valueOf(submittedValue);
 
                        // Try to get mobile instance from it
-                       mobileNumber = this.phoneBean.findMobileNumberById(mobileId);
+                       mobileNumber = this.phoneBean.findMobileNumberById(mobileNumberId);
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
index 96ccac2564dffa5be365ff9e12b421165c627c68..3735c9057341eea051729aa062f4bcc058ce4201 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -14,11 +14,11 @@
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="mobileId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+                               <h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
 
-                               <h:outputText id="mobileId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                               <h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
 
-                               <h:message for="mobileId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
                </h:column>
 

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
index 9a46cc1e4c8f11318cb0b81f003676e232561dee..59e5b24fb0f83f1e2dcb47e2325832bb00456962 100644 (file)
--- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
+++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl
@@ -15,11 +15,11 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="mobileId" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+                                       <h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:outputText id="mobileId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                                       <h:outputText id="mobileNumberId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
                                </div>
 
                                <div class="clear"></div>