From 33723c0aeab29db3c92467bbed024a995f454f74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Aug 2016 10:04:14 +0200 Subject: [PATCH] Renaming season has started: - renamed cellphone to mobile (all occurences) - let's don't discrimite other mobile phones, right? MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../JobsAdminContactWebRequestBean.java | 126 +++++++------- .../JobsAdminContactWebRequestController.java | 44 ++--- .../contact/JobsContactWebSessionBean.java | 124 +++++++------- .../JobsContactWebSessionController.java | 28 +-- .../JobsAdminContactPhoneWebRequestBean.java | 54 +++--- ...AdminContactPhoneWebRequestController.java | 5 +- .../phone/JobsContactPhoneWebSessionBean.java | 14 +- .../JobsContactPhoneWebSessionController.java | 10 +- .../helper/JobsWebRequestController.java | 42 ++--- .../beans/helper/JobsWebRequestHelper.java | 135 +++++++-------- ...JobsAdminMobileProviderWebRequestBean.java | 6 +- .../phone/JobsAdminPhoneWebRequestBean.java | 160 +++++++++--------- .../JobsAdminPhoneWebRequestController.java | 40 ++--- .../phone/JobsPhoneWebApplicationBean.java | 70 ++++---- .../JobsPhoneWebApplicationController.java | 8 +- .../cellphone/JobsCellphoneConverter.java | 20 +-- .../JobsMobileProviderConverter.java | 2 +- .../JobsUserProfileVisibilityValidator.java | 10 +- .../localization/bundle_de_DE.properties | 90 +++++----- .../localization/bundle_en_US.properties | 90 +++++----- web/WEB-INF/faces-config.xml | 72 ++++---- web/WEB-INF/templates/admin/admin_menu.tpl | 2 +- .../cellphone/admin_cellphone_add_show.tpl | 4 +- .../admin/cellphone/admin_cellphone_data.tpl | 26 +-- .../admin/cellphone/admin_cellphone_links.tpl | 10 +- .../admin_form_add_contact_cellphone.tpl | 14 +- .../cellphone/admin_form_cellphone_data.tpl | 24 +-- .../admin/contact/admin_form_contact_data.tpl | 2 +- .../templates/contact/form_contact_data.tpl | 2 +- .../generic/mobile_selection_box.tpl | 6 +- .../cellphone/admin_cellphone_delete.xhtml | 16 +- .../cellphone/admin_cellphone_edit.xhtml | 16 +- .../cellphone/admin_cellphone_list.xhtml | 34 ++-- .../cellphone/admin_cellphone_show.xhtml | 14 +- .../admin_contact_cellphone_unlink.xhtml | 16 +- web/admin/contact/admin_contact_export.xhtml | 2 +- web/admin/contact/admin_contact_show.xhtml | 2 +- web/admin/user/admin_user_export.xhtml | 2 +- web/admin/user/admin_user_show.xhtml | 2 +- 39 files changed, 668 insertions(+), 676 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index e0b78c39..8b8cd79a 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -47,9 +47,9 @@ import org.mxchange.jcountry.data.Country; 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; @@ -91,19 +91,9 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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 @@ -193,11 +183,6 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ private String houseNumberExtension; - /** - * Whether a cellphone entry has been unlinked - */ - private boolean isCellphoneUnlinked; - /** * Whether a fax entry has been unlinked */ @@ -208,11 +193,26 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement */ 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 */ @@ -372,11 +372,11 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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 @@ -453,7 +453,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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)); @@ -466,9 +466,9 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement } @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; } @@ -476,9 +476,9 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement // 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 @@ -517,36 +517,6 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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; @@ -708,6 +678,36 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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; @@ -797,8 +797,8 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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); @@ -864,8 +864,8 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement 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()); diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java index ba180026..8e154ec4 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestController.java @@ -22,7 +22,7 @@ import org.mxchange.jcontacts.contact.Contact; 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; @@ -79,18 +79,18 @@ public interface JobsAdminContactWebRequestController extends Serializable { String editContactData (); /** - * Getter for cellphone id + * Getter for mobile id *

