Please cherry-pick:

- renamed cellphone -> mobile
- renamed carrier -> provider
- renamed phone* -> landLine*
- all more common over all (other) projects

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

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
index 5bb3fe650f5624e6f7773c3b7f459089c67dc747..0f2acff4e58bab21cd9d105d5bee97ddb553cbc0 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
@@ -90,21 +90,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
         */
        private Date birthday;
 
-       /**
-        * Cellphone number's carrier
-        */
-       private MobileProvider mobileCarrier;
-
-       /**
-        * Cellphone id number
-        */
-       private Long mobileId;
-
-       /**
-        * Cellphone number
-        */
-       private Long mobileNumber;
-
        /**
         * City
         */
@@ -186,11 +171,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
         */
        private String houseNumberExtension;
 
-       /**
-        * Whether a cellphone entry has been unlinked
-        */
-       private boolean isCellphoneUnlinked;
-
        /**
         * Whether a fax entry has been unlinked
         */
@@ -202,24 +182,44 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
        private boolean isLandLineUnlinked;
 
        /**
-        * Land-line id number
+        * Whether a cellphone entry has been unlinked
         */
-       private Long landLineId;
+       private boolean isMobileNumberUnlinked;
 
        /**
         * Phone number area code
         */
-       private Integer phoneAreaCode;
+       private Integer landLineAreaCode;
 
        /**
         * Country instance for phone number
         */
-       private Country phoneCountry;
+       private Country landLineCountry;
+
+       /**
+        * Land-line id number
+        */
+       private Long landLineId;
 
        /**
         * Phone number
         */
