/*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2020 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;
/**
* Deletes given fax entry data
* <p>
- * @return Redirect outcome
*/
- public String deleteFaxData () {
+ public void deleteFaxData () {
// Get fax number from bean helper
DialableFaxNumber number = this.createFaxNumber();
// Fire event
this.faxNumberDeletedEvent.fire(new AdminFaxNumberDeletedEvent(number));
-
- // All fine, redirect
- return "admin_list_fax"; //NOI18N
}
/**
* Deletes given land-line entry data
- * <p>
- * @return Redirect outcome
*/
- public String deleteLandLineData () {
+ public void deleteLandLineData () {
// Get land-line number from helper
DialableLandLineNumber number = this.createLandLineNumber();
// Fire event
this.landLineNumberDeletedEvent.fire(new AdminLandLineNumberDeletedEvent(number));
-
- // All fine, redirect
- return "admin_list_landline"; //NOI18N
}
/**
* Deletes given mobile entry data
- * <p>
- * @return Redirect outcome
*/
- public String deleteMobileData () {
+ public void deleteMobileData () {
// Get mobile number from helper
DialableMobileNumber number = this.createMobileNumber();
// Fire event
this.mobileNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(number));
-
- // All fine, redirect
- return "admin_list_mobile"; //NOI18N
}
/**
// 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
// 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
// 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
+ // Throw NPE again
+ throw new NullPointerException("this.mobileProvider is null"); //NOI18N
} else if (this.getMobileProvider().getProviderId() == null) {
// Throw NPE again ...
throw new NullPointerException("this.mobileProvider.providerId is null"); //NOI18N
// 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
+ // Throw NPE
+ throw new NullPointerException("this.phoneNumber is null"); //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
+ this.showFacesMessage("form_edit_mobile:mobileNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED", FacesMessage.SEVERITY_WARN); //NOI18N
// No difference in both together, no need to edit
return ""; //NOI18N