- * @return Cellphone id + * @return Mobile id */ - Long getCellphoneId (); + Long getMobileId (); /** - * Setter for cellphone id + * Setter for mobile id *

- * @param cellphoneId Cellphone id + * @param mobileId Mobile id */ - void setCellphoneId (final Long cellphoneId); + void setMobileId (final Long mobileId); /** * Getter for fax id @@ -135,32 +135,32 @@ public interface JobsAdminContactWebRequestController extends Serializable { void setBirthday (final Date birthday); /** - * Getter for ellphone number's carrier + * Getter for mobile provider *

- * @return Cellphone number's carrier + * @return mobile provider */ - MobileProvider getCellphoneCarrier (); + MobileProvider getMobileProvider (); /** - * Setter for cellphone number's carrier prefix + * Setter for mobile provider *

- * @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 *

- * @return Cellphone number + * @return Mobile number */ - Long getCellphoneNumber (); + Long getMobileNumber (); /** - * Setter for ellphone number + * Setter for mobile number *

- * @param cellphoneNumber Cellphone number + * @param mobileNumber Mobile number */ - void setCellphoneNumber (final Long cellphoneNumber); + void setMobileNumber (final Long mobileNumber); /** * City @@ -456,13 +456,13 @@ public interface JobsAdminContactWebRequestController extends Serializable { 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. *

- * @param cellphoneNumber Cellphone number + * @param mobileNumber Mobile number *

* @return Text respresentation or null */ - String generateCellphoneNumber (final DialableCellphoneNumber cellphoneNumber); + String generateMobileNumber (final DialableMobileNumber mobileNumber); } diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java index 657e980b..2f0e7ef9 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java @@ -45,13 +45,13 @@ import org.mxchange.jcountry.data.Country; 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; @@ -79,16 +79,6 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job */ private Date birthday; - /** - * Cellphone number's carrier - */ - private MobileProvider cellphoneCarrier; - - /** - * Cellphone number - */ - private Long cellphoneNumber; - /** * City */ @@ -169,11 +159,6 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job */ private String houseNumberExtension; - /** - * Whether a cellphone entry has been unlinked - */ - private boolean isCellphoneUnlinked; - /** * Whether a fax entry has been unlinked */ @@ -184,6 +169,21 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job */ 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 */ @@ -474,7 +474,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job // 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 @@ -534,18 +534,18 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } // 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 @@ -588,8 +588,8 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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()); @@ -598,7 +598,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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 @@ -616,26 +616,6 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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; @@ -777,6 +757,26 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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; @@ -965,14 +965,14 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job } @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; @@ -980,10 +980,10 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job // 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()); } } } @@ -1050,8 +1050,8 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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); @@ -1095,8 +1095,8 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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(); @@ -1107,9 +1107,9 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job 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)) { diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java index 248696a6..889e5407 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionController.java @@ -27,7 +27,7 @@ import org.mxchange.jcontacts.events.contact.deleted.AdminDeletedContactEvent; 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; @@ -72,11 +72,11 @@ public interface JobsContactWebSessionController extends Serializable { 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 *

