/*
- * Copyright (C) 2016 - 2018 Free Software Foundation
+ * Copyright (C) 2016 - 2022 Free Software Foundation
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
import javax.enterprise.event.Event;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Any;
+import javax.faces.application.FacesMessage;
import javax.inject.Inject;
import javax.inject.Named;
import org.mxchange.jcountry.model.data.Country;
import org.mxchange.jfinancials.beans.BaseFinancialsBean;
+import org.mxchange.jfinancials.beans.phone.list.FinancialsPhoneListWebViewController;
import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent;
import org.mxchange.jphone.events.fax.deleted.AdminFaxNumberDeletedEvent;
import org.mxchange.jphone.events.landline.removed.AdminRemoveLandLineNumberFromListEvent;
import org.mxchange.jphone.events.landline.updated.AdminLandLineNumberUpdatedEvent;
import org.mxchange.jphone.events.landline.updated.AdminUpdatedLandLineNumberEvent;
-import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
-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.model.phonenumbers.fax.DialableFaxNumber;
import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber;
import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber;
-import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
-import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber;
-import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote;
/**
@Any
private Event<AdminUpdatedLandLineNumberEvent> landLineNumberUpdatedEvent;
- /**
- * Chosen mobile number
- */
- private DialableMobileNumber mobileNumber;
-
- /**
- * Event being fired when an administrator has deleted mobile number
- */
- @Inject
- @Any
- private Event<AdminDeletedMobileNumberEvent> mobileNumberDeletedEvent;
-
- /**
- * Event being fired when an administrator has updated land-line number
- */
- @Inject
- @Any
- private Event<AdminUpdatedMobileNumberEvent> mobileNumberUpdatedEvent;
-
- /**
- * Mobile provider
- */
- private MobileProvider mobileProvider;
-
/**
* Area code (city dial prefix)
*/
private Integer phoneAreaCode;
- /**
- * Generic hone controller
- */
- @Inject
- private FinancialsPhoneWebRequestController phoneController;
-
/**
* Country (for dial prefix)
*/
*/
private Long phoneId;
+ /**
+ * Generic hone controller
+ */
+ @Inject
+ private FinancialsPhoneListWebViewController phoneListController;
+
/**
* Phone number
*/
/**
* Observes events being fired when a bean helper has successfully created a
- * fax number instance.
+ * land-line number instance.
* <p>
* @param event Event being fired
*/
throw new NullPointerException("event is null"); //NOI18N
} else if (event.getFaxNumber() == null) {
// Throw NPE again
- throw new NullPointerException("event.faxNumber is null"); //NOI18N
+ throw new NullPointerException("event.landLineNumber is null"); //NOI18N
} else if (event.getFaxNumber().getPhoneId() == null) {
// Throw NPE yet again
- throw new NullPointerException("event.faxNumber.phoneId is null"); //NOI18N
+ throw new NullPointerException("event.landLineNumber.phoneId is null"); //NOI18N
} else if (event.getFaxNumber().getPhoneId() < 1) {
// Throw NPE yet again
- throw new NullPointerException(MessageFormat.format("event.faxNumber.phoneId={0} is invalid", event.getFaxNumber().getPhoneId())); //NOI18N
+ throw new NullPointerException(MessageFormat.format("event.landLineNumber.phoneId={0} is invalid", event.getFaxNumber().getPhoneId())); //NOI18N
}
// Get fax number from event
- DialableFaxNumber number = event.getFaxNumber();
+ final DialableFaxNumber number = event.getFaxNumber();
// Copy all data to this bean
this.setPhoneId(number.getPhoneId());
}
// Get fax number from event
- DialableLandLineNumber number = event.getLandLineNumber();
+ final DialableLandLineNumber number = event.getLandLineNumber();
// Copy all data to this bean
this.setPhoneId(number.getPhoneId());
this.setPhoneEntryUpdated(number.getPhoneEntryUpdated());
}
- /**
- * Observes events being fired when a bean helper has successfully created a
- * mobile number instance.
- * <p>
- * @param event Event being fired
- */
- public void afterCreatedMobileNumberEvent (@Observes final ObservableCreatedMobileNumberEvent event) {
- // The event instance must be valid
- if (null == event) {
- // Throw NPE
- throw new NullPointerException("event is null"); //NOI18N
- } else if (event.getMobileNumber() == null) {
- // Throw NPE again
- throw new NullPointerException("event.mobileNumber is null"); //NOI18N
- } else if (event.getMobileNumber().getPhoneId() == null) {
- // Throw NPE yet again
- throw new NullPointerException("event.mobileNumber.phoneId is null"); //NOI18N
- } else if (event.getMobileNumber().getPhoneId() < 1) {
- // Throw NPE yet again
- throw new NullPointerException(MessageFormat.format("event.mobileNumber.phoneId={0} is invalid", event.getMobileNumber().getPhoneId())); //NOI18N
- }
-
- // Get fax number from event
- DialableMobileNumber number = event.getMobileNumber();
-
- // Copy all data to this bean
- this.setPhoneId(number.getPhoneId());
- this.setMobileProvider(number.getMobileProvider());
- this.setPhoneNumber(number.getPhoneNumber());
- this.setPhoneEntryCreated(number.getPhoneEntryCreated());
- this.setPhoneEntryUpdated(number.getPhoneEntryUpdated());
- }
-
/**
* Returns a list of all unused ("non-linked") land-line numbers
* <p>
*/
public List<DialableFaxNumber> allNonLinkedFaxNumbers () {
// Get list of all mobile numbers
- List<DialableFaxNumber> list = this.phoneController.allFaxNumbers();
+ final List<DialableFaxNumber> numbers = this.phoneListController.getAllFaxNumbers();
// Visit all controllers to reduce the list
- this.removeLinkedFaxNumbersEvent.fire(new AdminFaxNumberRemovedFromListEvent(list));
+ this.removeLinkedFaxNumbersEvent.fire(new AdminFaxNumberRemovedFromListEvent(numbers));
// Return it
- return list;
+ return numbers;
}
/**
*/
public List<DialableLandLineNumber> allNonLinkedLandLineNumbers () {
// Get list of all mobile numbers
- List<DialableLandLineNumber> list = this.phoneController.allLandLineNumbers();
+ final List<DialableLandLineNumber> numbers = this.phoneListController.getAllLandLineNumbers();
// Visit all controllers to reduce the list
- this.removeLinkedLandLineNumbersEvent.fire(new AdminLandLineNumberRemovedFromListEvent(list));
+ this.removeLinkedLandLineNumbersEvent.fire(new AdminLandLineNumberRemovedFromListEvent(numbers));
// Return it
- return list;
- }
-
- /**
- * Returns a list of all unused ("non-linked") mobile numbers
- * <p>
- * @return List with all unused mobile numbers
- */
- public List<DialableMobileNumber> allNonLinkedMobileNumbers () {
- // Get list of all mobile numbers
- List<DialableMobileNumber> list = this.phoneController.allMobileNumbers();
-
- // Visit all controllers to reduce the list
- this.removeLinkedMobileNumbersEvent.fire(new AdminMobileNumberRemovedFromListEvent(list));
-
- // Return it
- return list;
+ return numbers;
}
/**
*/
public void deleteFaxData () {
// Get fax number from bean helper
- DialableFaxNumber number = this.createFaxNumber();
+ final DialableFaxNumber number = this.createFaxNumber();
// Is all data set
if (number == null) {
*/
public void deleteLandLineData () {
// Get land-line number from helper
- DialableLandLineNumber number = this.createLandLineNumber();
+ final DialableLandLineNumber number = this.createLandLineNumber();
// Is all data set
if (number == null) {
this.landLineNumberDeletedEvent.fire(new AdminLandLineNumberDeletedEvent(number));
}
- /**
- * Deletes given mobile entry data
- */
- public void deleteMobileData () {
- // Get mobile number from helper
- DialableMobileNumber number = this.createMobileNumber();
-
- // Is all data set
- if (number == null) {
- // Not set, throw NPE
- throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (number.getPhoneId() == null) {
- // Throw NPE again
- throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
- } else if (number.getPhoneId() < 1) {
- // Invalid number
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", number.getPhoneId())); //NOI18N
- } else if (number.getMobileProvider() == null) {
- // Throw NPE
- throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
- } else if (number.getMobileProvider().getProviderId() == null) {
- // ... throw again
- throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N
- } else if (number.getMobileProvider().getProviderId() < 1) {
- // Id not valid
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", number.getMobileProvider().getProviderId())); //NOI18N
- } else if (number.getPhoneNumber() == null) {
- // Throw NPE again
- throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
- } else if (number.getPhoneNumber() < 1) {
- // Throw NPE again
- throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", number.getPhoneNumber())); //NOI18N
- }
-
- // Call EJB
- this.adminPhoneBean.deleteMobileData(number);
-
- // Fire event
- this.mobileNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(number));
- }
-
/**
* Changes fax entry data
* <p>
*/
public String doChangeFaxNumber () {
// Get fax number from bean helper
- DialableFaxNumber number = this.createFaxNumber();
+ final DialableFaxNumber number = this.createFaxNumber();
// Is all data set
if (number == null) {
// Is the mobile provider and number the same?
if ((Objects.equals(this.getPhoneCountry(), number.getPhoneCountry())) && (Objects.equals(this.getPhoneAreaCode(), number.getPhoneAreaCode())) && (Objects.equals(this.getPhoneNumber(), number.getPhoneNumber()))) {
// Show message
- this.showFacesMessage("form_edit_fax:faxNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED"); //NOI18N
+ this.showFacesMessage("form_edit_fax:faxNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED", FacesMessage.SEVERITY_WARN); //NOI18N
// No difference in both together, no need to edit
return ""; //NOI18N
number.setPhoneNumber(this.getPhoneNumber());
// Send to bean
- DialableFaxNumber updatedNumber = this.adminPhoneBean.updateFaxData(number);
+ final DialableFaxNumber updatedNumber = this.adminPhoneBean.updateFaxData(number);
// Fire event
this.faxNumberUpdatedEvent.fire(new AdminFaxNumberUpdatedEvent(updatedNumber));
*/
public String doChangeLandLineNumber () {
// Get land-line number from helper
- DialableLandLineNumber number = this.createLandLineNumber();
+ final DialableLandLineNumber number = this.createLandLineNumber();
// Is all data set
if (number == null) {
// Is the mobile provider and number the same?
if ((Objects.equals(this.getPhoneCountry(), number.getPhoneCountry())) && (Objects.equals(this.getPhoneAreaCode(), number.getPhoneAreaCode())) && (Objects.equals(this.getPhoneNumber(), number.getPhoneNumber()))) {
// Show message
- this.showFacesMessage("form_edit_landline:landLineNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED"); //NOI18N
+ this.showFacesMessage("form_edit_landline:landLineNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED", FacesMessage.SEVERITY_WARN); //NOI18N
// No difference in both together, no need to edit
return ""; //NOI18N
number.setPhoneNumber(this.getPhoneNumber());
// Send to bean
- DialableLandLineNumber updatedNumber = this.adminPhoneBean.updateLandLineData(number);
+ final DialableLandLineNumber updatedNumber = this.adminPhoneBean.updateLandLineData(number);
// Fire event
this.landLineNumberUpdatedEvent.fire(new AdminLandLineNumberUpdatedEvent(updatedNumber));
return "admin_show_landline"; //NOI18N
}
- /**
- * Changes mobile entry data
- * <p>
- * @return Redirect outcome
- */
- public String doUpdateMobileNumber () {
- // Get mobile number from helper
- DialableMobileNumber number = this.createMobileNumber();
-
- // Is all data set
- if (number == null) {
- // Not set, throw NPE
- throw new NullPointerException("mobileNumber is null"); //NOI18N
- } else if (number.getPhoneId() == null) {
- // Throw NPE again
- throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
- } else if (number.getPhoneId() < 1) {
- // Invalid number
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", number.getPhoneId())); //NOI18N
- } else if (number.getMobileProvider() == null) {
- // Throw NPE
- throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
- } else if (number.getMobileProvider().getProviderId() == null) {
- // ... throw again
- throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N
- } else if (number.getMobileProvider().getProviderId() < 1) {
- // Id not valid
- throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", number.getMobileProvider().getProviderId())); //NOI18N
- } else if (number.getPhoneNumber() == null) {
- // Throw NPE again
- throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
- } else if (number.getPhoneNumber() < 1) {
- // Throw NPE again
- throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", number.getPhoneNumber())); //NOI18N
- } else if (this.getMobileProvider() == null) {
- // Not provided
- this.showFacesMessage("form_edit_mobile:mobileProvider", "ERROR_ADMIN_NO_MOBILE_PROVIDER_SELECTED"); //NOI18N
- return ""; //NOI18N
- } else if (this.getMobileProvider().getProviderId() == null) {
- // Throw NPE again ...
- throw new NullPointerException("this.mobileProvider.providerId is null"); //NOI18N
- } else if (this.getMobileProvider().getProviderId() < 0) {
- // Invalid id number
- 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_mobile:mobileNumber", "ERROR_ADMIN_EMPTY_MOBILE_NUMBER"); //NOI18N
- return ""; //NOI18N
- }
-
- // Is the mobile provider and number the same?
- if ((Objects.equals(this.getMobileProvider(), number.getMobileProvider())) && (Objects.equals(this.getPhoneNumber(), number.getPhoneNumber()))) {
- // Show message
- this.showFacesMessage("form_edit_mobile:mobileNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED"); //NOI18N
-
- // No difference in both together, no need to edit
- return ""; //NOI18N
- }
-
- // Set all data
- number.setMobileProvider(this.getMobileProvider());
- number.setPhoneNumber(this.getPhoneNumber());
-
- // Send to bean
- DialableMobileNumber updatedNumber = this.adminPhoneBean.updateMobileData(number);
-
- // Fire event
- this.mobileNumberUpdatedEvent.fire(new AdminMobileNumberUpdatedEvent(updatedNumber));
-
- // All fine, redirect
- return "admin_show_mobile"; //NOI18N
- }
-
/**
* Getter for chosen fax number
* <p>
this.landLineNumber = landLineNumber;
}
- /**
- * Getter for chosen mobile number
- * <p>
- * @return mobile number
- */
- public DialableMobileNumber getMobileNumber () {
- return this.mobileNumber;
- }
-
- /**
- * Setter for chosen mobile number
- * <p>
- * @param mobileNumber mobile number
- */
- public void setMobileNumber (final DialableMobileNumber mobileNumber) {
- this.mobileNumber = mobileNumber;
- }
-
- /**
- * Getter for mobile provider
- * <p>
- * @return Mobile provider
- */
- public MobileProvider getMobileProvider () {
- return this.mobileProvider;
- }
-
- /**
- * Setter for mobile provider
- * <p>
- * @param mobileProvider Mobile provider
- */
- public void setMobileProvider (final MobileProvider mobileProvider) {
- this.mobileProvider = mobileProvider;
- }
-
/**
* Getter for phone area code
* <p>
*/
private DialableFaxNumber createFaxNumber () {
// Initialize it
- DialableFaxNumber number = new FaxNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
+ final DialableFaxNumber number = new FaxNumber(
+ this.getPhoneCountry(),
+ this.getPhoneAreaCode(),
+ this.getPhoneNumber()
+ );
// Add all other data
number.setPhoneEntryCreated(this.getPhoneEntryCreated());
*/
private DialableLandLineNumber createLandLineNumber () {
// Initialize it
- DialableLandLineNumber number = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
-
- // Add all other data
- number.setPhoneEntryCreated(this.getPhoneEntryCreated());
- number.setPhoneEntryUpdated(this.getPhoneEntryUpdated());
-
- // Is id number set?
- if (this.getPhoneId() instanceof Long) {
- // Set it
- number.setPhoneId(this.getPhoneId());
- }
-
- // Return it
- return number;
- }
-
- /**
- * Returns an instance of a DialableMobileNumber from all fields stored in
- * this bean.
- * <p>
- * @return An instance of a DialableMobileNumber class
- */
- private DialableMobileNumber createMobileNumber () {
- // Initialize it
- DialableMobileNumber number = new MobileNumber(this.getMobileProvider(), this.getPhoneNumber());
+ final DialableLandLineNumber number = new LandLineNumber(
+ this.getPhoneCountry(),
+ this.getPhoneAreaCode(),
+ this.getPhoneNumber()
+ );
// Add all other data
number.setPhoneEntryCreated(this.getPhoneEntryCreated());
projects / jfinancials-war.git / blobdiff