import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.mxchange.jcountry.data.Country;
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.fax.removed.AdminFaxNumberRemovedFromListEvent;
+import org.mxchange.jphone.events.fax.removed.AdminRemoveFaxNumberFromListEvent;
+import org.mxchange.jphone.events.landline.removed.AdminLandLineNumberRemovedFromListEvent;
+import org.mxchange.jphone.events.landline.removed.AdminRemoveLandLineNumberFromListEvent;
+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.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.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote;
private JobsWebRequestController beanHelper;
/**
- * Event being fired when an administrator has deleted cell phone number
+ * Choosen land-line number
+ */
+ private DialableLandLineNumber choosenLandLineNumber;
+
+ /**
+ * Choosen mobile number
+ */
+ private DialableMobileNumber choosenMobileNumber;
+
+ /**
+ * (Entered) mobile number
+ */
+ private Long mobileNumber;
+
+ /**
+ * Event being fired when an administrator has deleted mobile number
*/
@Inject
@Any
- private Event<AdminDeletedCellphoneNumberEvent> cellPhoneNumberDeletedEvent;
+ private Event<AdminDeletedMobileNumberEvent> mobileNumberDeletedEvent;
/**
- * Event being fired when an administrator has updated cell phone number
+ * Event being fired when an administrator has updated mobile number
*/
@Inject
@Any
- private Event<AdminUpdatedCellphoneNumberEvent> cellPhoneNumberUpdatedEvent;
+ private Event<AdminUpdatedMobileNumberEvent> mobileNumberUpdatedEvent;
/**
- * Cell phone provider
+ * Mobile provider
*/
- private MobileProvider cellphoneProvider;
+ private MobileProvider mobileProvider;
/**
- * Cell phone number
+ * Area code (city dial prefix)
*/
- private DialableCellphoneNumber choosenCellphoneNumber;
+ private Long phoneAreaCode;
/**
* Generic hone controller
@Inject
private JobsPhoneWebApplicationController phoneController;
+ /**
+ * Country (for dial prefix)
+ */
+ private Country phoneCountry;
+
/**
* Phone number
*/
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 fax numbers is being
* created.
*/
- private Event<AdminRemoveCellphoneNumberFromListEvent> removeLinkedCellphoneNumbersEvent;
+ @Inject
+ @Any
+ private Event<AdminRemoveFaxNumberFromListEvent> removeLinkedFaxNumbersEvent;
+
+ /**
+ * Event being fired when a list of all unsed land-line numbers is being
+ * created.
+ */
+ @Inject
+ @Any
+ private Event<AdminRemoveLandLineNumberFromListEvent> removeLinkedLandLineNumbersEvent;
+
+ /**
+ * Event being fired when a list of all unsed mobile numbers is being
+ * created.
+ */
+ @Inject
+ @Any
+ private Event<AdminRemoveMobileNumberFromListEvent> removeLinkedMobileNumbersEvent;
/**
* Default constructor
Context context = new InitialContext();
// Try to lookup the beans
- this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N
+ this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminPhone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote"); //NOI18N
} catch (final NamingException e) {
// Throw it again
throw new FaceletException(e);
}
@Override
- public List<DialableCellphoneNumber> allNonLinkedCellphoneNumbers () {
- // Get list of all cell phone numbers
- List<DialableCellphoneNumber> list = this.phoneController.allCellphoneNumbers();
+ public List<DialableFaxNumber> allNonLinkedFaxNumbers () {
+ // Get list of all mobile numbers
+ List<DialableFaxNumber> list = this.phoneController.allFaxNumbers();
+
+ // Visit all controllers to reduce the list
+ this.removeLinkedFaxNumbersEvent.fire(new AdminFaxNumberRemovedFromListEvent(list));
+
+ // Return it
+ return list;
+ }
+
+ @Override
+ public List<DialableLandLineNumber> allNonLinkedLandLineNumbers () {
+ // Get list of all mobile numbers
+ List<DialableLandLineNumber> list = this.phoneController.allLandLineNumbers();
+
+ // Visit all controllers to reduce the list
+ this.removeLinkedLandLineNumbersEvent.fire(new AdminLandLineNumberRemovedFromListEvent(list));
+
+ // Return it
+ return list;
+ }
+
+ @Override
+ public List<DialableMobileNumber> allNonLinkedMobileNumbers () {
+ // Get list of all mobile numbers
+ List<DialableMobileNumber> list = this.phoneController.allMobileNumbers();
// Visit all controllers to reduce the list
- this.removeLinkedCellphoneNumbersEvent.fire(new AdminCellphoneNumberRemovedFromListEvent(list));
+ this.removeLinkedMobileNumbersEvent.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.mobileNumberDeletedEvent.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.mobileNumberUpdatedEvent.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 DialableLandLineNumber getChoosenLandLineNumber () {
+ return this.choosenLandLineNumber;
+ }
+
+ @Override
+ public void setChoosenLandLineNumber (final DialableLandLineNumber choosenLandLineNumber) {
+ this.choosenLandLineNumber = choosenLandLineNumber;
+ }
+
+ @Override
+ public DialableMobileNumber getChoosenMobileNumber () {
+ return this.choosenMobileNumber;
+ }
+
+ @Override
+ public void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber) {
+ this.choosenMobileNumber = choosenMobileNumber;
+ }
+
+ @Override
+ public Long getMobileNumber () {
+ return this.mobileNumber;
+ }
+
+ @Override
+ public void setMobileNumber (final Long mobileNumber) {
+ this.mobileNumber = mobileNumber;
+ }
+
+ @Override
+ public MobileProvider getMobileProvider () {
+ return this.mobileProvider;
+ }
+
+ @Override
+ public void setMobileProvider (final MobileProvider mobileProvider) {
+ this.mobileProvider = mobileProvider;
}
@Override
- public MobileProvider getCellphoneProvider () {
- return this.cellphoneProvider;
+ public Long getPhoneAreaCode () {
+ return this.phoneAreaCode;
}
@Override
- public void setCellphoneProvider (final MobileProvider cellphoneProvider) {
- this.cellphoneProvider = cellphoneProvider;
+ public void setPhoneAreaCode (final Long phoneAreaCode) {
+ this.phoneAreaCode = phoneAreaCode;
}
@Override
- public DialableCellphoneNumber getChoosenCellphoneNumber () {
- return this.choosenCellphoneNumber;
+ public Country getPhoneCountry () {
+ return this.phoneCountry;
}
@Override
- public void setChoosenCellphoneNumber (final DialableCellphoneNumber choosenCellphoneNumber) {
- this.choosenCellphoneNumber = choosenCellphoneNumber;
+ public void setPhoneCountry (final Country phoneCountry) {
+ this.phoneCountry = phoneCountry;
}
@Override
projects / jjobs-war.git / blobdiff