* @param event Event being fired */ - void removeCellphoneNumberFromListEvent(final AdminRemoveCellphoneNumberFromListEvent event); + void removeMobileNumberFromListEvent(final AdminRemoveMobileNumberFromListEvent event); /** * Updates all data from bean in given contact instance @@ -156,32 +156,32 @@ public interface JobsContactWebSessionController extends Serializable { void setBirthday (final Date birthday); /** - * Getter for ellphone number's carrier + * Getter for mobile provider *

- * @return Cellphone number's carrier + * @return Mobile provider */ - MobileProvider getCellphoneCarrier (); + MobileProvider getMobileProvider (); /** - * Setter for cellphone number's carrier prefix + * Setter for mobile provider *

- * @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 *

* @return Cellphone number */ - Long getCellphoneNumber (); + Long getMobileNumber (); /** - * Setter for ellphone number + * Setter for mobile number *

- * @param cellphoneNumber Cellphone number + * @param mobileNumber Cellphone number */ - void setCellphoneNumber (final Long cellphoneNumber); + void setMobileNumber (final Long mobileNumber); /** * City diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java index 32c6829a..d36f4093 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -28,14 +28,14 @@ import javax.naming.Context; 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; /** @@ -64,11 +64,11 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl 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 cellphoneDataUnlinkedEvent; + private Event mobileDataUnlinkedEvent; /** * Default constructor @@ -151,32 +151,32 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl } @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 @@ -192,16 +192,16 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl 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 diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java index 2c25bb32..2328c19c 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestController.java @@ -1,3 +1,4 @@ + /* * Copyright (C) 2016 Roland Haeder * @@ -31,11 +32,11 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; public interface JobsAdminContactPhoneWebRequestController extends Serializable { /** - * Unlinks cellphone data with current contact + * Unlinks mobile data with current contact *

* @return Redirect outcome */ - String unlinkCellphoneContactData (); + String unlinkMobileContactData (); /** * Event observer for newly added users by adminstrator diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java index 4cd5abce..09e6e4e4 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java @@ -30,11 +30,11 @@ import javax.enterprise.event.Observes; 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; /** @@ -64,7 +64,7 @@ public class JobsContactPhoneWebSessionBean extends BaseLandingController implem 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). */ @@ -121,7 +121,7 @@ public class JobsContactPhoneWebSessionBean extends BaseLandingController implem } @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 @@ -168,7 +168,7 @@ public class JobsContactPhoneWebSessionBean extends BaseLandingController implem @Override public List allCellphoneContacts () { // Get id - DialableCellphoneNumber phone = this.beanHelper.getCellPhoneNumber(); + DialableMobileNumber phone = this.beanHelper.getMobileNumber(); // Is cache there? if (this.contacts.containsKey(phone)) { @@ -180,8 +180,8 @@ public class JobsContactPhoneWebSessionBean extends BaseLandingController implem // "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); } diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java index 4273bf9a..eff200db 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionController.java @@ -20,10 +20,10 @@ import java.io.Serializable; 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 @@ -34,7 +34,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; public interface JobsContactPhoneWebSessionController extends Serializable { /** - * Getter for all contacts having current cellphone instance linked + * Getter for all contacts having current mobile instance linked *

* @return List of all linked contacts */ @@ -63,10 +63,10 @@ public interface JobsContactPhoneWebSessionController extends Serializable { void afterAdminUpdatedContactDataEvent (final AdminUpdatedContactEvent event); /** - * Event observer for unlinked cellphone-contact by administrators + * Event observer for unlinked mobile-contact by administrators *

- * @param event Unlinked cellphone-contact event + * @param event Unlinked mobile-contact event */ - void afterAdminUnlinkedCellphoneContactDataEvent (final AdminUnlinkedCellphoneNumberEvent event); + void afterAdminUnlinkedCellphoneContactDataEvent (final AdminUnlinkedMobileNumberEvent event); } diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java index 39ab3655..bc7b7f59 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java @@ -18,9 +18,9 @@ package org.mxchange.jjobs.beans.helper; 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; /** @@ -31,9 +31,9 @@ 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 @@ -84,45 +84,45 @@ public interface JobsWebRequestController extends Serializable { void setUser (final User user); /** - * Getter for dialable cellphone number instance + * Getter for dialable mobile number *

- * @return Dialable cellphone number instance + * @return Dialable mobile number */ - DialableCellphoneNumber getCellPhoneNumber (); + DialableMobileNumber getMobileNumber (); /** - * Setter for dialable cellphone number instance + * Setter for dialable mobile number *

- * @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 *

- * @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 *

- * @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 *

- * @return Dialable fax number instance + * @return Dialable fax number */ - DialableFaxNumber getFax (); + DialableFaxNumber getFaxNumber (); /** - * Setter for dialable fax number instance + * Setter for dialable fax number *

- * @param fax Dialable fax number instance + * @param faxNumber Dialable fax number */ - void setFax (final DialableFaxNumber fax); + void setFaxNumber (final DialableFaxNumber faxNumber); } diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java index 3b756741..94f65c47 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java @@ -24,9 +24,9 @@ import org.mxchange.jcontacts.contact.Contact; 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; /** @@ -55,11 +55,6 @@ public class JobsWebRequestHelper implements JobsWebRequestController { @Inject private JobsAdminPhoneWebRequestController adminPhoneController; - /** - * Cell phone number - */ - private DialableCellphoneNumber cellPhoneNumber; - /** * Contact instance */ @@ -68,12 +63,17 @@ public class JobsWebRequestHelper implements JobsWebRequestController { /** * 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 @@ -92,40 +92,6 @@ public class JobsWebRequestHelper implements JobsWebRequestController { 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 @@ -150,6 +116,40 @@ public class JobsWebRequestHelper implements JobsWebRequestController { //* 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 @@ -183,16 +183,6 @@ public class JobsWebRequestHelper implements JobsWebRequestController { //* 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; @@ -234,23 +224,33 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } @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 @@ -264,7 +264,8 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } /** - * 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 *

* @param contact Contact to set phone instances for */ @@ -281,22 +282,22 @@ public class JobsWebRequestHelper implements JobsWebRequestController { 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()); } } diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java index c89479b8..ae981191 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java @@ -108,7 +108,7 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsController im @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? @@ -180,9 +180,9 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsController im * Checks whether if the given mobile provider is already created by * checking both dial prefix and country. *