-       private Long phoneNumber;
+       private Long landLineNumber;
+
+       /**
+        * Mobile id number
+        */
+       private Long mobileId;
+
+       /**
+        * Mobile number
+        */
+       private Long mobileNumber;
+
+       /**
+        * Mobile number's provider
+        */
+       private MobileProvider mobileProvider;
 
        /**
         * Street
@@ -339,7 +339,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
                        // ... cellphone data
                        this.setMobileId(contact.getContactMobileNumber().getPhoneId());
-                       this.setMobileCarrier(contact.getContactMobileNumber().getMobileProvider());
+                       this.setMobileProvider(contact.getContactMobileNumber().getMobileProvider());
                        this.setMobileNumber(contact.getContactMobileNumber().getPhoneNumber());
                }
 
@@ -356,9 +356,9 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
                        // .. land-line data
                        this.setLandLineId(contact.getContactLandLineNumber().getPhoneId());
-                       this.setPhoneAreaCode(contact.getContactLandLineNumber().getPhoneAreaCode());
-                       this.setPhoneCountry(contact.getContactLandLineNumber().getPhoneCountry());
-                       this.setPhoneNumber(contact.getContactLandLineNumber().getPhoneNumber());
+                       this.setLandLineAreaCode(contact.getContactLandLineNumber().getPhoneAreaCode());
+                       this.setLandLineCountry(contact.getContactLandLineNumber().getPhoneCountry());
+                       this.setLandLineNumber(contact.getContactLandLineNumber().getPhoneNumber());
                }
 
                // Log message
@@ -386,8 +386,8 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                }
 
                // Generate phone number
-               DialableLandLineNumber landLine = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
-               DialableMobileNumber mobile = new MobileNumber(this.getMobileCarrier(), this.getMobileNumber());
+               DialableLandLineNumber landLine = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
+               DialableMobileNumber mobile = new MobileNumber(this.getMobileProvider(), this.getMobileNumber());
                DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Create new instance
@@ -408,7 +408,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                contact.setContactOwnContact(Boolean.TRUE);
 
                // Don't set null or wrong references
-               if ((landLine instanceof DialableLandLineNumber) && (landLine.getPhoneCountry() instanceof Country) && (this.getPhoneAreaCode() != null) && (this.getPhoneNumber() != null) && (this.getPhoneAreaCode() > 0) && (this.getPhoneNumber() > 0)) {
+               if ((landLine instanceof DialableLandLineNumber) && (landLine.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) {
                        // Now the number must be given
                        if (landLine.getPhoneAreaCode() == null) {
                                // Is null
@@ -450,7 +450,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                }
 
                // Is the provider set?
-               if ((mobile instanceof DialableMobileNumber) && (this.getMobileCarrier() instanceof MobileProvider) && (this.getMobileNumber() != null) && (this.getMobileNumber() > 0)) {
+               if ((mobile instanceof DialableMobileNumber) && (this.getMobileProvider() instanceof MobileProvider) && (this.getMobileNumber() != null) && (this.getMobileNumber() > 0)) {
                        // Is the number set?
                        if (mobile.getPhoneNumber() == null) {
                                // Is null
@@ -489,7 +489,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                this.updateContactData(contact);
 
                // Call EJB for updating contact data
-               Contact updatedContact = this.contactBean.updateContactData(contact, this.isCellphoneUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
+               Contact updatedContact = this.contactBean.updateContactData(contact, this.isMobileNumberUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
 
                // Fire event
                this.updatedContactEvent.fire(new AdminUpdatedContactEvent(updatedContact));
@@ -502,9 +502,9 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
        }
 
        @Override
-       public String generateCellphoneNumber (final DialableMobileNumber cellphoneNumber) {
+       public String generateMobileNumber (final DialableMobileNumber mobileNumber) {
                // Is it null?
-               if (null == cellphoneNumber) {
+               if (null == mobileNumber) {
                        // Return null
                        return null;
                }
@@ -512,9 +512,9 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                // Get all data
                String number = String.format(
                           "%s%d%d", //NOI18N
-                          cellphoneNumber.getMobileProvider().getProviderCountry().getCountryExternalDialPrefix(),
-                          cellphoneNumber.getMobileProvider().getProviderDialPrefix(),
-                          cellphoneNumber.getPhoneNumber()
+                          mobileNumber.getMobileProvider().getProviderCountry().getCountryExternalDialPrefix(),
+                          mobileNumber.getMobileProvider().getProviderDialPrefix(),
+                          mobileNumber.getPhoneNumber()
           );
 
                // Return it
@@ -553,36 +553,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                this.birthday = birthday;
        }
 
-       @Override
-       public MobileProvider getMobileCarrier () {
-               return this.mobileCarrier;
-       }
-
-       @Override
-       public void setMobileCarrier (final MobileProvider mobileCarrier) {
-               this.mobileCarrier = mobileCarrier;
-       }
-
-       @Override
-       public Long getMobileId () {
-               return this.mobileId;
-       }
-
-       @Override
-       public void setMobileId (final Long mobileId) {
-               this.mobileId = mobileId;
-       }
-
-       @Override
-       public Long getMobileNumber () {
-               return this.mobileNumber;
-       }
-
-       @Override
-       public void setMobileNumber (Long mobileNumber) {
-               this.mobileNumber = mobileNumber;
-       }
-
        @Override
        public String getCity () {
                return this.city;
@@ -734,6 +704,26 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                this.houseNumberExtension = houseNumberExtension;
        }
 
+       @Override
+       public Integer getLandLineAreaCode () {
+               return this.landLineAreaCode;
+       }
+
+       @Override
+       public void setLandLineAreaCode (final Integer landLineAreaCode) {
+               this.landLineAreaCode = landLineAreaCode;
+       }
+
+       @Override
+       public Country getLandLineCountry () {
+               return this.landLineCountry;
+       }
+
+       @Override
+       public void setLandLineCountry (final Country landLineCountry) {
+               this.landLineCountry = landLineCountry;
+       }
+
        @Override
        public Long getLandLineId () {
                return this.landLineId;
@@ -745,33 +735,43 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
        }
 
        @Override
-       public Integer getPhoneAreaCode () {
-               return this.phoneAreaCode;
+       public Long getLandLineNumber () {
+               return this.landLineNumber;
        }
 
        @Override
-       public void setPhoneAreaCode (final Integer phoneAreaCode) {
-               this.phoneAreaCode = phoneAreaCode;
+       public void setLandLineNumber (final Long landLineNumber) {
+               this.landLineNumber = landLineNumber;
        }
 
        @Override
-       public Country getPhoneCountry () {
-               return this.phoneCountry;
+       public Long getMobileId () {
+               return this.mobileId;
        }
 
        @Override
-       public void setPhoneCountry (final Country phoneCountry) {
-               this.phoneCountry = phoneCountry;
+       public void setMobileId (final Long mobileId) {
+               this.mobileId = mobileId;
+       }
+
+       @Override
+       public Long getMobileNumber () {
+               return this.mobileNumber;
+       }
+
+       @Override
+       public void setMobileNumber (Long mobileNumber) {
+               this.mobileNumber = mobileNumber;
        }
 
        @Override
-       public Long getPhoneNumber () {
-               return this.phoneNumber;
+       public MobileProvider getMobileProvider () {
+               return this.mobileProvider;
        }
 
        @Override
-       public void setPhoneNumber (final Long phoneNumber) {
-               this.phoneNumber = phoneNumber;
+       public void setMobileProvider (final MobileProvider mobileProvider) {
+               this.mobileProvider = mobileProvider;
        }
 
        @Override
@@ -855,10 +855,10 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
 
                // - contact data
                this.setEmailAddress(null);
-               this.setPhoneCountry(null);
-               this.setPhoneAreaCode(null);
-               this.setPhoneNumber(null);
-               this.setMobileCarrier(null);
+               this.setLandLineCountry(null);
+               this.setLandLineAreaCode(null);
+               this.setLandLineNumber(null);
+               this.setMobileProvider(null);
                this.setMobileNumber(null);
                this.setFaxCountry(null);
                this.setFaxAreaCode(null);
@@ -931,10 +931,10 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                contact.setContactCountry(this.getCountry());
 
                // Update contact's cellphone number
-               this.isCellphoneUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileCarrier(), this.getMobileNumber());
+               this.isMobileNumberUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber());
 
                // Update contact's land-line number
-               this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
+               this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
 
                // Update contact's fax number
                this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
index 18238811ff3b692f8bb576443a4cfeff4043058f..008eeda15306073e9c2f22a3a80351bcb5d03267 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
@@ -66,14 +66,14 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
        /**
         * Getter for cellphone id
         * <p>
-        * @return Cellphone id
+        * @return Mobile id
         */
        Long getMobileId ();
 
        /**
         * Setter for cellphone id
         * <p>
-        * @param cellphoneId Cellphone id
+        * @param cellphoneId Mobile id
         */
        void setMobileId (final Long cellphoneId);
 
