import org.mxchange.jjobs.beans.BaseJobsController;
import org.mxchange.jjobs.beans.helper.JobsWebRequestController;
import org.mxchange.jphone.phonenumbers.DialableNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
private Date birthday;
/**
- * Cellphone number's carrier
+ * Mobile id number
*/
- private MobileProvider cellphoneCarrier;
-
- /**
- * Cellphone id number
- */
- private Long cellphoneId;
-
- /**
- * Cellphone number
- */
- private Long cellphoneNumber;
+ private Long mobileId;
/**
* City
*/
private String houseNumberExtension;
- /**
- * Whether a cellphone entry has been unlinked
- */
- private boolean isCellphoneUnlinked;
-
/**
* Whether a fax entry has been unlinked
*/
*/
private boolean isLandLineUnlinked;
+ /**
+ * Whether a mobile entry has been unlinked
+ */
+ private boolean isMobileUnlinked;
+
/**
* Land-line id number
*/
private Long landLineId;
+ /**
+ * Mobile number
+ */
+ private Long mobileNumber;
+
+ /**
+ * Mobile provider
+ */
+ private MobileProvider mobileProvider;
+
/**
* Phone number area code
*/
this.setStreet(contact.getContactStreet());
this.setZipCode(contact.getContactZipCode());
- // ... cellphone data
- if (contact.getContactCellphoneNumber() instanceof DialableCellphoneNumber) {
- this.setCellphoneId(contact.getContactCellphoneNumber().getPhoneId());
- this.setCellphoneCarrier(contact.getContactCellphoneNumber().getCellphoneProvider());
- this.setCellphoneNumber(contact.getContactCellphoneNumber().getPhoneNumber());
+ // ... mobile data
+ if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
+ this.setMobileId(contact.getContactMobileNumber().getPhoneId());
+ this.setMobileProvider(contact.getContactMobileNumber().getMobileProvider());
+ this.setMobileNumber(contact.getContactMobileNumber().getPhoneNumber());
}
// ... fax 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.isMobileUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
// Fire event
this.updatedContactEvent.fire(new AdminContactUpdatedEvent(updatedContact));
}
@Override
- public String generateCellphoneNumber (final DialableCellphoneNumber cellphoneNumber) {
+ public String generateMobileNumber (final DialableMobileNumber mobileNumber) {
// Is it null?
- if (null == cellphoneNumber) {
+ if (null == mobileNumber) {
// Return null
return null;
}
// Get all data
String number = String.format(
"%s%d%d", //NOI18N
- cellphoneNumber.getCellphoneProvider().getProviderCountry().getCountryExternalDialPrefix(),
- cellphoneNumber.getCellphoneProvider().getProviderDialPrefix(),
- cellphoneNumber.getPhoneNumber()
+ mobileNumber.getMobileProvider().getProviderCountry().getCountryExternalDialPrefix(),
+ mobileNumber.getMobileProvider().getProviderDialPrefix(),
+ mobileNumber.getPhoneNumber()
);
// Return it
this.birthday = birthday;
}
- @Override
- public MobileProvider getCellphoneCarrier () {
- return this.cellphoneCarrier;
- }
-
- @Override
- public void setCellphoneCarrier (final MobileProvider cellphoneCarrier) {
- this.cellphoneCarrier = cellphoneCarrier;
- }
-
- @Override
- public Long getCellphoneId () {
- return this.cellphoneId;
- }
-
- @Override
- public void setCellphoneId (final Long cellphoneId) {
- this.cellphoneId = cellphoneId;
- }
-
- @Override
- public Long getCellphoneNumber () {
- return this.cellphoneNumber;
- }
-
- @Override
- public void setCellphoneNumber (Long cellphoneNumber) {
- this.cellphoneNumber = cellphoneNumber;
- }
-
@Override
public String getCity () {
return this.city;
this.landLineId = landLineId;
}
+ @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 MobileProvider getMobileProvider () {
+ return this.mobileProvider;
+ }
+
+ @Override
+ public void setMobileProvider (final MobileProvider mobileProvider) {
+ this.mobileProvider = mobileProvider;
+ }
+
@Override
public Integer getPhoneAreaCode () {
return this.phoneAreaCode;
this.setPhoneCountry(null);
this.setPhoneAreaCode(null);
this.setPhoneNumber(null);
- this.setCellphoneCarrier(null);
- this.setCellphoneNumber(null);
+ this.setMobileProvider(null);
+ this.setMobileNumber(null);
this.setFaxCountry(null);
this.setFaxAreaCode(null);
this.setFaxNumber(null);
contact.setContactCountry(this.getCountry());
contact.setContactEmailAddress(this.getEmailAddress());
- // Update contact's cellphone number
- this.isCellphoneUnlinked = ContactUtils.updateCellPhoneNumber(contact, this.getCellphoneCarrier(), this.getCellphoneNumber());
+ // Update contact's mobile number
+ this.isMobileUnlinked = ContactUtils.updateCellPhoneNumber(contact, this.getMobileProvider(), this.getMobileNumber());
// Update contact's land-line number
this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
import org.mxchange.jcontacts.contact.gender.Gender;
import org.mxchange.jcountry.data.Country;
import org.mxchange.jphone.phonenumbers.DialableNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
String editContactData ();
/**
- * Getter for cellphone id
+ * Getter for mobile id
* <p>
- * @return Cellphone id
+ * @return Mobile id
*/
- Long getCellphoneId ();
+ Long getMobileId ();
/**
- * Setter for cellphone id
+ * Setter for mobile id
* <p>
- * @param cellphoneId Cellphone id
+ * @param mobileId Mobile id
*/
- void setCellphoneId (final Long cellphoneId);
+ void setMobileId (final Long mobileId);
/**
* Getter for fax id
void setBirthday (final Date birthday);
/**
- * Getter for ellphone number's carrier
+ * Getter for mobile provider
* <p>
- * @return Cellphone number's carrier
+ * @return mobile provider
*/
- MobileProvider getCellphoneCarrier ();
+ MobileProvider getMobileProvider ();
/**
- * Setter for cellphone number's carrier prefix
+ * Setter for mobile provider
* <p>
- * @param cellphoneCarrier Cellphone number's carrier prefix
+ * @param mobileProvider Mobile provider
*/
- void setCellphoneCarrier (final MobileProvider cellphoneCarrier);
+ void setMobileProvider (final MobileProvider mobileProvider);
/**
- * Getter for ellphone number
+ * Getter for mobile number
* <p>
- * @return Cellphone number
+ * @return Mobile number
*/
- Long getCellphoneNumber ();
+ Long getMobileNumber ();
/**
- * Setter for ellphone number
+ * Setter for mobile number
* <p>
- * @param cellphoneNumber Cellphone number
+ * @param mobileNumber Mobile number
*/
- void setCellphoneNumber (final Long cellphoneNumber);
+ void setMobileNumber (final Long mobileNumber);
/**
* City
String generatePhoneNumber (final DialableNumber phoneNumber);
/**
- * Returns a text representation of given cellphone number or null if not
+ * Returns a text representation of given mobile number or null if not
* set.
* <p>
- * @param cellphoneNumber Cellphone number
+ * @param mobileNumber Mobile number
* <p>
* @return Text respresentation or null
*/
- String generateCellphoneNumber (final DialableCellphoneNumber cellphoneNumber);
+ String generateMobileNumber (final DialableMobileNumber mobileNumber);
}
import org.mxchange.jjobs.beans.BaseJobsController;
import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
-import org.mxchange.jphone.events.cellphone.remove.AdminRemoveCellphoneNumberFromListEvent;
-import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.events.mobile.remove.AdminRemoveMobileNumberFromListEvent;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.phonenumbers.mobile.MobileNumber;
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
import org.mxchange.jusercore.events.login.UserLoggedInEvent;
*/
private Date birthday;
- /**
- * Cellphone number's carrier
- */
- private MobileProvider cellphoneCarrier;
-
- /**
- * Cellphone number
- */
- private Long cellphoneNumber;
-
/**
* City
*/
*/
private String houseNumberExtension;
- /**
- * Whether a cellphone entry has been unlinked
- */
- private boolean isCellphoneUnlinked;
-
/**
* Whether a fax entry has been unlinked
*/
*/
private boolean isLandLineUnlinked;
+ /**
+ * Whether a mobile entry has been unlinked
+ */
+ private boolean isMobileUnlinked;
+
+ /**
+ * Cellphone number
+ */
+ private Long mobileNumber;
+
+ /**
+ * Mobile provider
+ */
+ private MobileProvider mobileProvider;
+
/**
* Phone number area code
*/
// Generate phone number
DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
- DialableCellphoneNumber cellphone = new CellphoneNumber(this.getCellphoneCarrier(), this.getCellphoneNumber());
+ DialableMobileNumber mobile = new MobileNumber(this.getMobileProvider(), this.getMobileNumber());
DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
// Create new contact
}
// Is the provider set?
- if ((cellphone instanceof DialableCellphoneNumber) && (this.getCellphoneCarrier() instanceof MobileProvider) && (this.getCellphoneNumber() != null) && (this.getCellphoneNumber() > 0)) {
+ if ((mobile instanceof DialableMobileNumber) && (this.getMobileProvider() instanceof MobileProvider) && (this.getMobileNumber() != null) && (this.getMobileNumber() > 0)) {
// Is the number set?
- if (cellphone.getPhoneNumber() == null) {
+ if (mobile.getPhoneNumber() == null) {
// Is null
- throw new NullPointerException("cellphone.phoneNumber is null"); //NOI18N
- } else if (cellphone.getPhoneNumber() < 1) {
+ throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
+ } else if (mobile.getPhoneNumber() < 1) {
// Abort here
- throw new IllegalArgumentException("cellphone.phoneNumber is zero or below."); //NOI18N
+ throw new IllegalArgumentException("mobileNumber.phoneNumber is zero or below."); //NOI18N
}
- // Set cellphone number
- contact.setContactCellphoneNumber(cellphone);
+ // Set mobile number
+ contact.setContactMobileNumber(mobile);
}
// Trace message
contact.setContactCity(this.getCity());
contact.setContactCountry(this.getCountry());
- // Update contact's cellphone number
- this.isCellphoneUnlinked = ContactUtils.updateCellPhoneNumber(contact, this.getCellphoneCarrier(), this.getCellphoneNumber());
+ // Update contact's mobile number
+ this.isMobileUnlinked = ContactUtils.updateCellPhoneNumber(contact, this.getMobileProvider(), this.getMobileNumber());
// Update contact's land-line number
this.isLandLineUnlinked = ContactUtils.updateLandLineNumber(contact, this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
this.isFaxUnlinked = ContactUtils.updateFaxNumber(contact, this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
// Send it to the EJB
- this.contactBean.updateContactData(contact, this.isCellphoneUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
+ this.contactBean.updateContactData(contact, this.isMobileUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
// All fine
return "contact_data_saved"; //NOI18N
this.birthday = birthday;
}
- @Override
- public MobileProvider getCellphoneCarrier () {
- return this.cellphoneCarrier;
- }
-
- @Override
- public void setCellphoneCarrier (final MobileProvider cellphoneCarrier) {
- this.cellphoneCarrier = cellphoneCarrier;
- }
-
- @Override
- public Long getCellphoneNumber () {
- return this.cellphoneNumber;
- }
-
- @Override
- public void setCellphoneNumber (Long cellphoneNumber) {
- this.cellphoneNumber = cellphoneNumber;
- }
-
@Override
public String getCity () {
return this.city;
this.houseNumberExtension = houseNumberExtension;
}
+ @Override
+ public Long getMobileNumber () {
+ return this.mobileNumber;
+ }
+
+ @Override
+ public void setMobileNumber (Long mobileNumber) {
+ this.mobileNumber = mobileNumber;
+ }
+
+ @Override
+ public MobileProvider getMobileProvider () {
+ return this.mobileProvider;
+ }
+
+ @Override
+ public void setMobileProvider (final MobileProvider mobileProvider) {
+ this.mobileProvider = mobileProvider;
+ }
+
@Override
public Integer getPhoneAreaCode () {
return this.phoneAreaCode;
}
@Override
- public void removeCellphoneNumberFromListEvent (@Observes final AdminRemoveCellphoneNumberFromListEvent event) {
+ public void removeMobileNumberFromListEvent (@Observes final AdminRemoveMobileNumberFromListEvent event) {
// event should not be null
if (null == event) {
// Throw NPE
throw new NullPointerException("event is null"); //NOI18N
- } else if (event.getCellphoneList()== null) {
+ } else if (event.getCellphoneList() == null) {
// Throw NPE again
- throw new NullPointerException("event.cellphoneList is null"); //NOI18N
+ throw new NullPointerException("event.mobileList is null"); //NOI18N
} else if (event.getCellphoneList().isEmpty()) {
// List is empty, no need to check
return;
// Check all entries
for (final Contact contact : this.contactList) {
- // Is the cell phone instance set and in list?
- if ((contact.getContactCellphoneNumber() instanceof DialableCellphoneNumber) && (event.getCellphoneList().contains(contact.getContactCellphoneNumber()))) {
+ // Is the mobile instance set and in list?
+ if ((contact.getContactMobileNumber() instanceof DialableMobileNumber) && (event.getCellphoneList().contains(contact.getContactMobileNumber()))) {
// Found it, so remvoe it from list
- event.getCellphoneList().remove(contact.getContactCellphoneNumber());
+ event.getCellphoneList().remove(contact.getContactMobileNumber());
}
}
}
this.setPhoneAreaCode(null);
this.setPhoneCountry(null);
this.setPhoneNumber(null);
- this.setCellphoneCarrier(null);
- this.setCellphoneNumber(null);
+ this.setMobileProvider(null);
+ this.setMobileNumber(null);
this.setFaxAreaCode(null);
this.setFaxCountry(null);
this.setFaxNumber(null);
this.setBirthday(contact.getContactBirthday());
this.setComment(contact.getContactComment());
- // Get cellphone, phone and fax instance
- DialableCellphoneNumber cellphone = contact.getContactCellphoneNumber();
+ // Get mobile, phone and fax instance
+ DialableMobileNumber mobile = contact.getContactMobileNumber();
DialableFaxNumber fax = contact.getContactFaxNumber();
DialableLandLineNumber phone = contact.getContactLandLineNumber();
this.setPhoneNumber(phone.getPhoneNumber());
}
- if ((cellphone instanceof DialableCellphoneNumber) && (cellphone.getCellphoneProvider() instanceof MobileProvider)) {
- this.setCellphoneCarrier(cellphone.getCellphoneProvider());
- this.setCellphoneNumber(cellphone.getPhoneNumber());
+ if ((mobile instanceof DialableMobileNumber) && (mobile.getMobileProvider() instanceof MobileProvider)) {
+ this.setMobileProvider(mobile.getMobileProvider());
+ this.setMobileNumber(mobile.getPhoneNumber());
}
if ((fax instanceof DialableFaxNumber) && (fax.getPhoneAreaCode() > 0)) {
import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
import org.mxchange.jcountry.data.Country;
-import org.mxchange.jphone.events.cellphone.remove.AdminRemoveCellphoneNumberFromListEvent;
+import org.mxchange.jphone.events.mobile.remove.AdminRemoveMobileNumberFromListEvent;
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
import org.mxchange.jusercore.events.login.UserLoggedInEvent;
void afterUserConfirmedAccountEvent (final UserConfirmedAccountEvent event);
/**
- * Event observer when a list with unused cell phone numers is being created
+ * Event observer when a list with unused mobile numbers is being created
* <p>
* @param event Event being fired
*/
- void removeCellphoneNumberFromListEvent(final AdminRemoveCellphoneNumberFromListEvent event);
+ void removeMobileNumberFromListEvent(final AdminRemoveMobileNumberFromListEvent event);
/**
* Updates all data from bean in given contact instance
void setBirthday (final Date birthday);
/**
- * Getter for ellphone number's carrier
+ * Getter for mobile provider
* <p>
- * @return Cellphone number's carrier
+ * @return Mobile provider
*/
- MobileProvider getCellphoneCarrier ();
+ MobileProvider getMobileProvider ();
/**
- * Setter for cellphone number's carrier prefix
+ * Setter for mobile provider
* <p>
- * @param cellphoneCarrier Cellphone number's carrier prefix
+ * @param mobileProvider Mobile provider
*/
- void setCellphoneCarrier (final MobileProvider cellphoneCarrier);
+ void setMobileProvider (final MobileProvider mobileProvider);
/**
- * Getter for ellphone number
+ * Getter for mobile number
* <p>
* @return Cellphone number
*/
- Long getCellphoneNumber ();
+ Long getMobileNumber ();
/**
- * Setter for ellphone number
+ * Setter for mobile number
* <p>
- * @param cellphoneNumber Cellphone number
+ * @param mobileNumber Cellphone number
*/
- void setCellphoneNumber (final Long cellphoneNumber);
+ void setMobileNumber (final Long mobileNumber);
/**
* City
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.cellphone.unlinked.AdminCellphoneNumberUnlinkedEvent;
-import org.mxchange.jcontacts.events.cellphone.unlinked.AdminUnlinkedCellphoneNumberEvent;
import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
+import org.mxchange.jcontacts.events.mobile.unlinked.AdminMobileNumberUnlinkedEvent;
+import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEvent;
import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote;
import org.mxchange.jjobs.beans.BaseJobsController;
import org.mxchange.jjobs.beans.helper.JobsWebRequestController;
-import org.mxchange.jphone.exceptions.CellphoneNotLinkedException;
+import org.mxchange.jphone.exceptions.MobileNumberNotLinkedException;
import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
/**
private JobsWebRequestController beanHelper;
/**
- * Event being fired when admin unlinks cellphone from contact
+ * Event being fired when admin unlinks mobile from contact
*/
@Inject
@Any
- private Event<AdminUnlinkedCellphoneNumberEvent> cellphoneDataUnlinkedEvent;
+ private Event<AdminUnlinkedMobileNumberEvent> mobileDataUnlinkedEvent;
/**
* Default constructor
}
@Override
- public String unlinkCellphoneContactData () {
+ public String unlinkMobileContactData () {
// Is all data set
- if (this.beanHelper.getCellPhoneNumber() == null) {
+ if (this.beanHelper.getMobileNumber() == null) {
// Not set, throw NPE
- throw new NullPointerException("this.beanHelper.cellphoneNumber is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() == null) {
+ throw new NullPointerException("this.beanHelper.mobileNumber is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneId() == null) {
// Throw NPE again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.phoneId is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.phoneId is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneId() < 1) {
// Invalid number
- throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.cellphoneNumber.phoneId={0} is not valid", this.beanHelper.getCellPhoneNumber().getPhoneId())); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider() == null) {
+ throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.mobileNumber.phoneId={0} is not valid", this.beanHelper.getMobileNumber().getPhoneId())); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider() == null) {
// Throw NPE
- throw new NullPointerException("this.beanHelper.cellphoneNumber.cellphoneProvider is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() == null) {
// ... throw again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.cellphoneProvider.providerId is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider.providerId is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() < 1) {
// Id not valid
- throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.cellphoneNumber.cellphoneProvider.providerId={0} is not valid.", this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId())); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() == null) {
+ throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.mobileNumber.mobileProvider.providerId={0} is not valid.", this.beanHelper.getMobileNumber().getMobileProvider().getProviderId())); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneNumber() == null) {
// Throw NPE again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.phoneNumber is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.phoneNumber is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneNumber() < 1) {
// Throw it again ...
- throw new NullPointerException(MessageFormat.format("this.beanHelper.cellphoneNumber.phoneNumber={0} is not valid.", this.beanHelper.getCellPhoneNumber().getPhoneNumber())); //NOI18N
+ throw new NullPointerException(MessageFormat.format("this.beanHelper.mobileNumber.phoneNumber={0} is not valid.", this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N
} else if (this.beanHelper.getContact() == null) {
// ... and throw again
throw new NullPointerException("this.beanHelper.contact is null"); //NOI18N
Contact updatedContact;
try {
- // Unlink it and return contact without cell phone instance
- updatedContact = this.adminPhoneBean.unlinkCellphoneDataFromContact(this.beanHelper.getContact(), this.beanHelper.getCellPhoneNumber());
- } catch (final CellphoneNotLinkedException ex) {
+ // Unlink it and return contact without mobile instance
+ updatedContact = this.adminPhoneBean.unlinkMobileDataFromContact(this.beanHelper.getContact(), this.beanHelper.getMobileNumber());
+ } catch (final MobileNumberNotLinkedException ex) {
// Did not work
- this.showFacesMessage("form_unlink_contact_cellphone:cellphoneId", ex); //NOI18N
+ this.showFacesMessage("form_unlink_contact_mobile:mobileId", ex); //NOI18N
return ""; //NOI18N
}
// Fire event
- this.cellphoneDataUnlinkedEvent.fire(new AdminCellphoneNumberUnlinkedEvent(updatedContact, this.beanHelper.getCellPhoneNumber()));
+ this.mobileDataUnlinkedEvent.fire(new AdminMobileNumberUnlinkedEvent(updatedContact, this.beanHelper.getMobileNumber()));
// All fine here
return "admin_show_contact?faces-redirect=true&includeViewParams=true"; //NOI18N
+
/*
* Copyright (C) 2016 Roland Haeder
*
public interface JobsAdminContactPhoneWebRequestController extends Serializable {
/**
- * Unlinks cellphone data with current contact
+ * Unlinks mobile data with current contact
* <p>
* @return Redirect outcome
*/
- String unlinkCellphoneContactData ();
+ String unlinkMobileContactData ();
/**
* Event observer for newly added users by adminstrator
import javax.inject.Inject;
import javax.inject.Named;
import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.cellphone.unlinked.AdminUnlinkedCellphoneNumberEvent;
+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.jphone.phonenumbers.DialableNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
/**
private LandingContactWebSessionController contactController;
/**
- * "Cache" for contact's cellphone, land-line and fax numbers. Currently one
+ * "Cache" for contact's mobile, land-line and fax numbers. Currently one
* one per each type is supported. Maybe later this will change into a
* OneToMany relationship (one contact, many numbers).
*/
}
@Override
- public void afterAdminUnlinkedCellphoneContactDataEvent (@Observes final AdminUnlinkedCellphoneNumberEvent event) {
+ public void afterAdminUnlinkedCellphoneContactDataEvent (@Observes final AdminUnlinkedMobileNumberEvent event) {
// event should not be null
if (null == event) {
// Throw NPE
@Override
public List<Contact> allCellphoneContacts () {
// Get id
- DialableCellphoneNumber phone = this.beanHelper.getCellPhoneNumber();
+ DialableMobileNumber phone = this.beanHelper.getMobileNumber();
// Is cache there?
if (this.contacts.containsKey(phone)) {
// "Walk" through all contacts
for (final Contact contact : this.contactController.allContacts()) {
- // Is cellphone instance the same?
- if (Objects.equals(contact.getContactCellphoneNumber(), this.beanHelper.getCellPhoneNumber())) {
+ // Is mobile instance the same?
+ if (Objects.equals(contact.getContactMobileNumber(), this.beanHelper.getMobileNumber())) {
// Found one
list.add(contact);
}
import java.util.List;
import javax.ejb.Local;
import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.cellphone.unlinked.AdminUnlinkedCellphoneNumberEvent;
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;
/**
* An interface for user beans
public interface JobsContactPhoneWebSessionController extends Serializable {
/**
- * Getter for all contacts having current cellphone instance linked
+ * Getter for all contacts having current mobile instance linked
* <p>
* @return List of all linked contacts
*/
void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event);
/**
- * Event observer for unlinked cellphone-contact by administrators
+ * Event observer for unlinked mobile-contact by administrators
* <p>
- * @param event Unlinked cellphone-contact event
+ * @param event Unlinked mobile-contact event
*/
- void afterAdminUnlinkedCellphoneContactDataEvent (final AdminUnlinkedCellphoneNumberEvent event);
+ void afterAdminUnlinkedCellphoneContactDataEvent (final AdminUnlinkedMobileNumberEvent event);
}
import java.io.Serializable;
import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jusercore.model.user.User;
/**
public interface JobsWebRequestController extends Serializable {
/**
- * Copies currently set cell phone instance's data to admin phone controller
+ * Copies currently set mobile instance's data to admin phone controller
*/
- void copyCellphoneNumberToController ();
+ void copyMobileNumberToController ();
/**
* Copies currently set contact instance's data to adminContactController
void setUser (final User user);
/**
- * Getter for dialable cellphone number instance
+ * Getter for dialable mobile number
* <p>
- * @return Dialable cellphone number instance
+ * @return Dialable mobile number
*/
- DialableCellphoneNumber getCellPhoneNumber ();
+ DialableMobileNumber getMobileNumber ();
/**
- * Setter for dialable cellphone number instance
+ * Setter for dialable mobile number
* <p>
- * @param cellPhone Dialable cellphone number instance
+ * @param mobileNumber Dialable mobile number
*/
- void setCellPhoneNumber (final DialableCellphoneNumber cellPhone);
+ void setMobileNumber (final DialableMobileNumber mobileNumber);
/**
- * Getter for dialable land-line number instance
+ * Getter for dialable land-line number
* <p>
- * @return Dialable land-line number instance
+ * @return Dialable land-line number
*/
- DialableLandLineNumber getLandLine ();
+ DialableLandLineNumber getLandLineNumber ();
/**
- * Setter for dialable land-line number instance
+ * Setter for dialable land-line number
* <p>
- * @param landLine Dialable land-line number instance
+ * @param landLine Dialable land-line number
*/
- void setLandLine (final DialableLandLineNumber landLine);
+ void setLandLineNumber (final DialableLandLineNumber landLine);
/**
- * Getter for dialable fax number instance
+ * Getter for dialable fax number
* <p>
- * @return Dialable fax number instance
+ * @return Dialable fax number
*/
- DialableFaxNumber getFax ();
+ DialableFaxNumber getFaxNumber ();
/**
- * Setter for dialable fax number instance
+ * Setter for dialable fax number
* <p>
- * @param fax Dialable fax number instance
+ * @param faxNumber Dialable fax number
*/
- void setFax (final DialableFaxNumber fax);
+ void setFaxNumber (final DialableFaxNumber faxNumber);
}
import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController;
import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController;
import org.mxchange.jjobs.beans.user.JobsUserWebSessionController;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jusercore.model.user.User;
/**
@Inject
private JobsAdminPhoneWebRequestController adminPhoneController;
- /**
- * Cell phone number
- */
- private DialableCellphoneNumber cellPhoneNumber;
-
/**
* Contact instance
*/
/**
* Fax number
*/
- private DialableFaxNumber fax;
+ private DialableFaxNumber faxNumber;
/**
* Land-line number
*/
- private DialableLandLineNumber landLine;
+ private DialableLandLineNumber landLineNumber;
+
+ /**
+ * Cell phone number
+ */
+ private DialableMobileNumber mobileNumber;
/**
* User instance
public JobsWebRequestHelper () {
}
- @Override
- public void copyCellphoneNumberToController () {
- // Validate cellphone instance
- if (this.getCellPhoneNumber() == null) {
- // Throw NPE
- throw new NullPointerException("this.cellPhoneNumber is null");
- } else if (this.getCellPhoneNumber().getPhoneId() == null) {
- // Throw again
- throw new NullPointerException("this.cellPhoneNumber.phoneId is null");
- } else if (this.getCellPhoneNumber().getPhoneId() < 1) {
- // Invalid id number
- throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.phoneId={0} is not valid", this.getCellPhoneNumber().getPhoneId()));
- } else if (this.getCellPhoneNumber().getCellphoneProvider() == null) {
- // Throw NPE again
- throw new NullPointerException("this.cellPhoneNumber.cellphoneProvider is null");
- } else if (this.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) {
- // ... throw again
- throw new NullPointerException("this.cellPhoneNumber.cellphoneProvider.providerId is null");
- } else if (this.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) {
- // Invalid id
- throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.cellphoneProvider.providerId={0} is invalid", this.getCellPhoneNumber().getCellphoneProvider().getProviderId()));
- } else if (this.getCellPhoneNumber().getPhoneNumber() == null) {
- // Throw NPE again ...
- throw new NullPointerException("this.cellPhoneNumber.phoneNumber is null");
- } else if (this.getCellPhoneNumber().getPhoneNumber() < 1) {
- // Invalid id number
- throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.phoneNumber={0} is not valid", this.getCellPhoneNumber().getPhoneNumber()));
- }
-
- // Copy all (changeable) data fields to admin controller
- this.adminPhoneController.setCellphoneProvider(this.getCellPhoneNumber().getCellphoneProvider());
- this.adminPhoneController.setPhoneNumber(this.getCellPhoneNumber().getPhoneNumber());
- }
-
@Override
public void copyContactToController () {
// Validate contact instance
//* NOISY-DEBUG: */ System.out.println("AdminHelper::copyContactToController - EXIT!"); //NOI18N
}
+ @Override
+ public void copyMobileNumberToController () {
+ // Validate mobile instance
+ if (this.getMobileNumber() == null) {
+ // Throw NPE
+ throw new NullPointerException("this.cellPhoneNumber is null");
+ } else if (this.getMobileNumber().getPhoneId() == null) {
+ // Throw again
+ throw new NullPointerException("this.cellPhoneNumber.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()));
+ } else if (this.getMobileNumber().getMobileProvider() == null) {
+ // Throw NPE again
+ throw new NullPointerException("this.cellPhoneNumber.mobileProvider is null");
+ } else if (this.getMobileNumber().getMobileProvider().getProviderId() == null) {
+ // ... throw again
+ throw new NullPointerException("this.cellPhoneNumber.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()));
+ } else if (this.getMobileNumber().getPhoneNumber() == null) {
+ // Throw NPE again ...
+ throw new NullPointerException("this.cellPhoneNumber.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()));
+ }
+
+ // Copy all (changeable) data fields to admin controller
+ this.adminPhoneController.setMobileProvider(this.getMobileNumber().getMobileProvider());
+ this.adminPhoneController.setPhoneNumber(this.getMobileNumber().getPhoneNumber());
+ }
+
@Override
public void copyUserToController () {
// Log message
//* NOISY-DEBUG: */ System.out.println("AdminHelper::copyUserToController - EXIT!"); //NOI18N
}
- @Override
- public DialableCellphoneNumber getCellPhoneNumber () {
- return this.cellPhoneNumber;
- }
-
- @Override
- public void setCellPhoneNumber (final DialableCellphoneNumber cellPhoneNumber) {
- this.cellPhoneNumber = cellPhoneNumber;
- }
-
@Override
public Contact getContact () {
return this.contact;
}
@Override
- public DialableFaxNumber getFax () {
- return this.fax;
+ public DialableFaxNumber getFaxNumber () {
+ return this.faxNumber;
+ }
+
+ @Override
+ public void setFaxNumber (final DialableFaxNumber faxNumber) {
+ this.faxNumber = faxNumber;
+ }
+
+ @Override
+ public DialableLandLineNumber getLandLineNumber () {
+ return this.landLineNumber;
}
@Override
- public void setFax (final DialableFaxNumber fax) {
- this.fax = fax;
+ public void setLandLineNumber (final DialableLandLineNumber landLineNumber) {
+ this.landLineNumber = landLineNumber;
}
@Override
- public DialableLandLineNumber getLandLine () {
- return this.landLine;
+ public DialableMobileNumber getMobileNumber () {
+ return this.mobileNumber;
}
@Override
- public void setLandLine (final DialableLandLineNumber landLine) {
- this.landLine = landLine;
+ public void setMobileNumber (final DialableMobileNumber mobileNumber) {
+ this.mobileNumber = mobileNumber;
}
@Override
}
/**
- * Set's all given contact's phone instances: land-line, cellphone and fax
+ * Set's all given contact's phone instances: land-line, mobile and
+ * faxNumber
* <p>
* @param contact Contact to set phone instances for
*/
throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
}
- // Is cellphone set?
- if (contact.getContactCellphoneNumber() instanceof DialableCellphoneNumber) {
+ // Is mobile set?
+ if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
// Yes, then set it in admin controller
- this.setCellPhoneNumber(contact.getContactCellphoneNumber());
+ this.setMobileNumber(contact.getContactMobileNumber());
}
// Is land-line set?
if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
// Yes, then set it in admin controller
- this.setLandLine(contact.getContactLandLineNumber());
+ this.setLandLineNumber(contact.getContactLandLineNumber());
}
- // Is fax set?
+ // Is faxNumber set?
if (contact.getContactFaxNumber() instanceof DialableFaxNumber) {
// Yes, then set it in admin controller
- this.setFax(contact.getContactFaxNumber());
+ this.setFaxNumber(contact.getContactFaxNumber());
}
}
@Override
public String addMobileProvider () {
- // Create mobile provider instance
+ // Create mobile provider
MobileProvider mobileProvider = new CellphoneProvider(this.getProviderDialPrefix(), this.getProviderName(), this.getProviderCountry(), this.getProviderMailPattern());
// Is the provider already created?
* Checks whether if the given mobile provider is already created by
* checking both dial prefix and country.
* <p>
- * @param mobileProvider Mobile provider instance to check
+ * @param mobileProvider Mobile provider to check
* <p>
- * @return Whether the given mobile provider instance is found
+ * @return Whether the given mobile provider is found
*/
private boolean isMobileProviderCreated (final MobileProvider mobileProvider) {
// Default is not found
import javax.naming.NamingException;
import org.mxchange.jjobs.beans.BaseJobsController;
import org.mxchange.jjobs.beans.helper.JobsWebRequestController;
-import org.mxchange.jphone.events.cellphone.deleted.AdminCellphoneNumberDeletedEvent;
-import org.mxchange.jphone.events.cellphone.deleted.AdminDeletedCellphoneNumberEvent;
-import org.mxchange.jphone.events.cellphone.remove.AdminCellphoneNumberRemovedFromListEvent;
-import org.mxchange.jphone.events.cellphone.remove.AdminRemoveCellphoneNumberFromListEvent;
-import org.mxchange.jphone.events.cellphone.updated.AdminCellphoneNumberUpdatedEvent;
-import org.mxchange.jphone.events.cellphone.updated.AdminUpdatedCellphoneNumberEvent;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.events.mobile.deleted.AdminDeletedMobileNumberEvent;
+import org.mxchange.jphone.events.mobile.deleted.AdminMobileNumberDeletedEvent;
+import org.mxchange.jphone.events.mobile.remove.AdminMobileNumberRemovedFromListEvent;
+import org.mxchange.jphone.events.mobile.remove.AdminRemoveMobileNumberFromListEvent;
+import org.mxchange.jphone.events.mobile.updated.AdminMobileNumberUpdatedEvent;
+import org.mxchange.jphone.events.mobile.updated.AdminUpdatedMobileNumberEvent;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
private JobsWebRequestController beanHelper;
/**
- * Event being fired when an administrator has deleted cell phone number
+ * Event being fired when an administrator has deleted mobile number
*/
@Inject
@Any
- private Event<AdminDeletedCellphoneNumberEvent> cellPhoneNumberDeletedEvent;
+ private Event<AdminDeletedMobileNumberEvent> cellPhoneNumberDeletedEvent;
/**
- * Event being fired when an administrator has updated cell phone number
+ * Event being fired when an administrator has updated mobile number
*/
@Inject
@Any
- private Event<AdminUpdatedCellphoneNumberEvent> cellPhoneNumberUpdatedEvent;
+ private Event<AdminUpdatedMobileNumberEvent> cellPhoneNumberUpdatedEvent;
/**
- * Cell phone provider
+ * Cell phone number
*/
- private MobileProvider cellphoneProvider;
+ private DialableMobileNumber choosenCellphoneNumber;
/**
- * Cell phone number
+ * Mobile provider
*/
- private DialableCellphoneNumber choosenCellphoneNumber;
+ private MobileProvider mobileProvider;
/**
* Generic hone controller
private Long phoneNumber;
/**
- * Event being fired when a list of all unsed cell phone numbers is being
+ * Event being fired when a list of all unsed mobile numbers is being
* created.
*/
@Inject
@Any
- private Event<AdminRemoveCellphoneNumberFromListEvent> removeLinkedCellphoneNumbersEvent;
+ private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedCellphoneNumbersEvent;
/**
* Default constructor
Context context = new InitialContext();
// Try to lookup the beans
- this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N
+ this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminPhone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote"); //NOI18N
} catch (final NamingException e) {
// Throw it again
throw new FaceletException(e);
}
@Override
- public List<DialableCellphoneNumber> allNonLinkedCellphoneNumbers () {
- // Get list of all cell phone numbers
- List<DialableCellphoneNumber> list = this.phoneController.allCellphoneNumbers();
+ public List<DialableMobileNumber> allNonLinkedMobileNumbers () {
+ // Get list of all mobile numbers
+ List<DialableMobileNumber> list = this.phoneController.allMobileNumbers();
// Visit all controllers to reduce the list
- this.removeLinkedCellphoneNumbersEvent.fire(new AdminCellphoneNumberRemovedFromListEvent(list));
+ this.removeLinkedCellphoneNumbersEvent.fire(new AdminMobileNumberRemovedFromListEvent(list));
// Return it
return list;
}
@Override
- public String deleteCellphoneData () {
+ public String deleteMobileData () {
// Is all data set
- if (this.beanHelper.getCellPhoneNumber() == null) {
+ if (this.beanHelper.getMobileNumber() == null) {
// Not set, throw NPE
- throw new NullPointerException("this.beanHelper.cellphoneNumber is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() == null) {
+ throw new NullPointerException("this.beanHelper.mobileNumber is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneId() == null) {
// Throw NPE again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.phoneId is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.phoneId is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneId() < 1) {
// Invalid number
- throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.cellphoneNumber.phoneId={0} is not valid", this.beanHelper.getCellPhoneNumber().getPhoneId())); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider() == null) {
+ throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.mobileNumber.phoneId={0} is not valid", this.beanHelper.getMobileNumber().getPhoneId())); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider() == null) {
// Throw NPE
- throw new NullPointerException("this.beanHelper.cellphoneNumber.cellphoneProvider is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() == null) {
// ... throw again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.cellphoneProvider.providerId is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider.providerId is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() < 1) {
// Id not valid
- throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.cellphoneNumber.cellphoneProvider.providerId={0} is not valid.", this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId())); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() == null) {
+ throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.mobileNumber.mobileProvider.providerId={0} is not valid.", this.beanHelper.getMobileNumber().getMobileProvider().getProviderId())); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneNumber() == null) {
// Throw NPE again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.phoneNumber is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.phoneNumber is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneNumber() < 1) {
// Throw NPE again
- throw new NullPointerException(MessageFormat.format("this.beanHelper.cellphoneNumber.phoneNumber={0} is not valid.", this.beanHelper.getCellPhoneNumber().getPhoneNumber())); //NOI18N
+ throw new NullPointerException(MessageFormat.format("this.beanHelper.mobileNumber.phoneNumber={0} is not valid.", this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N
}
// Call EJB
- this.adminPhoneBean.deleteCellphoneData(this.beanHelper.getCellPhoneNumber());
+ this.adminPhoneBean.deleteMobileData(this.beanHelper.getMobileNumber());
// Fire event
- this.cellPhoneNumberDeletedEvent.fire(new AdminCellphoneNumberDeletedEvent(this.beanHelper.getCellPhoneNumber()));
+ this.cellPhoneNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(this.beanHelper.getMobileNumber()));
// All fine, redirect
- return "admin_list_cellphone?faces-redirect=true&includeViewParams=true"; //NOI18N
+ return "admin_list_mobile?faces-redirect=true&includeViewParams=true"; //NOI18N
}
@Override
- public String editCellphoneData () {
+ public String editMobileData () {
// Is all data set
- if (this.beanHelper.getCellPhoneNumber() == null) {
+ if (this.beanHelper.getMobileNumber() == null) {
// Not set, throw NPE
- throw new NullPointerException("this.beanHelper.cellphoneNumber is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() == null) {
+ throw new NullPointerException("this.beanHelper.mobileNumber is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneId() == null) {
// Throw NPE again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.phoneId is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.phoneId is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneId() < 1) {
// Invalid number
- throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.cellphoneNumber.phoneId={0} is not valid", this.beanHelper.getCellPhoneNumber().getPhoneId())); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider() == null) {
+ throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.mobileNumber.phoneId={0} is not valid", this.beanHelper.getMobileNumber().getPhoneId())); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider() == null) {
// Throw NPE
- throw new NullPointerException("this.beanHelper.cellphoneNumber.cellphoneProvider is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() == null) {
// ... throw again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.cellphoneProvider.providerId is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider.providerId is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() < 1) {
// Id not valid
- throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.cellphoneNumber.cellphoneProvider.providerId={0} is not valid.", this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId())); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() == null) {
+ throw new IllegalArgumentException(MessageFormat.format("this.beanHelper.mobileNumber.mobileProvider.providerId={0} is not valid.", this.beanHelper.getMobileNumber().getMobileProvider().getProviderId())); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneNumber() == null) {
// Throw NPE again
- throw new NullPointerException("this.beanHelper.cellphoneNumber.phoneNumber is null"); //NOI18N
- } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() < 1) {
+ throw new NullPointerException("this.beanHelper.mobileNumber.phoneNumber is null"); //NOI18N
+ } else if (this.beanHelper.getMobileNumber().getPhoneNumber() < 1) {
// Throw NPE again
- throw new NullPointerException(MessageFormat.format("this.beanHelper.cellphoneNumber.phoneNumber={0} is not valid.", this.beanHelper.getCellPhoneNumber().getPhoneNumber())); //NOI18N
- } else if (this.getCellphoneProvider() == null) {
+ throw new NullPointerException(MessageFormat.format("this.beanHelper.mobileNumber.phoneNumber={0} is not valid.", this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N
+ } else if (this.getMobileProvider() == null) {
// Not provided
- this.showFacesMessage("form_edit_cellphone:cellphoneProvider", "ERROR_ADMIN_NO_MOBILE_PROVIDER_SELECTED"); //NOI18N
+ this.showFacesMessage("form_edit_mobile:mobileProvider", "ERROR_ADMIN_NO_MOBILE_PROVIDER_SELECTED"); //NOI18N
return ""; //NOI18N
- } else if (this.getCellphoneProvider().getProviderId() == null) {
+ } else if (this.getMobileProvider().getProviderId() == null) {
// Throw NPE again ...
- throw new NullPointerException("this.cellphoneProvider.providerId is null"); //NOI18N
- } else if (this.getCellphoneProvider().getProviderId() < 0) {
+ throw new NullPointerException("this.mobileProvider.providerId is null"); //NOI18N
+ } else if (this.getMobileProvider().getProviderId() < 0) {
// Invalid id number
- throw new IllegalArgumentException(MessageFormat.format("this.cellphoneProvider.providerId={0} is not valid.", this.getCellphoneProvider().getProviderId())); //NOI18N
+ throw new IllegalArgumentException(MessageFormat.format("this.mobileProvider.providerId={0} is not valid.", this.getMobileProvider().getProviderId())); //NOI18N
} else if (this.getPhoneNumber() == null) {
// Not provided
- this.showFacesMessage("form_edit_cellphone:cellphoneNumber", "ERROR_ADMIN_EMPTY_MOBILE_NUMBER"); //NOI18N
+ this.showFacesMessage("form_edit_mobile:mobileNumber", "ERROR_ADMIN_EMPTY_MOBILE_NUMBER"); //NOI18N
return ""; //NOI18N
}
// Is the mobile provider and number the same?
- if ((Objects.equals(this.getCellphoneProvider(), this.beanHelper.getCellPhoneNumber().getCellphoneProvider())) && (Objects.equals(this.getPhoneNumber(), this.beanHelper.getCellPhoneNumber().getPhoneNumber()))) {
+ if ((Objects.equals(this.getMobileProvider(), this.beanHelper.getMobileNumber().getMobileProvider())) && (Objects.equals(this.getPhoneNumber(), this.beanHelper.getMobileNumber().getPhoneNumber()))) {
// No difference in both together, no need to edit
return ""; //NOI18N
}
// Set all data
- this.beanHelper.getCellPhoneNumber().setCellphoneProvider(this.getCellphoneProvider());
- this.beanHelper.getCellPhoneNumber().setPhoneNumber(this.getPhoneNumber());
+ this.beanHelper.getMobileNumber().setMobileProvider(this.getMobileProvider());
+ this.beanHelper.getMobileNumber().setPhoneNumber(this.getPhoneNumber());
// Send to bean
- DialableCellphoneNumber updatedNumber = this.adminPhoneBean.updateCellphoneData(this.beanHelper.getCellPhoneNumber());
+ DialableMobileNumber updatedNumber = this.adminPhoneBean.updateMobileData(this.beanHelper.getMobileNumber());
// Fire event
- this.cellPhoneNumberUpdatedEvent.fire(new AdminCellphoneNumberUpdatedEvent(updatedNumber));
+ this.cellPhoneNumberUpdatedEvent.fire(new AdminMobileNumberUpdatedEvent(updatedNumber));
// All fine, redirect
- return "admin_edit_cellphone?faces-redirect=true&includeViewParams=true"; //NOI18N
+ return "admin_edit_mobile?faces-redirect=true&includeViewParams=true"; //NOI18N
}
@Override
- public MobileProvider getCellphoneProvider () {
- return this.cellphoneProvider;
+ public DialableMobileNumber getChoosenCellphoneNumber () {
+ return this.choosenCellphoneNumber;
}
@Override
- public void setCellphoneProvider (final MobileProvider cellphoneProvider) {
- this.cellphoneProvider = cellphoneProvider;
+ public void setChoosenCellphoneNumber (final DialableMobileNumber choosenCellphoneNumber) {
+ this.choosenCellphoneNumber = choosenCellphoneNumber;
}
@Override
- public DialableCellphoneNumber getChoosenCellphoneNumber () {
- return this.choosenCellphoneNumber;
+ public MobileProvider getMobileProvider () {
+ return this.mobileProvider;
}
@Override
- public void setChoosenCellphoneNumber (final DialableCellphoneNumber choosenCellphoneNumber) {
- this.choosenCellphoneNumber = choosenCellphoneNumber;
+ public void setMobileProvider (final MobileProvider mobileProvider) {
+ this.mobileProvider = mobileProvider;
}
@Override
import java.io.Serializable;
import java.util.List;
import javax.ejb.Local;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
/**
public interface JobsAdminPhoneWebRequestController extends Serializable {
/**
- * Returns a list of all unused ("non-linked") cell phone numbers
+ * Returns a list of all unused ("non-linked") mobile numbers
* <p>
- * @return List with all unused cell phone numbers
+ * @return List with all unused mobile numbers
*/
- List<DialableCellphoneNumber> allNonLinkedCellphoneNumbers ();
+ List<DialableMobileNumber> allNonLinkedMobileNumbers ();
/**
- * Deletes given cellphone entry data
+ * Deletes given mobile entry data
* <p>
* @return Redirect outcome
*/
- String deleteCellphoneData ();
+ String deleteMobileData ();
/**
- * Changes cellphone entry data
+ * Changes mobile entry data
* <p>
* @return Redirect outcome
*/
- String editCellphoneData ();
+ String editMobileData ();
/**
- * Getter for cell phone provider
+ * Getter for mobile provider
* <p>
- * @return Cell phone provider
+ * @return Mobile provider
*/
- MobileProvider getCellphoneProvider ();
+ MobileProvider getMobileProvider ();
/**
- * Setter for cell phone provider
+ * Setter for mobile provider
* <p>
- * @param cellphoneProvider Cell phone provider
+ * @param mobileProvider Mobile provider
*/
- void setCellphoneProvider (final MobileProvider cellphoneProvider);
+ void setMobileProvider (final MobileProvider mobileProvider);
/**
- * Getter for choosen cell phone number
+ * Getter for choosen mobile number
* <p>
- * @return Choosen cell phone number
+ * @return Choosen mobile number
*/
- DialableCellphoneNumber getChoosenCellphoneNumber ();
+ DialableMobileNumber getChoosenCellphoneNumber ();
/**
- * Setter for choosen cell phone number
+ * Setter for choosen mobile number
* <p>
- * @param choosenCellphoneNumber Choosen cell phone number
+ * @param choosenCellphoneNumber Choosen mobile number
*/
- void setChoosenCellphoneNumber (final DialableCellphoneNumber choosenCellphoneNumber);
+ void setChoosenCellphoneNumber (final DialableMobileNumber choosenCellphoneNumber);
/**
* Getter for dial number without prefix
import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
import org.mxchange.jjobs.beans.BaseJobsController;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
*/
private static final long serialVersionUID = 491_058_674_675_690_105L;
- /**
- * All cell phone numbers
- */
- private final List<DialableCellphoneNumber> cellphoneNumbers;
-
/**
* All fax numbers
*/
*/
private final List<DialableLandLineNumber> landLineNumbers;
+ /**
+ * All mobile numbers
+ */
+ private final List<DialableMobileNumber> mobileNumbers;
+
/**
* General EJB for phone numbers
*/
}
// Init all lists
- this.cellphoneNumbers = new LinkedList<>();
+ this.mobileNumbers = new LinkedList<>();
this.faxNumbers = new LinkedList<>();
this.landLineNumbers = new LinkedList<>();
}
throw new IllegalArgumentException(MessageFormat.format("event.addedContact.contactId={0} is not valid", event.getAddedContact().getContactId())); //NOI18N
}
- // Update contact's cellphone, land-line and fax number
+ // Update contact's mobile, land-line and fax number
this.updateContactPhoneNumbers(event.getAddedContact());
// Clear this bean
throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getAddedUser(), event.getAddedUser().getUserId())); //NOI18N
}
- // Update contact's cellphone, land-line and fax number
+ // Update contact's mobile, land-line and fax number
this.updateContactPhoneNumbers(event.getAddedUser().getUserContact());
// Clear all data
throw new IllegalArgumentException(MessageFormat.format("contactId of contact={0} is not valid: {1}", event.getUpdatedContact(), event.getUpdatedContact().getContactId())); //NOI18N
}
- // Update contact's cellphone, land-line and fax number
+ // Update contact's mobile, land-line and fax number
this.updateContactPhoneNumbers(event.getUpdatedContact());
// Clear all data
this.clear();
}
- @Override
- @SuppressWarnings ("ReturnOfCollectionOrArrayField")
- public List<DialableCellphoneNumber> allCellphoneNumbers () {
- return this.cellphoneNumbers;
- }
-
@Override
@SuppressWarnings ("ReturnOfCollectionOrArrayField")
public List<DialableFaxNumber> allFaxNumbers () {
return this.landLineNumbers;
}
+ @Override
+ @SuppressWarnings ("ReturnOfCollectionOrArrayField")
+ public List<DialableMobileNumber> allMobileNumbers () {
+ return this.mobileNumbers;
+ }
+
/**
* Post-construction method
*/
@PostConstruct
public void init () {
// All phone numbers
- this.cellphoneNumbers.addAll(this.phoneBean.allCellphoneNumbers());
+ this.mobileNumbers.addAll(this.phoneBean.allMobileNumbers());
this.faxNumbers.addAll(this.phoneBean.allFaxNumbers());
this.landLineNumbers.addAll(this.phoneBean.allLandLineNumbers());
}
}
/**
- * Uniquely add given cellphone number to this bean's list. First remove the
+ * Uniquely add given mobile number to this bean's list. First remove the
* old instance (by id number), then re-add it again.
* <p>
- * @param cellphoneNumber Cellphone number to add
+ * @param mobileNumber Cellphone number to add
*/
- private void uniqueAddCellphoneNumber (final DialableCellphoneNumber cellphoneNumber) {
+ private void uniqueAddCellphoneNumber (final DialableMobileNumber mobileNumber) {
// Make sure the parameter is valid
- if (null == cellphoneNumber) {
+ if (null == mobileNumber) {
// Throw NPE
- throw new NullPointerException("cellphoneNumber is null");
- } else if (cellphoneNumber.getPhoneId() == null) {
+ throw new NullPointerException("mobileNumber is null");
+ } else if (mobileNumber.getPhoneId() == null) {
// Throw again ...
- throw new NullPointerException("cellphoneNumber.phoneId is null");
- } else if (cellphoneNumber.getPhoneId() < 1) {
+ throw new NullPointerException("mobileNumber.phoneId is null");
+ } else if (mobileNumber.getPhoneId() < 1) {
// Not valid
- throw new IllegalArgumentException(MessageFormat.format("cellphoneNumber.phoneId={0} is not valid.", cellphoneNumber.getPhoneId()));
+ throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid.", mobileNumber.getPhoneId()));
}
// First remove it by object
- if (!this.cellphoneNumbers.remove(cellphoneNumber)) {
+ if (!this.mobileNumbers.remove(mobileNumber)) {
// Did not work, try by id number
- for (final DialableCellphoneNumber cell : this.cellphoneNumbers) {
+ for (final DialableMobileNumber cell : this.mobileNumbers) {
// Is id number the same?
- if (Objects.equals(cell.getPhoneId(), cellphoneNumber.getPhoneId())) {
+ if (Objects.equals(cell.getPhoneId(), mobileNumber.getPhoneId())) {
// Found it
- this.cellphoneNumbers.remove(cell);
+ this.mobileNumbers.remove(cell);
break;
}
}
}
// ... then add it
- this.cellphoneNumbers.add(cellphoneNumber);
+ this.mobileNumbers.add(mobileNumber);
}
/**
}
/**
- * Updates given contact's cellphone, land-line and fax number
+ * Updates given contact's mobile, land-line and fax number
* <p>
* @param contact Contact instance
*/
// Id number is not valid
}
- // Is cellphone set?
- if (contact.getContactCellphoneNumber() instanceof DialableCellphoneNumber) {
+ // Is mobile set?
+ if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
// Unique-add it
- this.uniqueAddCellphoneNumber(contact.getContactCellphoneNumber());
+ this.uniqueAddCellphoneNumber(contact.getContactMobileNumber());
}
// Is land-line set?
import javax.ejb.Local;
import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
/**
void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event);
/**
- * Returns a list of all cellphone numbers. For performance reasons, the
+ * Returns a list of all mobile numbers. For performance reasons, the
* controller (bean) should be application-scoped as from user to user
* nothing changes. And the controller's post-construct method should load
* all numbers and cache it in the controller.
* <p>
- * @return List of all cell phone numbers
+ * @return List of all mobile numbers
*/
- List<DialableCellphoneNumber> allCellphoneNumbers ();
+ List<DialableMobileNumber> allMobileNumbers ();
/**
* Returns a list of all fax numbers. For performance reasons, the
import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
import org.mxchange.jphone.phonenumbers.DialableNumber;
-import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
/**
- * Converter for cellphone id <-> valid cellphone instance
+ * Converter for mobile id <-> valid mobile instance
* <p>
* @author Roland Haeder<roland@mxchange.org>
*/
}
// Init instance
- DialableCellphoneNumber cellphone = null;
+ DialableMobileNumber mobileNumber = null;
try {
// Try to parse the value as long
- Long cellphoneId = Long.valueOf(submittedValue);
+ Long mobileId = Long.valueOf(submittedValue);
- // Debug message
- // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: userId{0}", userId)); //NOI18N
-
- // Try to get cellphone instance from it
- cellphone = this.phoneBean.findCellphoneById(cellphoneId);
-
- // Debug message
- // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: cellphone={0}", cellphone)); //NOI18N
+ // Try to get mobile instance from it
+ mobileNumber = this.phoneBean.findMobileNumberById(mobileId);
} catch (final NumberFormatException ex) {
// Throw again
throw new ConverterException(ex);
// NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: cellphone={0} - EXIT!", cellphone)); //NOI18N
// Return it
- return cellphone;
+ return mobileNumber;
}
@Override
import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
/**
- * Converter for SMS provider instance
+ * Converter for SMS provider
* <p>
* @author Roland Haeder<roland@mxchange.org>
*/
import javax.faces.context.FacesContext;
import javax.faces.validator.FacesValidator;
import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator;
/**
private static final long serialVersionUID = 185_768_717_676_910_450L;
@Override
- public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
- // Trace message
- //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N
-
- // All accepted, required fields
- String[] requiredFields = {"publicUserProfileFlag"}; //NOI18N
+ public void validate (final FacesContext context, final UIComponent component, final Object value) {
+ // The required field
+ String[] requiredFields = {"phoneAreaCode", "phoneNumber", "faxAreaCode", "faxNumber", "mobileNumber"}; //NOI18N
// Pre-validation (example: not null, not a string, empty string ...)
super.preValidate(context, component, value, requiredFields, false);
PERSONAL_DATA_ZIP_CODE=Postleitzahl:
PERSONAL_DATA_PHONE_NUMBER=Telefon:
PERSONAL_DATA_FAX_NUMBER=Faxnummer:
-PERSONAL_DATA_CELLPHONE_NUMBER=Mobil:
+PERSONAL_DATA_MOBILE_NUMBER=Mobil:
PERSONAL_DATA_CITY=Ort:
PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein.
PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben:
ADMIN_PERSONAL_DATA_COUNTRY_CODE=Land ausw\u00e4hlen:
ADMIN_PERSONAL_DATA_PHONE_NUMBER=Telefonnummer:
ADMIN_PERSONAL_DATA_FAX_NUMBER=Faxnummer:
-ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER=Handynummer:
+ADMIN_PERSONAL_DATA_MOBILE_NUMBER=Handynummer:
ADMIN_USER_DATA_EMAIL_LEGEND=Benutzernamen:
ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Vergeben Sie hier den Benutzernamen.
ADMIN_PERSONAL_DATA_ENTER_USER_NAME=Benutzername (*1):
ADMIN_LINK_DELETE_USER_TITLE=L\u00f6scht das Benutzeraccount (nach Best\u00e4tigung).
CONTENT_TITLE_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen:
PAGE_TITLE_ADMIN_DELETE_USER=Benutzeraccount l\u00f6schen
-ADMIN_HEADER_SHOW_CELLPHONE_DATA=Daten des Mobiltelefons:
-ADMIN_SHOW_CELLPHONE_ID=Id-Nummer:
-ADMIN_SHOW_CELLPHONE_PROVIDER_NAME=Mobilanbieter:
-ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE=Komplette Nummer:
-ADMIN_SHOW_CELLPHONE_LINKS=Administrative Links:
+ADMIN_HEADER_SHOW_MOBILE_DATA=Daten des Mobiltelefons:
+ADMIN_SHOW_MOBILE_ID=Id-Nummer:
+ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter:
+ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer:
+ADMIN_SHOW_MOBILE_LINKS=Administrative Links:
ERROR_PARAMETER_USER_NOT_SET=Fehler: Parameter 'user' nicht gesetzt.
ADMIN_LINK_SHOW_SHORT=Anzeigen
ADMIN_LINK_SHOW_SHORT_TITLE=Eintrag einzelnt anzeigen.
ADMIN_LINK_DELETE_SHORT_TITLE=Eintrag l\u00f6schen.
ADMIN_LINK_UNLINK_SHORT=Abtrennen
ADMIN_LINK_UNLINK_SHORT_TITLE=Entfernt Verkn\u00fcpfung zum Eintrag.
-PAGE_TITLE_ADMIN_DELETE_CELLPHONE=Mobiletelefoneintrag l\u00f6schen
-CONTENT_TITLE_ADMIN_DELETE_CELLPHONE=Mobiletelefoneintrag l\u00f6schen:
-PAGE_TITLE_ADMIN_EDIT_CELLPHONE=Mobiletelefoneintrag editieren
-CONTENT_TITLE_ADMIN_EDIT_CELLPHONE=Mobiletelefoneintrag editieren:
-PAGE_TITLE_ADMIN_SHOW_CELLPHONE=Mobiletelefoneintrag anzeigen
-CONTENT_TITLE_ADMIN_SHOW_CELLPHONE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes:
-PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen
-CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon:
+PAGE_TITLE_ADMIN_DELETE_MOBILE=Mobiletelefoneintrag l\u00f6schen
+CONTENT_TITLE_ADMIN_DELETE_MOBILE=Mobiletelefoneintrag l\u00f6schen:
+PAGE_TITLE_ADMIN_EDIT_MOBILE=Mobiletelefoneintrag editieren
+CONTENT_TITLE_ADMIN_EDIT_MOBILE=Mobiletelefoneintrag editieren:
+PAGE_TITLE_ADMIN_SHOW_MOBILE=Mobiletelefoneintrag anzeigen
+CONTENT_TITLE_ADMIN_SHOW_MOBILE=Anzeigen eines Mobiltelefoneintrags eines Kontaktes:
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Verkn\u00fcpfung Kontakt-Mobiletelfon l\u00f6schen
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Entfernen einer Verkn\u00fcpfung Kontakt-Mobiltelefon:
ERROR_PARAMETER_PHONE_ID_NOT_SET=Fehler: Parameter 'phoneId' ist nicht gesetzt.
PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen
CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen:
-TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE=Ein einzelner Mobiletelefoneintrag.
-TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an.
-ADMIN_HEADER_SHOW_CELLPHONE_LINKS=Alle Kontakt-Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
+TABLE_SUMMARY_ADMIN_SHOW_MOBILE=Ein einzelner Mobiletelefoneintrag.
+TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an.
+ADMIN_HEADER_SHOW_MOBILE_LINKS=Alle Kontakt-Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt.
-ADMIN_SHOW_CELLPHONE_UNLINK=Trennen:
+ADMIN_SHOW_MOBILE_UNLINK=Trennen:
ADMIN_CONTACT_ID=Kontakt-Id:
PAGE_TITLE_ADMIN_SHOW_CONTACT=Kontaktdaten anzeigen
CONTENT_TITLE_ADMIN_SHOW_CONTACT=Kontaktdaten anzeigen:
ADMIN_MENU_CONTACT_TITLE=Kontaktdaten
LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten
LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
-ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'contact' nicht gesetzt.
+ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'mobileNumber' und 'contact' nicht gesetzt.
ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an.
ERROR_PARAMETER_CONTACT_NOT_SET=Fehler: Parameter 'contact' nicht gesetzt.
ADMIN_HEADER_SHOW_CONTACT=Kontaktdaten f\u00fcr {0}:
LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten
LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden.
ADMIN_CONTACT_COUNTRY_CODE=L\u00e4ndercode:
-ADMIN_CONTACT_CELLPHONE_NUMBER=Handynummer:
+ADMIN_CONTACT_MOBILE_NUMBER=Handynummer:
ADMIN_CONTACT_LANDLINE_NUMBER=Telefonnummer:
ADMIN_CONTACT_FAX_NUMBER=Faxnummer:
PAGE_TITLE_ADMIN_EXPORT_CONTACT=Kontaktdaten exportieren
ADMIN_EXPORT_CONTACT_CITY=Wohnort
ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email-Adresse
ADMIN_EXPORT_CONTACT_BIRTHDAY=Geburtsdatum
-ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER=Handynummer
+ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Handynummer
ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Festnetznummer
ADMIN_EXPORT_CONTACT_FAX_NUMBER=Faxnummer
ADMIN_EXPORT_CONTACT_CREATED=Eintrag erstellt
CONTENT_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren:
ERROR_BEAN_HELPER_USER_NOT_SET=Fehler: Instanz 'user' im Bean-Helper nicht gesetzt.
ERROR_BEAN_HELPER_CONTACT_NOT_SET=Fehler: Instanz 'contact' im Bean-Helper nicht gesetzt.
-ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET=Fehler: Instanz 'cellPhone' in Bean-Helper nicht gesetzt.
-CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=Mobiltelefonnummern auflisten:
-ADMIN_LIST_CELLPHONE_EMPTY=Es sind keine Mobilfunknummern gespeichert.
+ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Fehler: Instanz 'cellPhone' in Bean-Helper nicht gesetzt.
+CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE=Mobiltelefonnummern auflisten:
+ADMIN_LIST_MOBILE_EMPTY=Es sind keine Mobilfunknummern gespeichert.
ADMIN_MENU_PHONE_NUMBERS_TITLE=Telefonnummern:
-LINK_ADMIN_LIST_CELLPHONE_PHONE_NUMBERS=Handynummern ...
-LINK_ADMIN_LIST_CELLPHONE_PHONE_NUMBERS_TITLE=Alle Mobilfunknummern auflisten.
-ADMIN_SHOW_CELLPHONE_CREATED=Erstellt:
-ADMIN_SHOW_CELLPHONE_UPDATED=Zuletzt ge\u00e4ndert:
-ADMIN_EDIT_CELLPHONE_TITLE=Mobiltelefoneintrag editieren:
-ADMIN_CELLPHONE_DATA_LEGEND=Mobiltelefonnummerdaten editeren:
-ADMIN_EDIT_CELLPHONE_PROVIDER=Mobilfunkanbieter \u00e4ndern:
-ADMIN_EDIT_CELLPHONE_NUMBER=Rufnummer \u00e4ndern:
-BUTTON_ADMIN_EDIT_CELLPHONE=Mobiltelefonnumer \u00e4ndern
+LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS=Handynummern ...
+LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE=Alle Mobilfunknummern auflisten.
+ADMIN_SHOW_MOBILE_CREATED=Erstellt:
+ADMIN_SHOW_MOBILE_UPDATED=Zuletzt ge\u00e4ndert:
+ADMIN_EDIT_MOBILE_TITLE=Mobiltelefoneintrag editieren:
+ADMIN_MOBILE_DATA_LEGEND=Mobiltelefonnummerdaten editeren:
+ADMIN_EDIT_MOBILE_PROVIDER=Mobilfunkanbieter \u00e4ndern:
+ADMIN_EDIT_MOBILE_NUMBER=Rufnummer \u00e4ndern:
+BUTTON_ADMIN_EDIT_MOBILE=Mobiltelefonnumer \u00e4ndern
ADMIN_LINK_LOCK_USER=Benutzeraccount sperren
ADMIN_LINK_LOCK_USER_TITLE=Sperren von freigeschalteten Benutzeraccounts, mit Angabe eines Sperrgrundes.
-ADMIN_CELLPHONE_DATA_LEGEND_TITLE=Mobilfunknummer und -anbieter ab\u00e4ndern.
+ADMIN_MOBILE_DATA_LEGEND_TITLE=Mobilfunknummer und -anbieter ab\u00e4ndern.
ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Fehler: Kann das Benutzerkonto nicht sperren, da es noch nicht best\u00e4tigt ist.
ADMIN_MOBILE_PROVIDER_REQUIRED=Bitte einen Mobilfunkanbieter ausw\u00e4hlen.
-ADMIN_CELLPHONE_NUMBER_REQUIRED=Bitte Mobilfunknummer angeben.
-BUTTON_ADMIN_DELETE_CELLPHONE=Mobilfunknummer l\u00f6schen
-ADMIN_DELETE_CELLPHONE_DATA_NOTICE=Wenn Sie die Mobilfunknummer l\u00f6schen, steht diese nicht mehr im System zur Verf\u00fcgung. Bitte \u00fcberlegen Sie genau, ob Sie dies wollen.
-ADMIN_DELETE_CELLPHONE_TITLE=Wollen Sie die Mobilfunknummer wirklich l\u00f6schen?
+ADMIN_MOBILE_NUMBER_REQUIRED=Bitte Mobilfunknummer angeben.
+BUTTON_ADMIN_DELETE_MOBILE=Mobilfunknummer l\u00f6schen
+ADMIN_DELETE_MOBILE_DATA_NOTICE=Wenn Sie die Mobilfunknummer l\u00f6schen, steht diese nicht mehr im System zur Verf\u00fcgung. Bitte \u00fcberlegen Sie genau, ob Sie dies wollen.
+ADMIN_DELETE_MOBILE_TITLE=Wollen Sie die Mobilfunknummer wirklich l\u00f6schen?
ADMIN_TABLE_SUMMARY_SHOW_CONTACT_MINI=Die Tabelle enth\u00e4lt die wichtigsten Daten zum Konakt (minimalisierte Ansicht).
ADMIN_SHOW_FULL_CONTACT_DATA=Gesamte Kontaktdaten anzeigen
-ADMIN_UNLINK_CONTACT_CELLPHONE_TITLE=Wollen Sie wirklich die Mobilfunknummer vom Kontakt abtrennen?
-BUTTON_ADMIN_UNLINK_CONTACT_CELLPHONE=Mobilfunknummer vom Kontakt abtrennen
+ADMIN_UNLINK_CONTACT_MOBILE_TITLE=Wollen Sie wirklich die Mobilfunknummer vom Kontakt abtrennen?
+BUTTON_ADMIN_UNLINK_CONTACT_MOBILE=Mobilfunknummer vom Kontakt abtrennen
ADMIN_LOCK_USER_TITLE=Wollen Sie diesen Benutzer wirklich sperren?
ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED=Kann den Benutzer {0} ({1}) nicht entsperren, da er bereits entsperrt ist.
ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED=Kann den Benutzer {0} ({1}) nicht sperren, da er bereits gesperrt ist.
ERROR_USER_NAME_ALREADY_USED=Benutzername bereits verwendet. Bitte geben Sie einen anderen ein.
ERROR_EMAIL_ADDRESSES_MISMATCHING=Die eingegebenen Email-Addressen stimmen nicht \u00fcberein.
ERROR_EMAIL_ADDRESS_ALREADY_USED=Die eingegebene Email-Adresse wird bereits verwendet und kann nicht erneut verwendet werden.
-ERROR_CELLPHONE_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
-ADMIN_ADD_CONTACT_CELLPHONE_FORM_TITLE=Mobilfunknummer einem Kontakt hinzuf\u00fcgen
-ADMIN_SELECT_CELLPHONE=Mobilfunknummer ausw\u00e4hlen:
-BUTTON_ADMIN_LINK_ADD_CONTACT_CELLPHONE=Mobilfunknummer zum Kontakt hinzuf\u00fcgen
+ERROR_MOBILE_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
+ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Mobilfunknummer einem Kontakt hinzuf\u00fcgen
+ADMIN_SELECT_MOBILE=Mobilfunknummer ausw\u00e4hlen:
+BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Mobilfunknummer zum Kontakt hinzuf\u00fcgen
PERSONAL_DATA_ZIP_CODE=ZIP code:
PERSONAL_DATA_PHONE_NUMBER=Phone:
PERSONAL_DATA_FAX_NUMBER=Fax:
-PERSONAL_DATA_CELLPHONE_NUMBER=Mobile:
+PERSONAL_DATA_MOBILE_NUMBER=Mobile:
PERSONAL_DATA_CITY=City:
PERSONAL_DATA_LEGEND_TITLE=Please enter your data.
PERSONAL_DATA_LEGEND=Please enter your data:
ADMIN_PERSONAL_DATA_COUNTRY_CODE=Select country:
ADMIN_PERSONAL_DATA_PHONE_NUMBER=Phone number:
ADMIN_PERSONAL_DATA_FAX_NUMBER=Fax number:
-ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER=Mobile number:
+ADMIN_PERSONAL_DATA_MOBILE_NUMBER=Mobile number:
ADMIN_USER_DATA_EMAIL_LEGEND=User name:
ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Enter here a user name.
ADMIN_PERSONAL_DATA_ENTER_USER_NAME=User name (*1):
ADMIN_LINK_DELETE_USER_TITLE=Deletes user account (after confirmation).
CONTENT_TITLE_ADMIN_DELETE_USER=Delete user account:
PAGE_TITLE_ADMIN_DELETE_USER=Delete user account
-ADMIN_HEADER_SHOW_CELLPHONE_DATA=Data of mobile phone:
-ADMIN_SHOW_CELLPHONE_ID=Id number:
-ADMIN_SHOW_CELLPHONE_PROVIDER_NAME=Mobile provider:
-ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE=Complete number:
-ADMIN_SHOW_CELLPHONE_LINKS=Administrative links:
+ADMIN_HEADER_SHOW_MOBILE_DATA=Data of mobile phone:
+ADMIN_SHOW_MOBILE_ID=Id number:
+ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider:
+ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number:
+ADMIN_SHOW_MOBILE_LINKS=Administrative links:
ERROR_PARAMETER_USER_NOT_SET=Error: Parameter 'user' not set.
ADMIN_LINK_SHOW_SHORT=Show
ADMIN_LINK_SHOW_SHORT_TITLE=Show single entry.
ADMIN_LINK_DELETE_SHORT_TITLE=Delete entry.
ADMIN_LINK_UNLINK_SHORT=Unlink
ADMIN_LINK_UNLINK_SHORT_TITLE=Removes link to entry.
-PAGE_TITLE_ADMIN_DELETE_CELLPHONE=Delete cellphone entry
-CONTENT_TITLE_ADMIN_DELETE_CELLPHONE=Delete cellphone entry:
-PAGE_TITLE_ADMIN_EDIT_CELLPHONE=Edit cellphone entry
-CONTENT_TITLE_ADMIN_EDIT_CELLPHONE=Edit cellphone entry:
-PAGE_TITLE_ADMIN_SHOW_CELLPHONE=Show cellphone entry
-CONTENT_TITLE_ADMIN_SHOW_CELLPHONE=Show cellphone entry:
-PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link contact-cellphone
-CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link between contact-cellphone:
+PAGE_TITLE_ADMIN_DELETE_MOBILE=Delete mobile entry
+CONTENT_TITLE_ADMIN_DELETE_MOBILE=Delete mobile entry:
+PAGE_TITLE_ADMIN_EDIT_MOBILE=Edit mobile entry
+CONTENT_TITLE_ADMIN_EDIT_MOBILE=Edit mobile entry:
+PAGE_TITLE_ADMIN_SHOW_MOBILE=Show mobile entry
+CONTENT_TITLE_ADMIN_SHOW_MOBILE=Show mobile entry:
+PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Remove link contact-mobile
+CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE=Remove link between contact-mobile:
ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set.
PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider
CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider:
-TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE=A single cellphone entry.
-TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS=This table shows links of of this cellphone number to all contacts.
-ADMIN_HEADER_SHOW_CELLPHONE_LINKS=All links between contact-cellphone for id {0}:
+TABLE_SUMMARY_ADMIN_SHOW_MOBILE=A single mobile entry.
+TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS=This table shows links of of this mobile number to all contacts.
+ADMIN_HEADER_SHOW_MOBILE_LINKS=All links between contact-mobile for id {0}:
ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set.
-ADMIN_SHOW_CELLPHONE_UNLINK=Unlink:
+ADMIN_SHOW_MOBILE_UNLINK=Unlink:
ADMIN_CONTACT_ID=Contact id:
PAGE_TITLE_ADMIN_SHOW_CONTACT=Show contact data
CONTENT_TITLE_ADMIN_SHOW_CONTACT=Show contact data:
ADMIN_MENU_CONTACT_TITLE=Contact data
LINK_ADMIN_LIST_CONTACT=List contact data
LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
-ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'cellphoneNumber' and 'contact' are not set.
+ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'mobileNumber' and 'contact' are not set.
ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least salutation, first name and family name.
ERROR_PARAMETER_CONTACT_NOT_SET=Error: Parameter 'contact' is not set.
ADMIN_HEADER_SHOW_CONTACT=Contact data for {0}:
LINK_ADMIN_LIST_CONTACT=List contact data
LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
ADMIN_CONTACT_COUNTRY_CODE=Country code:
-ADMIN_CONTACT_CELLPHONE_NUMBER=Cellphone number:
+ADMIN_CONTACT_MOBILE_NUMBER=Cellphone number:
ADMIN_CONTACT_LANDLINE_NUMBER=Phone number:
ADMIN_CONTACT_FAX_NUMBER=Fax number:
PAGE_TITLE_ADMIN_EXPORT_CONTACT=Export contact data
ADMIN_EXPORT_CONTACT_CITY=City
ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email address
ADMIN_EXPORT_CONTACT_BIRTHDAY=Birthday
-ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER=Cellphone number
+ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Cellphone number
ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Land-line number
ADMIN_EXPORT_CONTACT_FAX_NUMBER=Fax number
ADMIN_EXPORT_CONTACT_CREATED=Entry created
CONTENT_TITLE_ADMIN_LOCK_USER=Lock user account:
ERROR_BEAN_HELPER_USER_NOT_SET=Error: Instance 'user' not set in bean helper.
ERROR_BEAN_HELPER_CONTACT_NOT_SET=Error: Instance 'contact' not set in bean helper.
-ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in bean helper not set.
-CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List mobile phone numbers:
-ADMIN_LIST_CELLPHONE_EMPTY=No cell phone numbers are saved.
+ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in bean helper not set.
+CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE=List mobile phone numbers:
+ADMIN_LIST_MOBILE_EMPTY=No mobile numbers are saved.
ADMIN_MENU_PHONE_NUMBERS_TITLE=Phone numbers:
-LINK_ADMIN_LIST_CELLPHONE_PHONE_NUMBERS=Cell phone numbers ...
-LINK_ADMIN_LIST_CELLPHONE_PHONE_NUMBERS_TITLE=List all cell phone numbers.
-ADMIN_SHOW_CELLPHONE_CREATED=Created:
-ADMIN_SHOW_CELLPHONE_UPDATED=Last changed:
-ADMIN_EDIT_CELLPHONE_TITLE=Edit cell phone entry:
-ADMIN_CELLPHONE_DATA_LEGEND=Edit cell phone data:
-ADMIN_EDIT_CELLPHONE_PROVIDER=Change mobile phone provider:
-ADMIN_EDIT_CELLPHONE_NUMBER=Change call number:
-BUTTON_ADMIN_EDIT_CELLPHONE=Edit cell phone number
+LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS=Cell phone numbers ...
+LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE=List all mobile numbers.
+ADMIN_SHOW_MOBILE_CREATED=Created:
+ADMIN_SHOW_MOBILE_UPDATED=Last changed:
+ADMIN_EDIT_MOBILE_TITLE=Edit mobile entry:
+ADMIN_MOBILE_DATA_LEGEND=Edit mobile data:
+ADMIN_EDIT_MOBILE_PROVIDER=Change mobile phone provider:
+ADMIN_EDIT_MOBILE_NUMBER=Change call number:
+BUTTON_ADMIN_EDIT_MOBILE=Edit mobile number
ADMIN_LINK_LOCK_USER=Lock user account
ADMIN_LINK_LOCK_USER_TITLE=Locking of confirmed user account with lock reason.
-ADMIN_CELLPHONE_DATA_LEGEND_TITLE=Change cell phone number and provider.
+ADMIN_MOBILE_DATA_LEGEND_TITLE=Change mobile number and provider.
ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED=Error: Cannot lock user account, it is still unconfirmed.
ADMIN_MOBILE_PROVIDER_REQUIRED=Please choose a mobile provider.
-ADMIN_CELLPHONE_NUMBER_REQUIRED=Please enter a cell phone number.
-BUTTON_ADMIN_DELETE_CELLPHONE=Delete cell phone number
-ADMIN_DELETE_CELLPHONE_DATA_NOTICE=If you delete the cell phone number, it won't be available anymore for anything. Please consider carefully if you really want this.
-ADMIN_DELETE_CELLPHONE_TITLE=Do you really want to delete the cell phone number?
+ADMIN_MOBILE_NUMBER_REQUIRED=Please enter a mobile number.
+BUTTON_ADMIN_DELETE_MOBILE=Delete mobile number
+ADMIN_DELETE_MOBILE_DATA_NOTICE=If you delete the mobile number, it won't be available anymore for anything. Please consider carefully if you really want this.
+ADMIN_DELETE_MOBILE_TITLE=Do you really want to delete the mobile number?
ADMIN_TABLE_SUMMARY_SHOW_CONTACT_MINI=The table contains the most important data from contact (minimalized view).
ADMIN_SHOW_FULL_CONTACT_DATA=Show all contact data
-ADMIN_UNLINK_CONTACT_CELLPHONE_TITLE=Do you really want to unlink the shown cell phone number from the contact?
-BUTTON_ADMIN_UNLINK_CONTACT_CELLPHONE=Unlink cell phone number from contact
+ADMIN_UNLINK_CONTACT_MOBILE_TITLE=Do you really want to unlink the shown mobile number from the contact?
+BUTTON_ADMIN_UNLINK_CONTACT_MOBILE=Unlink mobile number from contact
ADMIN_LOCK_USER_TITLE=Do You really want to lock this user?
ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED=Cannot unlock user {0} ({1}) because he is already unlocked.
ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED=Cannot lock user {0} ({1}) because he is already locked.
ERROR_USER_NAME_ALREADY_USED=User name already used. Please enter another name.
ERROR_EMAIL_ADDRESSES_MISMATCHING=Both entered email addresses are not the same.
ERROR_EMAIL_ADDRESS_ALREADY_USED=Your entered email address is already used. Please enter another and try again.
-ERROR_CELLPHONE_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}.
-ADMIN_ADD_CONTACT_CELLPHONE_FORM_TITLE=Add cell phone number to contact
-ADMIN_SELECT_CELLPHONE=Choose cell phone number:
-BUTTON_ADMIN_LINK_ADD_CONTACT_CELLPHONE=Add cell phone number to contact
+ERROR_MOBILE_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}.
+ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Add mobile number to contact
+ADMIN_SELECT_MOBILE=Choose mobile number:
+BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Add mobile number to contact
<to-view-id>/user/user_profile.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_list.xhtml</to-view-id>
+ <from-outcome>admin_list_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin_list_countries</from-outcome>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_list_contact_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
+ <from-outcome>admin_list_contact_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_contact_mobile_list.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/admin/cellphone/admin_cellphone_list.xhtml</from-view-id>
+ <from-view-id>/admin/mobile/admin_mobile_list.xhtml</from-view-id>
<navigation-case>
<from-outcome>admin_show_mobile_provider</from-outcome>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_show_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_show.xhtml</to-view-id>
+ <from-outcome>admin_show_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_edit_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_edit.xhtml</to-view-id>
+ <from-outcome>admin_edit_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_unlink_contact_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+ <from-outcome>admin_unlink_contact_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_delete_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_delete.xhtml</to-view-id>
+ <from-outcome>admin_delete_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin_edit_user</from-outcome>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_edit_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_edit.xhtml</to-view-id>
+ <from-outcome>admin_edit_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_delete_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_delete.xhtml</to-view-id>
+ <from-outcome>admin_delete_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_unlink_contact_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+ <from-outcome>admin_unlink_contact_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_show_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_show.xhtml</to-view-id>
+ <from-outcome>admin_show_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/admin/cellphone/admin_cellphone_list.xhtml</from-view-id>
+ <from-view-id>/admin/mobile/admin_mobile_list.xhtml</from-view-id>
<navigation-case>
- <from-outcome>admin_show_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_show.xhtml</to-view-id>
+ <from-outcome>admin_show_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_edit_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_edit.xhtml</to-view-id>
+ <from-outcome>admin_edit_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_delete_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_delete.xhtml</to-view-id>
+ <from-outcome>admin_delete_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/admin/cellphone/admin_cellphone_show.xhtml</from-view-id>
+ <from-view-id>/admin/mobile/admin_mobile_show.xhtml</from-view-id>
<navigation-case>
<from-outcome>admin_show_mobile_provider</from-outcome>
<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_edit_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_edit.xhtml</to-view-id>
+ <from-outcome>admin_edit_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_delete_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_cellphone_delete.xhtml</to-view-id>
+ <from-outcome>admin_delete_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>admin_unlink_contact_cellphone</from-outcome>
- <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+ <from-outcome>admin_unlink_contact_mobile</from-outcome>
+ <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>admin_show_contact</from-outcome>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</from-view-id>
+ <from-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</from-view-id>
<navigation-case>
<from-outcome>admin_show_contact</from-outcome>
<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
</div>
<ul>
- <li><h:link title="#{msg.LINK_ADMIN_LIST_CELLPHONE_PHONE_NUMBERS_TITLE}" outcome="admin_list_cellphone" value="#{msg.LINK_ADMIN_LIST_CELLPHONE_PHONE_NUMBERS}" /></li>
+ <li><h:link title="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS}" /></li>
</ul>
<div class="menu_header">
<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
<ui:fragment rendered="#{empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl" />
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
</ui:fragment>
<ui:fragment rendered="#{not empty beanHelper.contact.contactCellphoneNumber and not empty beanHelper.contact}">
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl" />
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl" />
</ui:fragment>
</ui:composition>
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_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+ <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
- <h:panelGrid id="cellphone_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CELLPHONE_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.cellPhoneNumber}">
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_HEADER_SHOW_CELLPHONE_DATA}" />
+ <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
</f:facet>
<h:column>
<h:panelGroup>
- <h:outputLabel for="cellphoneId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+ <h:outputLabel for="mobileId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
- <h:outputText id="cellphoneId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+ <h:outputText id="mobileId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
- <h:message for="cellphoneId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+ <h:message for="mobileId" errorClass="errors" fatalClass="errors" warnClass="errors" />
</h:panelGroup>
</h:column>
<h:column>
- <h:outputLabel for="cellphoneProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
+ <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.cellphoneProvider.providerId}" />
- <h:outputText id="cellphoneProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerName}" />
+ <f:param name="providerId" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerId}" />
+ <h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerName}" />
</h:link>
</h:column>
<h:column>
- <h:outputLabel for="cellphoneNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
+ <h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
- <h:outputText id="cellphoneNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.cellphoneProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
+ <h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.mobileProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
</h:column>
<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
- <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
+ <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
<div class="table_data_field">
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
<ui:param name="isShowPage" value="#{isShowPage}" />
</ui:include>
</div>
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_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+ <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
<ui:fragment rendered="#{not empty beanHelper.cellPhoneNumber}">
<ul class="mini_nav">
<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
<li class="mini_link">
- <h:link outcome="admin_show_cellphone">
+ <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}" />
</h:link>
</ui:fragment>
<li class="mini_link">
- <h:link outcome="admin_edit_cellphone">
+ <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}" />
</h:link>
<ui:fragment rendered="#{not empty beanHelper.contact}">
<li class="mini_link">
- <h:link outcome="admin_unlink_contact_cellphone">
+ <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="contactId" value="#{beanHelper.contact.contactId}" />
</ui:fragment>
<li class="mini_link">
- <h:link outcome="admin_delete_cellphone">
+ <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}" />
</h:link>
<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
- <h:form id="form_add_contact_cellphone" rendered="#{not empty beanHelper.contact}">
+ <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
<h:panelGroup styleClass="table_medium" layout="block">
<div class="table_header">
- <h:outputText value="#{msg.ADMIN_ADD_CONTACT_CELLPHONE_FORM_TITLE}" />
+ <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE}" />
</div>
<div class="para">
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="choosenCellphoneNumber" value="#{msg.ADMIN_SELECT_CELLPHONE}" />
+ <h:outputLabel for="choosenCellphoneNumber" value="#{msg.ADMIN_SELECT_MOBILE}" />
</div>
<div class="table_right_medium">
<h:selectOneMenu styleClass="select right_space" id="choosenCellphoneNumber" value="#{adminPhoneController.choosenCellphoneNumber}">
<f:converter converterId="CellphoneConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
- <f:selectItems value="#{adminPhoneController.allNonLinkedCellphoneNumbers()}" var="cellphoneNumber" itemValue="#{cellphoneNumber}" itemLabel="#{cellphoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix} (#{cellphoneNumber.cellphoneProvider.providerDialPrefix}) #{cellphoneNumber.phoneNumber}" />
+ <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
</h:selectOneMenu>
</div>
</div>
<div class="para">
- <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_CELLPHONE_DATA}" />
+ <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
</div>
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
+ <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
</div>
<div class="table_right_medium">
<div class="table_footer">
<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddCellphone(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_CELLPHONE}" />
+ <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddCellphone(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE}" />
</div>
</h:panelGroup>
</h:form>
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_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+ <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
<div class="para">
<fieldset class="fieldset" id="phone_data">
- <legend title="#{msg.ADMIN_CELLPHONE_DATA_LEGEND_TITLE}">
- <h:outputText value="#{msg.ADMIN_CELLPHONE_DATA_LEGEND}" />
+ <legend title="#{msg.ADMIN_MOBILE_DATA_LEGEND_TITLE}">
+ <h:outputText value="#{msg.ADMIN_MOBILE_DATA_LEGEND}" />
</legend>
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="cellphoneId" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+ <h:outputLabel for="mobileId" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
</div>
<div class="table_right_medium">
- <h:outputText id="cellphoneId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+ <h:outputText id="mobileId" value="#{beanHelper.cellPhoneNumber.phoneId}" />
</div>
<div class="clear"></div>
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="cellphoneProvider" value="#{msg.ADMIN_EDIT_CELLPHONE_PROVIDER}" />
+ <h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
</div>
<div class="table_right_medium">
- <h:selectOneMenu styleClass="select" id="cellphoneProvider" value="#{adminPhoneController.cellphoneProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
+ <h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
<f:converter converterId="MobileProviderConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
<div class="clear"></div>
<div class="error_container">
- <h:message for="cellphoneProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+ <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
</div>
</div>
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_EDIT_CELLPHONE_NUMBER}" />
+ <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
</div>
<div class="table_right_medium">
- <h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_CELLPHONE_NUMBER_REQUIRED}">
- <f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
+ <h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
+ <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
</h:inputText>
</div>
<div class="clear"></div>
<div class="error_container">
- <h:message for="cellphoneNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+ <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
</div>
</div>
</fieldset>
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
+ <h:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
</div>
<div class="table_right_medium">
<div class="table_row">
<div class="table_left_medium">
- <h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
+ <h:outputLabel for="mobileNumber" value="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
</div>
<div class="table_right_medium">
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:fragment rendered="#{not empty targetController}">
- <h:selectOneMenu styleClass="select right_space" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}">
+ <h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
<f:converter converterId="MobileProviderConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{mobileProviderController.allMobileProvider()}" 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>
</f:metadata>
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
- <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE}</ui:define>
+ <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE}</ui:define>
<ui:define name="content_header">
- #{msg.CONTENT_TITLE_ADMIN_DELETE_CELLPHONE}
+ #{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE}
</ui:define>
<ui:define name="content">
- <h:form id="form_delete_cellphone" rendered="#{not empty beanHelper.cellPhoneNumber}">
+ <h:form id="form_delete_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
<h:panelGroup styleClass="table" layout="block">
<div class="table_header">
- <h:outputText value="#{msg.ADMIN_DELETE_CELLPHONE_TITLE}" />
+ <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
</div>
<div class="para">
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
<ui:param name="isShowPage" value="#{false}" />
<ui:param name="showAdminLinks" value="#{false}" />
</ui:include>
</div>
<div class="para">
- <h:outputText value="#{msg.ADMIN_DELETE_CELLPHONE_DATA_NOTICE}" />
+ <h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
</div>
<div class="table_footer">
- <h:commandButton styleClass="delete_button" type="submit" id="delete_cellphone" value="#{msg.BUTTON_ADMIN_DELETE_CELLPHONE}" action="#{adminPhoneController.deleteCellphoneData()}" />
+ <h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE}" action="#{adminPhoneController.deleteMobileData()}" />
</div>
</h:panelGroup>
</h:form>
- <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+ <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
</ui:define>
</ui:composition>
</html>
<f:metadata>
<f:viewParam name="phoneId" value="#{beanHelper.cellPhoneNumber}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
- <f:viewAction action="#{beanHelper.copyCellphoneNumberToController()}" />
+ <f:viewAction action="#{beanHelper.copyMobileNumberToController()}" />
</f:metadata>
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
- <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE}</ui:define>
+ <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE}</ui:define>
<ui:define name="content_header">
- #{msg.CONTENT_TITLE_ADMIN_EDIT_CELLPHONE}
+ #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE}
</ui:define>
<ui:define name="content">
- <h:form id="form_edit_cellphone" rendered="#{not empty beanHelper.cellPhoneNumber}">
+ <h:form id="form_edit_mobile" rendered="#{not empty beanHelper.cellPhoneNumber}">
<h:panelGroup styleClass="table_medium" layout="block">
<div class="table_header">
- #{msg.ADMIN_EDIT_CELLPHONE_TITLE}
+ #{msg.ADMIN_EDIT_MOBILE_TITLE}
</div>
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl" />
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
<div class="table_footer">
<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <h:commandButton styleClass="submit" type="submit" id="edit_cellphone" value="#{msg.BUTTON_ADMIN_EDIT_CELLPHONE}" action="#{adminPhoneController.editCellphoneData()}" />
+ <h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE}" action="#{adminPhoneController.editMobileData()}" />
</div>
</h:panelGroup>
</h:form>
- <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+ <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
</ui:define>
</ui:composition>
</html>
>
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
- <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}</ui:define>
+ <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE}</ui:define>
<ui:define name="content_header">
- #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}
+ #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE}
</ui:define>
<ui:define name="content">
- <h:dataTable id="table_list_cellphones" var="cellphone" value="#{phoneController.allCellphoneNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CELLPHONES}" rendered="#{not phoneController.allCellphoneNumbers().isEmpty()}">
+ <h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+ <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
</f:facet>
- <h:link outcome="admin_show_cellphone">
- <h:outputText value="#{cellphone.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
- <f:param name="phoneId" value="#{cellphone.phoneId}" />
+ <h:link outcome="admin_show_mobile">
+ <h:outputText value="#{mobile.phoneId}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
+ <f:param name="phoneId" value="#{mobile.phoneId}" />
</h:link>
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
+ <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
</f:facet>
<h:link outcome="admin_show_mobile_provider">
- <f:param name="providerId" value="#{cellphone.cellphoneProvider.providerId}" />
- <h:outputText value="#{cellphone.cellphoneProvider.providerName}" />
+ <f:param name="providerId" value="#{mobile.mobileProvider.providerId}" />
+ <h:outputText value="#{mobile.mobileProvider.providerName}" />
</h:link>
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
+ <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
</f:facet>
- <h:outputText value="#{cellphone.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{cellphone.cellphoneProvider.providerDialPrefix}-#{cellphone.phoneNumber}" />
+ <h:outputText value="#{mobile.mobileProvider.providerCountry.countryExternalDialPrefix}#{mobile.mobileProvider.providerDialPrefix}-#{mobile.phoneNumber}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_SHOW_CELLPHONE_CREATED}" />
+ <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_CREATED}" />
</f:facet>
- <h:outputText value="#{cellphone.phoneEntryCreated.time}">
+ <h:outputText value="#{mobile.phoneEntryCreated.time}">
<f:convertDateTime type="both" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_SHOW_CELLPHONE_UPDATED}" />
+ <h:outputText value="#{msg.ADMIN_SHOW_MOBILE_UPDATED}" />
</f:facet>
- <h:outputText value="#{cellphone.phoneEntryUpdated.time}">
+ <h:outputText value="#{mobile.phoneEntryUpdated.time}">
<f:convertDateTime type="both" />
</h:outputText>
</h:column>
</h:dataTable>
- <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_CELLPHONE_EMPTY}" rendered="#{phoneController.allCellphoneNumbers().isEmpty()}" />
+ <h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
</ui:define>
</ui:composition>
</html>
</f:metadata>
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
- <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CELLPHONE}</ui:define>
+ <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE}</ui:define>
<ui:define name="content_header">
- #{msg.CONTENT_TITLE_ADMIN_SHOW_CELLPHONE}
+ #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE}
</ui:define>
<ui:define name="content">
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
<ui:param name="isShowPage" value="#{true}" />
</ui:include>
- <h:dataTable id="contact_cellphone_link" var="contact" value="#{contactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+ <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_CELLPHONE_LINKS}">
+ <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_LINKS}">
<f:param value="#{beanHelper.cellPhoneNumber.phoneId}" />
</h:outputFormat>
</f:facet>
</h:column>
<h:column>
- <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
+ <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_UNLINK}" />
<div class="table_data_field">
<ul class="mini_nav">
<li class="mini_link">
- <h:link outcome="admin_unlink_contact_cellphone">
+ <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="contactId" value="#{contact.contactId}" />
</f:metadata>
<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
- <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}</ui:define>
+ <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}</ui:define>
<ui:define name="content_header">
- #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}
+ #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}
</ui:define>
<ui:define name="content">
- <h:form id="form_unlink_contact_cellphone" 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.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.cellPhoneNumber}">
<h:panelGroup styleClass="table" layout="block">
<div class="table_header">
- <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_CELLPHONE_TITLE}" />
+ <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
</div>
<div class="para">
</div>
<div class="para">
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
<ui:param name="isShowPage" value="#{false}" />
<ui:param name="showAdminLinks" value="#{false}" />
</ui:include>
</div>
<div class="table_footer">
- <h:commandButton styleClass="unlink_button" type="submit" id="unlink_cellphone" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_CELLPHONE}" action="#{adminContactPhoneController.unlinkCellphoneContactData()}" />
+ <h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_MOBILE}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
</div>
</h:panelGroup>
</h:form>
- <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+ <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_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
- <h:outputFormat styleClass="errors" value="#{msg.ERROR_CELLPHONE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.cellPhoneNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.cellPhoneNumber}">
+ <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}" />
<f:param value="#{beanHelper.contact.contactId}" />
</h:outputFormat>
<p:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER}" />
+ <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
</f:facet>
<h:outputText value="#{adminContactController.generateCellphoneNumber(contact.contactCellphoneNumber)}" />
</div>
<div>
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl" />
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
</div>
</ui:define>
</ui:composition>
<p:column>
<f:facet name="header">
- <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER}" />
+ <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
</f:facet>
<h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactCellphoneNumber)}" />
</div>
<div>
- <ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl" />
+ <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
</div>
</ui:define>
</ui:composition>
projects / jjobs-war.git / commitdiff