- * @param mobileProvider Mobile provider instance to check + * @param mobileProvider Mobile provider to check *

- * @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 diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 8f94a1e5..dfcbea2a 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -30,13 +30,13 @@ import javax.naming.InitialContext; 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; @@ -66,28 +66,28 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements 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 cellPhoneNumberDeletedEvent; + private Event 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 cellPhoneNumberUpdatedEvent; + private Event 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 @@ -101,12 +101,12 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements 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 removeLinkedCellphoneNumbersEvent; + private Event removeLinkedCellphoneNumbersEvent; /** * Default constructor @@ -118,7 +118,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements 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); @@ -126,137 +126,137 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements } @Override - public List allNonLinkedCellphoneNumbers () { - // Get list of all cell phone numbers - List list = this.phoneController.allCellphoneNumbers(); + public List allNonLinkedMobileNumbers () { + // Get list of all mobile numbers + List 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 diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java index 87e288e6..ca294b96 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.beans.phone; 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; /** @@ -32,53 +32,53 @@ 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 *

- * @return List with all unused cell phone numbers + * @return List with all unused mobile numbers */ - List allNonLinkedCellphoneNumbers (); + List allNonLinkedMobileNumbers (); /** - * Deletes given cellphone entry data + * Deletes given mobile entry data *

* @return Redirect outcome */ - String deleteCellphoneData (); + String deleteMobileData (); /** - * Changes cellphone entry data + * Changes mobile entry data *

* @return Redirect outcome */ - String editCellphoneData (); + String editMobileData (); /** - * Getter for cell phone provider + * Getter for mobile provider *

- * @return Cell phone provider + * @return Mobile provider */ - MobileProvider getCellphoneProvider (); + MobileProvider getMobileProvider (); /** - * Setter for cell phone provider + * Setter for mobile provider *

- * @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 *

- * @return Choosen cell phone number + * @return Choosen mobile number */ - DialableCellphoneNumber getChoosenCellphoneNumber (); + DialableMobileNumber getChoosenCellphoneNumber (); /** - * Setter for choosen cell phone number + * Setter for choosen mobile number *

- * @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 diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java index 2209e119..56b137ed 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationBean.java @@ -32,9 +32,9 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; import org.mxchange.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; @@ -52,11 +52,6 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J */ private static final long serialVersionUID = 491_058_674_675_690_105L; - /** - * All cell phone numbers - */ - private final List cellphoneNumbers; - /** * All fax numbers */ @@ -67,6 +62,11 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J */ private final List landLineNumbers; + /** + * All mobile numbers + */ + private final List mobileNumbers; + /** * General EJB for phone numbers */ @@ -89,7 +89,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } // Init all lists - this.cellphoneNumbers = new LinkedList<>(); + this.mobileNumbers = new LinkedList<>(); this.faxNumbers = new LinkedList<>(); this.landLineNumbers = new LinkedList<>(); } @@ -111,7 +111,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J 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 @@ -135,7 +135,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J 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 @@ -159,19 +159,13 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J 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 allCellphoneNumbers () { - return this.cellphoneNumbers; - } - @Override @SuppressWarnings ("ReturnOfCollectionOrArrayField") public List allFaxNumbers () { @@ -184,13 +178,19 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J return this.landLineNumbers; } + @Override + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List 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()); } @@ -203,39 +203,39 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } /** - * 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. *