@@ -122,30 +122,30 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
        /**
         * Getter for ellphone number's carrier
         * <p>
-        * @return Cellphone number's carrier
+        * @return Mobile number's carrier
         */
-       MobileProvider getMobileCarrier ();
+       MobileProvider getMobileProvider ();
 
        /**
         * Setter for cellphone number's carrier prefix
         * <p>
-        * @param cellphoneCarrier Cellphone number's carrier prefix
+        * @param cellphoneCarrier Mobile number's carrier prefix
         */
-       void setMobileCarrier (final MobileProvider cellphoneCarrier);
+       void setMobileProvider (final MobileProvider cellphoneCarrier);
 
        /**
         * Getter for ellphone number
         * <p>
-        * @return Cellphone number
+        * @return Mobile number
         */
        Long getMobileNumber ();
 
        /**
         * Setter for ellphone number
         * <p>
-        * @param cellphoneNumber Cellphone number
+        * @param mobileNumber Mobile number
         */
-       void setMobileNumber (final Long cellphoneNumber);
+       void setMobileNumber (final Long mobileNumber);
 
        /**
         * City
@@ -335,42 +335,42 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
         * <p>
         * @return Phone number's area code
         */
-       Integer getPhoneAreaCode ();
+       Integer getLandLineAreaCode ();
 
        /**
         * Setter for phone number's area code
         * <p>
         * @param phoneAreaCode Phone number's area code
         */
