- 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>
*/
private Date birthday;
*/
private Date birthday;
- /**
- * Cellphone number's carrier
- */
- private MobileProvider mobileCarrier;
-
- /**
- * Cellphone id number
- */
- private Long mobileId;
-
- /**
- * Cellphone number
- */
- private Long mobileNumber;
-
*/
private String houseNumberExtension;
*/
private String houseNumberExtension;
- /**
- * Whether a cellphone entry has been unlinked
- */
- private boolean isCellphoneUnlinked;
-
/**
* Whether a fax entry has been unlinked
*/
/**
* Whether a fax entry has been unlinked
*/
private boolean isLandLineUnlinked;
/**
private boolean isLandLineUnlinked;
/**
+ * Whether a cellphone entry has been unlinked
- private Long landLineId;
+ private boolean isMobileNumberUnlinked;
/**
* Phone number area code
*/
/**
* Phone number area code
*/
- private Integer phoneAreaCode;
+ private Integer landLineAreaCode;
/**
* Country instance for phone number
*/
/**
* Country instance for phone number
*/
- private Country phoneCountry;
+ private Country landLineCountry;
+
+ /**
+ * Land-line id number
+ */
+ private Long landLineId;
- private Long phoneNumber;
+ private Long landLineNumber;
+
+ /**
+ * Mobile id number
+ */
+ private Long mobileId;
+
+ /**
+ * Mobile number
+ */
+ private Long mobileNumber;
+
+ /**
+ * Mobile number's provider
+ */
+ private MobileProvider mobileProvider;
if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
// ... cellphone data
this.setMobileId(contact.getContactMobileNumber().getPhoneId());
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());
}
this.setMobileNumber(contact.getContactMobileNumber().getPhoneNumber());
}
if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
// .. land-line data
this.setLandLineId(contact.getContactLandLineNumber().getPhoneId());
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());
}
// Generate phone number
}
// 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
DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
// Create new instance
contact.setContactOwnContact(Boolean.TRUE);
// Don't set null or wrong references
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
// Now the number must be given
if (landLine.getPhoneAreaCode() == null) {
// Is null
}
// Is the provider set?
}
// 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
// Is the number set?
if (mobile.getPhoneNumber() == null) {
// Is null
this.updateContactData(contact);
// Call EJB for updating contact data
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));
// Fire event
this.updatedContactEvent.fire(new AdminUpdatedContactEvent(updatedContact));
- public String generateCellphoneNumber (final DialableMobileNumber cellphoneNumber) {
+ public String generateMobileNumber (final DialableMobileNumber mobileNumber) {
- if (null == cellphoneNumber) {
+ if (null == mobileNumber) {
// Return null
return null;
}
// Return null
return null;
}
// Get all data
String number = String.format(
"%s%d%d", //NOI18N
// 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()
this.birthday = birthday;
}
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;
@Override
public String getCity () {
return this.city;
this.houseNumberExtension = houseNumberExtension;
}
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;
@Override
public Long getLandLineId () {
return this.landLineId;
- public Integer getPhoneAreaCode () {
- return this.phoneAreaCode;
+ public Long getLandLineNumber () {
+ return this.landLineNumber;
- public void setPhoneAreaCode (final Integer phoneAreaCode) {
- this.phoneAreaCode = phoneAreaCode;
+ public void setLandLineNumber (final Long landLineNumber) {
+ this.landLineNumber = landLineNumber;
- public Country getPhoneCountry () {
- return this.phoneCountry;
+ public Long getMobileId () {
+ return this.mobileId;
- 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;
- public Long getPhoneNumber () {
- return this.phoneNumber;
+ public MobileProvider getMobileProvider () {
+ return this.mobileProvider;
- public void setPhoneNumber (final Long phoneNumber) {
- this.phoneNumber = phoneNumber;
+ public void setMobileProvider (final MobileProvider mobileProvider) {
+ this.mobileProvider = mobileProvider;
// - contact data
this.setEmailAddress(null);
// - 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);
this.setMobileNumber(null);
this.setFaxCountry(null);
this.setFaxAreaCode(null);
contact.setContactCountry(this.getCountry());
// Update contact's cellphone number
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
// 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());
// Update contact's fax number
this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
/**
* Getter for cellphone id
* <p>
/**
* Getter for cellphone id
* <p>
*/
Long getMobileId ();
/**
* Setter for cellphone id
* <p>
*/
Long getMobileId ();
/**
* Setter for cellphone id
* <p>
- * @param cellphoneId Cellphone id
+ * @param cellphoneId Mobile id
*/
void setMobileId (final Long cellphoneId);
*/
void setMobileId (final Long cellphoneId);
/**
* Getter for ellphone number's carrier
* <p>
/**
* 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>
/**
* 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>
/**
* Getter for ellphone number
* <p>
- * @return Cellphone number
+ * @return Mobile number
*/
Long getMobileNumber ();
/**
* Setter for ellphone number
* <p>
*/
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);
* <p>
* @return Phone number's area code
*/
* <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
*/
/**
* 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
*/
/**
* 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
*/
/**
* 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
*/
/**
* Getter for phone number
* <p>
* @return Phone number
*/
- Long getPhoneNumber ();
+ Long getLandLineNumber ();
/**
* Setter for phone number
* <p>
* @param phoneNumber Phone number
*/
/**
* Setter for phone number
* <p>
* @param phoneNumber Phone number
*/
- void setPhoneNumber (final Long phoneNumber);
+ void setLandLineNumber (final Long phoneNumber);
* Returns a text representation of given cellphone number or null if not
* set.
* <p>
* 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
*/
* <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
/**
* Checks/returns whether the gender/salutation is required for this
private boolean isMobileUnlinked;
/**
private boolean isMobileUnlinked;
/**
- * Mobile number's carrier
+ * Phone number area code
- private MobileProvider mobileCarrier;
+ private Integer landLineAreaCode;
+ * Country instance for phone number
- private Long mobileNumber;
+ private Country landLineCountry;
- * Phone number area code
- private Integer phoneAreaCode;
+ private Long landLineNumber;
- * Country instance for phone number
- private Country phoneCountry;
+ private Long mobileNumber;
+ * Mobile number's carrier
- private Long phoneNumber;
+ private MobileProvider mobileProvider;
/**
* A list of all selectable contacts
/**
* A list of all selectable contacts
assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
// Generate phone number
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
DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
// Create new contact
contact.setContactComment(this.getComment());
// Don't set null or wrong references
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
// Now the number must be given
if (phone.getPhoneAreaCode() == null) {
// Is null
}
// Is the provider set?
}
// 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
// Is the number set?
if (mobile.getPhoneNumber() == null) {
// Is null
contact.setContactCountry(this.getCountry());
// Update contact's mobile number
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
// 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());
// Update contact's fax number
this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
- public MobileProvider getMobileCarrier () {
- return this.mobileCarrier;
+ public Integer getLandLineAreaCode () {
+ return this.landLineAreaCode;
- public void setMobileCarrier (final MobileProvider mobileCarrier) {
- this.mobileCarrier = mobileCarrier;
+ public void setLandLineAreaCode (final Integer landLineAreaCode) {
+ this.landLineAreaCode = landLineAreaCode;
- public Long getMobileNumber () {
- return this.mobileNumber;
+ public Country getLandLineCountry () {
+ return this.landLineCountry;
- public void setMobileNumber (final Long mobileNumber) {
- this.mobileNumber = mobileNumber;
+ public void setLandLineCountry (final Country landLineCountry) {
+ this.landLineCountry = landLineCountry;
- public Integer getPhoneAreaCode () {
- return this.phoneAreaCode;
+ public Long getLandLineNumber () {
+ return this.landLineNumber;
- public void setPhoneAreaCode (final Integer phoneAreaCode) {
- this.phoneAreaCode = phoneAreaCode;
+ public void setLandLineNumber (final Long landLineNumber) {
+ this.landLineNumber = landLineNumber;
- public Country getPhoneCountry () {
- return this.phoneCountry;
+ public Long getMobileNumber () {
+ return this.mobileNumber;
- public void setPhoneCountry (final Country phoneCountry) {
- this.phoneCountry = phoneCountry;
+ public void setMobileNumber (final Long mobileNumber) {
+ this.mobileNumber = mobileNumber;
- public Long getPhoneNumber () {
- return this.phoneNumber;
+ public MobileProvider getMobileProvider () {
+ return this.mobileProvider;
- public void setPhoneNumber (final Long phoneNumber) {
- this.phoneNumber = phoneNumber;
+ public void setMobileProvider (final MobileProvider mobileProvider) {
+ this.mobileProvider = mobileProvider;
// - contact data
this.setEmailAddress(null);
this.setEmailAddressRepeat(null);
// - 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);
this.setMobileNumber(null);
this.setFaxAreaCode(null);
this.setFaxCountry(null);
// - contact data
if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneAreaCode() > 0)) {
// - 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)) {
}
if ((mobile instanceof DialableMobileNumber) && (mobile.getMobileProvider() instanceof MobileProvider)) {
- this.setMobileCarrier(mobile.getMobileProvider());
+ this.setMobileProvider(mobile.getMobileProvider());
this.setMobileNumber(mobile.getPhoneNumber());
}
this.setMobileNumber(mobile.getPhoneNumber());
}
* <p>
* @return Mobile number's carrier
*/
* <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
*/
/**
* 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
/**
* Getter for mobile number
* <p>
* @return Phone number's area code
*/
* <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
*/
/**
* 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
*/
/**
* 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
*/
/**
* 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
*/
/**
* Getter for phone number
* <p>
* @return Phone number
*/
- Long getPhoneNumber ();
+ Long getLandLineNumber ();
/**
* Setter for phone number
* <p>
* @param phoneNumber Phone number
*/
/**
* Setter for phone number
* <p>
* @param phoneNumber Phone number
*/
- void setPhoneNumber (final Long phoneNumber);
+ void setLandLineNumber (final Long phoneNumber);
<div class="table_row">
<div class="table_left_medium">
<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">
</div>
<div class="table_right_medium">
<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
</h:selectOneMenu>
<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>
</h:inputText>
</ui:fragment>
<div>
<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl">
<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>
<ui:param name="contact" value="#{adminHelper.customer.customerContact}" />
</ui:include>
</div>