- * @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); } /** @@ -311,7 +311,7 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J } /** - * Updates given contact's cellphone, land-line and fax number + * Updates given contact's mobile, land-line and fax number *

* @param contact Contact instance */ @@ -327,10 +327,10 @@ public class JobsPhoneWebApplicationBean extends BaseJobsController implements J // 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? diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java index 004a6986..eade199b 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebApplicationController.java @@ -21,9 +21,9 @@ import java.util.List; 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; /** @@ -58,14 +58,14 @@ public interface JobsPhoneWebApplicationController extends Serializable { 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. *

- * @return List of all cell phone numbers + * @return List of all mobile numbers */ - List allCellphoneNumbers (); + List allMobileNumbers (); /** * Returns a list of all fax numbers. For performance reasons, the diff --git a/src/java/org/mxchange/jjobs/converter/cellphone/JobsCellphoneConverter.java b/src/java/org/mxchange/jjobs/converter/cellphone/JobsCellphoneConverter.java index 0d3aa8ad..9755bd67 100644 --- a/src/java/org/mxchange/jjobs/converter/cellphone/JobsCellphoneConverter.java +++ b/src/java/org/mxchange/jjobs/converter/cellphone/JobsCellphoneConverter.java @@ -29,11 +29,11 @@ import org.mxchange.jcoreeelogger.beans.local.logger.Log; 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 *

* @author Roland Haeder */ @@ -86,20 +86,14 @@ public class JobsCellphoneConverter implements Converter { } // 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); @@ -112,7 +106,7 @@ public class JobsCellphoneConverter implements Converter { // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: cellphone={0} - EXIT!", cellphone)); //NOI18N // Return it - return cellphone; + return mobileNumber; } @Override diff --git a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java index 520f4838..639904da 100644 --- a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java +++ b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java @@ -32,7 +32,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; /** - * Converter for SMS provider instance + * Converter for SMS provider *