-       void setPhoneAreaCode (final Integer phoneAreaCode);
+       void setLandLineAreaCode (final Integer phoneAreaCode);
 
        /**
         * Getter for phone number's country instance
         * <p>
         * @return Phone number's country instance
         */
-       Country getPhoneCountry ();
+       Country getLandLineCountry ();
 
        /**
         * Setter for phone number's country instance
         * <p>
         * @param phoneCountry Phone number's country instance
         */
-       void setPhoneCountry (final Country phoneCountry);
+       void setLandLineCountry (final Country phoneCountry);
 
        /**
         * Getter for phone number
         * <p>
         * @return Phone number
         */
-       Long getPhoneNumber ();
+       Long getLandLineNumber ();
 
        /**
         * Setter for phone number
         * <p>
         * @param phoneNumber Phone number
         */
-       void setPhoneNumber (final Long phoneNumber);
+       void setLandLineNumber (final Long phoneNumber);
 
        /**
         * Street
@@ -444,11 +444,11 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
         * Returns a text representation of given cellphone number or null if not
         * set.
         * <p>
-        * @param cellphoneNumber Cellphone number
+        * @param mobileNumber Mobile number
         * <p>
         * @return Text respresentation or null
         */
-       String generateCellphoneNumber (final DialableMobileNumber cellphoneNumber);
+       String generateMobileNumber (final DialableMobileNumber mobileNumber);
 
        /**
         * Checks/returns whether the gender/salutation is required for this

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
index fa011585cafd581dd60bc139e783ffc467deeac9..8cade173de3b40c63851e82f6d4abff3e184c54b 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
@@ -174,29 +174,29 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        private boolean isMobileUnlinked;
 
        /**
-        * Mobile number's carrier
+        * Phone number area code
         */
-       private MobileProvider mobileCarrier;
+       private Integer landLineAreaCode;
 
        /**
-        * Mobile number
+        * Country instance for phone number
         */
-       private Long mobileNumber;
+       private Country landLineCountry;
 
        /**
-        * Phone number area code
+        * Phone number
         */
-       private Integer phoneAreaCode;
+       private Long landLineNumber;
 
        /**
-        * Country instance for phone number
+        * Mobile number
         */
-       private Country phoneCountry;
+       private Long mobileNumber;
 
        /**
-        * Phone number
+        * Mobile number's carrier
         */
