Please cherry-pick:

- also renamed this as all mobile phones are supported, not just cellular

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java
index 09e6e4e496966ee45f0fcecc477069d1fdb84335..0f156a448ab211600db205d4f8cfcfa57a558c41 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java
@@ -30,9 +30,9 @@ import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
+import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent;
 import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
@@ -166,14 +166,14 @@ public class JobsContactPhoneWebSessionBean extends BaseLandingController implem
        }
 
        @Override
-       public List<Contact> allCellphoneContacts () {
+       public List<Contact> allMobileNumberContacts () {
                // Get id
-               DialableMobileNumber phone = this.beanHelper.getMobileNumber();
+               DialableMobileNumber mobileNumber = this.beanHelper.getMobileNumber();
 
                // Is cache there?
-               if (this.contacts.containsKey(phone)) {
+               if (this.contacts.containsKey(mobileNumber)) {
                        // Return cached version
-                       return this.contacts.get(phone);
+                       return this.contacts.get(mobileNumber);
                } else {
                        // Ask bean
                        List<Contact> list = new LinkedList<>();
@@ -188,7 +188,7 @@ public class JobsContactPhoneWebSessionBean extends BaseLandingController implem
                        }
 
                        // Store result in cache
-                       this.contacts.put(phone, list);
+                       this.contacts.put(mobileNumber, list);
 
                        // Return now-cached list
                        return list;

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java
index eff200db29fede02877324e9cbf670db43e438d7..9a8f06ccd3631697b6bf1ffe8d7a7776c12ed189 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java
@@ -22,8 +22,8 @@ import javax.ejb.Local;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
-import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent;
+import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 
 /**
  * An interface for user beans
@@ -34,11 +34,11 @@ import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEv
 public interface JobsContactPhoneWebSessionController extends Serializable {
 
        /**
-        * Getter for all contacts having current mobile instance linked
+        * Getter for all contacts having current mobile number linked
         * <p>
         * @return List of all linked contacts
         */
-       List<Contact> allCellphoneContacts ();
+       List<Contact> allMobileNumberContacts ();
 
        /**
         * Event observer for newly added users by adminstrator

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 7ea9fa79fa913ff6057913a50e6cde065adda109..04c37ee3b880f835c80e7906360917c04d805cf6 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -23,7 +23,7 @@
                                <ui:param name="isShowPage" value="#{true}" />
                        </ui:include>
 
-                       <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">
+                       <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allMobileNumberContacts()}" 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.mobileNumber.phoneId}" />