* @author Roland Haeder */ diff --git a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java index a9d5496e..3cb6853f 100644 --- a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java +++ b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java @@ -20,7 +20,6 @@ import javax.faces.component.UIComponent; 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; /** @@ -37,12 +36,9 @@ public class JobsUserProfileVisibilityValidator extends BaseBooleanValidator imp 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); diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index ac363875..d13ce1a1 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -68,7 +68,7 @@ PERSONAL_DATA_HOUSE_NUMBER=Hausnummer: 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: @@ -274,7 +274,7 @@ ADMIN_PERSONAL_DATA_CITY=Wohnort: 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): @@ -392,11 +392,11 @@ ADMIN_LINK_DELETE_USER=Benutzeraccount l\u00f6schen 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. @@ -406,22 +406,22 @@ ADMIN_LINK_DELETE_SHORT=L\u00f6schen 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: @@ -452,7 +452,7 @@ ADMIN_LINK_SHOW_CONTACT_TITLE=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}: @@ -506,7 +506,7 @@ ADMIN_MENU_CONTACT_TITLE=Kontaktdaten verwalten 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 @@ -532,7 +532,7 @@ ADMIN_EXPORT_CONTACT_ZIP_CODE=PLZ 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 @@ -597,32 +597,32 @@ PAGE_TITLE_ADMIN_LOCK_USER=Benutzeraccount sperren 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. @@ -640,7 +640,7 @@ ERROR_USER_PASSWORD_MISMATCH=Ihr eingegebenes Passwort ist falsch. 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 diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 3aa2be80..ca0267fe 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -68,7 +68,7 @@ PERSONAL_DATA_HOUSE_NUMBER=House number: 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: @@ -260,7 +260,7 @@ ADMIN_PERSONAL_DATA_CITY=City: 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): @@ -375,11 +375,11 @@ ADMIN_LINK_DELETE_USER=Delete user account 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. @@ -389,22 +389,22 @@ ADMIN_LINK_DELETE_SHORT=Delete 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: @@ -434,7 +434,7 @@ ADMIN_LINK_SHOW_CONTACT_TITLE=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}: @@ -506,7 +506,7 @@ ADMIN_MENU_CONTACT_TITLE=Manage contact data 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 @@ -532,7 +532,7 @@ ADMIN_EXPORT_CONTACT_ZIP_CODE=ZIP code 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 @@ -597,32 +597,32 @@ PAGE_TITLE_ADMIN_LOCK_USER=Lock user account 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. @@ -640,7 +640,7 @@ ERROR_USER_PASSWORD_MISMATCH=You have entered a wrong password. 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 diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index b21a73dd..8ff914f5 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -68,8 +68,8 @@ /user/user_profile.xhtml - admin_list_cellphone - /admin/cellphone/admin_cellphone_list.xhtml + admin_list_mobile + /admin/mobile/admin_mobile_list.xhtml admin_list_countries @@ -122,8 +122,8 @@ /admin/mobile_provider/admin_mobile_provider_list.xhtml - admin_list_contact_cellphone - /admin/cellphone/admin_contact_cellphone_list.xhtml + admin_list_contact_mobile + /admin/mobile/admin_contact_mobile_list.xhtml @@ -262,7 +262,7 @@ - /admin/cellphone/admin_cellphone_list.xhtml + /admin/mobile/admin_mobile_list.xhtml admin_show_mobile_provider /admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -298,20 +298,20 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_show_cellphone - /admin/cellphone/admin_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/mobile/admin_contact_mobile_unlink.xhtml - admin_delete_cellphone - /admin/cellphone/admin_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml admin_edit_user @@ -349,54 +349,54 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/mobile/admin_contact_mobile_unlink.xhtml - admin_show_cellphone - /admin/cellphone/admin_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml - /admin/cellphone/admin_cellphone_list.xhtml + /admin/mobile/admin_mobile_list.xhtml - admin_show_cellphone - /admin/cellphone/admin_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml - /admin/cellphone/admin_cellphone_show.xhtml + /admin/mobile/admin_mobile_show.xhtml admin_show_mobile_provider /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/mobile/admin_contact_mobile_unlink.xhtml admin_show_contact @@ -426,7 +426,7 @@ - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + /admin/mobile/admin_contact_mobile_unlink.xhtml admin_show_contact /admin/contact/admin_contact_show.xhtml diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index d6e5faa5..8a96da7e 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -37,7 +37,7 @@

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl index 441ade25..76d703b0 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl @@ -8,10 +8,10 @@ - + - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl index 7ed9c25e..96ccac25 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl @@ -5,43 +5,43 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - + - + - + - + - + - + - - + + - + - + - +
- +
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl index 925188ce..098677e9 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl @@ -5,13 +5,13 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
  • - + @@ -19,7 +19,7 @@
  • - + @@ -27,7 +27,7 @@
  • - + @@ -36,7 +36,7 @@
  • - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl index 18aa1b11..359d8239 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_form_add_contact_cellphone.tpl @@ -7,10 +7,10 @@ - +
    - +
    @@ -19,25 +19,25 @@
    - +
    - +
    - +
    - +
    @@ -49,7 +49,7 @@
    - +
    diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl index 8d74ca1e..9a46cc1e 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl @@ -5,21 +5,21 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
    - - + +
    - +
    - +
    @@ -27,11 +27,11 @@
    - +
    - + @@ -41,25 +41,25 @@
    - +
    - +
    - - + +
    - +
    diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl index f4721b79..a2d263cc 100644 --- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl @@ -230,7 +230,7 @@
    - +
    diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index d62243e9..5d2d3fe9 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -246,7 +246,7 @@
    - +
    diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl index 16967867..b515e622 100644 --- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl +++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl @@ -6,14 +6,14 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - - + + diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml index 1464fc11..b4ebca22 100644 --- a/web/admin/cellphone/admin_cellphone_delete.xhtml +++ b/web/admin/cellphone/admin_cellphone_delete.xhtml @@ -12,37 +12,37 @@ - #{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE} + #{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE} - #{msg.CONTENT_TITLE_ADMIN_DELETE_CELLPHONE} + #{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE} - +
    - +
    - +
    - +
    - +
    - +     diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml index 9c8fe9bf..e3ea118d 100644 --- a/web/admin/cellphone/admin_cellphone_edit.xhtml +++ b/web/admin/cellphone/admin_cellphone_edit.xhtml @@ -9,33 +9,33 @@ - + - #{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE} + #{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE} - #{msg.CONTENT_TITLE_ADMIN_EDIT_CELLPHONE} + #{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE} - +
    - #{msg.ADMIN_EDIT_CELLPHONE_TITLE} + #{msg.ADMIN_EDIT_MOBILE_TITLE}
    - +
    - +
    - +     diff --git a/web/admin/cellphone/admin_cellphone_list.xhtml b/web/admin/cellphone/admin_cellphone_list.xhtml index d9488d92..4026710a 100644 --- a/web/admin/cellphone/admin_cellphone_list.xhtml +++ b/web/admin/cellphone/admin_cellphone_list.xhtml @@ -8,66 +8,66 @@ > - #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE} + #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE} - #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE} + #{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE} - + - + - - - + + + - + - - + + - + - + - + - + - + - + - + diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml index b88d2a4b..8432db6a 100644 --- a/web/admin/cellphone/admin_cellphone_show.xhtml +++ b/web/admin/cellphone/admin_cellphone_show.xhtml @@ -12,20 +12,20 @@ - #{msg.PAGE_TITLE_ADMIN_SHOW_CELLPHONE} + #{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE} - #{msg.CONTENT_TITLE_ADMIN_SHOW_CELLPHONE} + #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE} - + - + - + @@ -72,12 +72,12 @@ - +
    • - + diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml index 4e15c78d..e2860782 100644 --- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml @@ -13,17 +13,17 @@ - #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} + #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE} - #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} + #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE} - +
      - +
      @@ -38,23 +38,23 @@
      - +
      - +
      - + - + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 4de001b8..5421c06f 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -120,7 +120,7 @@ - + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 4b3ecb30..fc7b3abe 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -29,7 +29,7 @@
    - +
    diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 41ea92d3..f9bc117d 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -138,7 +138,7 @@ - + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index b6ecdace..414215b1 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -184,7 +184,7 @@
    - +
    -- 2.39.5