-       private Long phoneNumber;
+       private MobileProvider mobileProvider;
 
        /**
         * A list of all selectable contacts
@@ -465,8 +465,8 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
 
                // Generate phone number
-               DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
-               DialableMobileNumber mobile = new MobileNumber(this.getMobileCarrier(), this.getMobileNumber());
+               DialableLandLineNumber phone = new LandLineNumber(this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
+               DialableMobileNumber mobile = new MobileNumber(this.getMobileProvider(), this.getMobileNumber());
                DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Create new contact
@@ -482,7 +482,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                contact.setContactComment(this.getComment());
 
                // Don't set null or wrong references
-               if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneCountry() instanceof Country) && (this.getPhoneAreaCode() != null) && (this.getPhoneNumber() != null) && (this.getPhoneAreaCode() > 0) && (this.getPhoneNumber() > 0)) {
+               if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) {
                        // Now the number must be given
                        if (phone.getPhoneAreaCode() == null) {
                                // Is null
@@ -524,7 +524,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                }
 
                // Is the provider set?
-               if ((mobile instanceof DialableMobileNumber) && (this.getMobileCarrier() instanceof MobileProvider) && (this.getMobileNumber() != null) && (this.getMobileNumber() > 0)) {
+               if ((mobile instanceof DialableMobileNumber) && (this.getMobileProvider() instanceof MobileProvider) && (this.getMobileNumber() != null) && (this.getMobileNumber() > 0)) {
                        // Is the number set?
                        if (mobile.getPhoneNumber() == null) {
                                // Is null
@@ -577,10 +577,10 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                contact.setContactCountry(this.getCountry());
 
                // Update contact's mobile number
-               this.isMobileUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileCarrier(), this.getMobileNumber());
+               this.isMobileUnlinked = ContactUtils.updateMobileNumber(contact, this.getMobileProvider(), this.getMobileNumber());
 
                // Update contact's land-line number
-               this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
+               this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getLandLineCountry(), this.getLandLineAreaCode(), this.getLandLineNumber());
 
                // Update contact's fax number
                this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
@@ -746,53 +746,53 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        }
 
        @Override
-       public MobileProvider getMobileCarrier () {
-               return this.mobileCarrier;
+       public Integer getLandLineAreaCode () {
+               return this.landLineAreaCode;
        }
 
        @Override
-       public void setMobileCarrier (final MobileProvider mobileCarrier) {
-               this.mobileCarrier = mobileCarrier;
+       public void setLandLineAreaCode (final Integer landLineAreaCode) {
+               this.landLineAreaCode = landLineAreaCode;
        }
 
        @Override
-       public Long getMobileNumber () {
-               return this.mobileNumber;
+       public Country getLandLineCountry () {
+               return this.landLineCountry;
        }
 
        @Override
-       public void setMobileNumber (final Long mobileNumber) {
-               this.mobileNumber = mobileNumber;
+       public void setLandLineCountry (final Country landLineCountry) {
+               this.landLineCountry = landLineCountry;
        }
 
        @Override
-       public Integer getPhoneAreaCode () {
-               return this.phoneAreaCode;
+       public Long getLandLineNumber () {
+               return this.landLineNumber;
        }
 
        @Override
-       public void setPhoneAreaCode (final Integer phoneAreaCode) {
-               this.phoneAreaCode = phoneAreaCode;
+       public void setLandLineNumber (final Long landLineNumber) {
+               this.landLineNumber = landLineNumber;
        }
 
        @Override
-       public Country getPhoneCountry () {
-               return this.phoneCountry;
+       public Long getMobileNumber () {
+               return this.mobileNumber;
        }
 
        @Override
-       public void setPhoneCountry (final Country phoneCountry) {
-               this.phoneCountry = phoneCountry;
+       public void setMobileNumber (final Long mobileNumber) {
+               this.mobileNumber = mobileNumber;
        }
 
        @Override
-       public Long getPhoneNumber () {
-               return this.phoneNumber;
+       public MobileProvider getMobileProvider () {
+               return this.mobileProvider;
        }
 
        @Override
-       public void setPhoneNumber (final Long phoneNumber) {
-               this.phoneNumber = phoneNumber;
+       public void setMobileProvider (final MobileProvider mobileProvider) {
+               this.mobileProvider = mobileProvider;
        }
 
        @Override
@@ -1023,10 +1023,10 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                // - contact data
                this.setEmailAddress(null);
                this.setEmailAddressRepeat(null);
-               this.setPhoneAreaCode(null);
-               this.setPhoneCountry(null);
-               this.setPhoneNumber(null);
-               this.setMobileCarrier(null);
+               this.setLandLineAreaCode(null);
+               this.setLandLineCountry(null);
+               this.setLandLineNumber(null);
+               this.setMobileProvider(null);
                this.setMobileNumber(null);
                this.setFaxAreaCode(null);
                this.setFaxCountry(null);
@@ -1078,13 +1078,13 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
 
                // - contact data
                if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneAreaCode() > 0)) {
-                       this.setPhoneCountry(phone.getPhoneCountry());
-                       this.setPhoneAreaCode(phone.getPhoneAreaCode());
-                       this.setPhoneNumber(phone.getPhoneNumber());
+                       this.setLandLineCountry(phone.getPhoneCountry());
+                       this.setLandLineAreaCode(phone.getPhoneAreaCode());
+                       this.setLandLineNumber(phone.getPhoneNumber());
                }
 
                if ((mobile instanceof DialableMobileNumber) && (mobile.getMobileProvider() instanceof MobileProvider)) {
-                       this.setMobileCarrier(mobile.getMobileProvider());
+                       this.setMobileProvider(mobile.getMobileProvider());
                        this.setMobileNumber(mobile.getPhoneNumber());
                }
 

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
index e85561083c27372fb14eb5d6e6f254350bdf0a07..39a36f4c4ab9a9d72c5b5f13838fb6034d95b5a3 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
@@ -91,14 +91,14 @@ public interface PizzaContactWebSessionController extends Serializable {
         * <p>
         * @return Mobile number's carrier
         */
-       MobileProvider getMobileCarrier ();
+       MobileProvider getMobileProvider ();
 
        /**
         * Setter for mobile number's carrier prefix
         * <p>
         * @param mobileCarrier Mobile number's carrier prefix
         */
-       void setMobileCarrier (final MobileProvider mobileCarrier);
+       void setMobileProvider (final MobileProvider mobileCarrier);
 
        /**
         * Getter for mobile number
@@ -302,42 +302,42 @@ public interface PizzaContactWebSessionController extends Serializable {
         * <p>
         * @return Phone number's area code
         */
-       Integer getPhoneAreaCode ();
+       Integer getLandLineAreaCode ();
 
        /**
         * Setter for phone number's area code
         * <p>
         * @param phoneAreaCode Phone number's area code
         */
-       void setPhoneAreaCode (final Integer phoneAreaCode);
+       void setLandLineAreaCode (final Integer phoneAreaCode);
 
        /**
         * Getter for phone number's country instance
         * <p>
         * @return Phone number's country instance
         */
-       Country getPhoneCountry ();
+       Country getLandLineCountry ();
 
        /**
         * Setter for phone number's country instance
         * <p>
         * @param phoneCountry Phone number's country instance
         */
-       void setPhoneCountry (final Country phoneCountry);
+       void setLandLineCountry (final Country phoneCountry);
 
        /**
         * Getter for phone number
         * <p>
         * @return Phone number
         */
-       Long getPhoneNumber ();
+       Long getLandLineNumber ();
 
        /**
         * Setter for phone number
         * <p>
         * @param phoneNumber Phone number
         */
-       void setPhoneNumber (final Long phoneNumber);
+       void setLandLineNumber (final Long phoneNumber);
 
        /**
         * Street

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 fd6e71379eb6bc82be4267ccce8cc24a1ec19608..77695f023d9d0ef4e7921078816940c3f7f49f17 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -230,7 +230,7 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+                                       <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">

diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index 65aef5bba92c79531225d50dbe8c3eff7082b7bf..a1771998368e32e84fd16a0a32f41603ddc26ab8 100644 (file)
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -12,8 +12,8 @@
                        <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                </h:selectOneMenu>
 
-               <h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
-                       <f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
+               <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{targetController.mobileNumber}">
+                       <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                </h:inputText>
        </ui:fragment>
 

diff --git a/web/admin/customer/admin_customer_show.xhtml b/web/admin/customer/admin_customer_show.xhtml
index 68a1e36251e261fd2b9486bb4aa9797874258f2f..c056eca9f096bb3cf938ab3fb2640ed74c5be1ed 100644 (file)
--- a/web/admin/customer/admin_customer_show.xhtml
+++ b/web/admin/customer/admin_customer_show.xhtml
@@ -175,7 +175,7 @@
 
                        <div>
                                <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
-                                       <ui:param name="cellphoneNumber" value="#{adminHelper.customer.customerContact.contactCellphoneNumber}" />
+                                       <ui:param name="mobileNumber" value="#{adminHelper.customer.customerContact.contactCellphoneNumber}" />
                                        <ui:param name="contact" value="#{adminHelper.customer.customerContact}" />
                                </ui:include>
                        </div>