From: Roland Häder Date: Tue, 23 Aug 2016 10:16:21 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3d45e45cceb8a61466d21670490c0676405d442a;p=jjobs-war.git Please cherry-pick: - edit/delete(Fax|LandLine|Mobile)Data() must have the phone number being handled over as a parameter - the instance in beanHelper is null on POST (-back) - setting onPostback="true" overrides the set value (from JSF page) - so it needs to be as a parameter --- diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 22ae9972..596d0a3e 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -212,74 +212,77 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements } @Override - public String deleteMobileData () { + public String deleteMobileData (final DialableMobileNumber mobileNumber) { + // Log message + System.out.println(MessageFormat.format("{0}.deleteMobileData: mobileNumber={1} - CALLED!", this.getClass().getSimpleName(), mobileNumber)); //NOI18N + // Is all data set - if (this.beanHelper.getMobileNumber() == null) { + if (mobileNumber == null) { // Not set, throw NPE - throw new NullPointerException("this.beanHelper.mobileNumber is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getPhoneId() == null) { + throw new NullPointerException("mobileNumber is null"); //NOI18N + } else if (mobileNumber.getPhoneId() == null) { // Throw NPE again - throw new NullPointerException("this.beanHelper.mobileNumber.phoneId is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getPhoneId() < 1) { + throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N + } else if (mobileNumber.getPhoneId() < 1) { // Invalid number - 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 new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N + } else if (mobileNumber.getMobileProvider() == null) { // Throw NPE - throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() == null) { + throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N + } else if (mobileNumber.getMobileProvider().getProviderId() == null) { // ... throw again - throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider.providerId is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() < 1) { + throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N + } else if (mobileNumber.getMobileProvider().getProviderId() < 1) { // Id not valid - 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 new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N + } else if (mobileNumber.getPhoneNumber() == null) { // Throw NPE again - throw new NullPointerException("this.beanHelper.mobileNumber.phoneNumber is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getPhoneNumber() < 1) { + throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N + } else if (mobileNumber.getPhoneNumber() < 1) { // Throw NPE again - throw new NullPointerException(MessageFormat.format("this.beanHelper.mobileNumber.phoneNumber={0} is not valid.", this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N + throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N } // Call EJB - this.adminPhoneBean.deleteMobileData(this.beanHelper.getMobileNumber()); + this.adminPhoneBean.deleteMobileData(mobileNumber); // Fire event - this.mobileNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(this.beanHelper.getMobileNumber())); + this.mobileNumberDeletedEvent.fire(new AdminMobileNumberDeletedEvent(mobileNumber)); // All fine, redirect return "admin_list_mobile"; //NOI18N } @Override - public String editMobileData () { + public String editMobileData (final DialableMobileNumber mobileNumber) { // Log message - System.out.println(MessageFormat.format("{0}.editMobileData: CALLED!", this.getClass().getSimpleName())); //NOI18N + System.out.println(MessageFormat.format("{0}.editMobileData: mobileNumber={1} - CALLED!", this.getClass().getSimpleName(), mobileNumber)); //NOI18N // Is all data set - if (this.beanHelper.getMobileNumber() == null) { + if (mobileNumber == null) { // Not set, throw NPE - throw new NullPointerException("this.beanHelper.mobileNumber is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getPhoneId() == null) { + throw new NullPointerException("mobileNumber is null"); //NOI18N + } else if (mobileNumber.getPhoneId() == null) { // Throw NPE again - throw new NullPointerException("this.beanHelper.mobileNumber.phoneId is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getPhoneId() < 1) { + throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N + } else if (mobileNumber.getPhoneId() < 1) { // Invalid number - 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 new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N + } else if (mobileNumber.getMobileProvider() == null) { // Throw NPE - throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() == null) { + throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N + } else if (mobileNumber.getMobileProvider().getProviderId() == null) { // ... throw again - throw new NullPointerException("this.beanHelper.mobileNumber.mobileProvider.providerId is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getMobileProvider().getProviderId() < 1) { + throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N + } else if (mobileNumber.getMobileProvider().getProviderId() < 1) { // Id not valid - 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 new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N + } else if (mobileNumber.getPhoneNumber() == null) { // Throw NPE again - throw new NullPointerException("this.beanHelper.mobileNumber.phoneNumber is null"); //NOI18N - } else if (this.beanHelper.getMobileNumber().getPhoneNumber() < 1) { + throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N + } else if (mobileNumber.getPhoneNumber() < 1) { // Throw NPE again - throw new NullPointerException(MessageFormat.format("this.beanHelper.mobileNumber.phoneNumber={0} is not valid.", this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N + throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N } else if (this.getMobileProvider() == null) { // Not provided this.showFacesMessage("form_edit_mobile:mobileProvider", "ERROR_ADMIN_NO_MOBILE_PROVIDER_SELECTED"); //NOI18N @@ -297,10 +300,10 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements } // Log message - System.out.println(MessageFormat.format("{0}.editMobileData: this.mobileProvider.providerId={1},this.beanHelper.mobileNumber.mobileProvider.providerId={2},this.phoneNumber={3},this.beanHelper.mobileNumber.phoneNumber={4}", this.getClass().getSimpleName(), this.getMobileProvider().getProviderId(), this.beanHelper.getMobileNumber().getMobileProvider().getProviderId(), this.getPhoneNumber(), this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N + System.out.println(MessageFormat.format("{0}.editMobileData: this.mobileProvider.providerId={1},mobileNumber.mobileProvider.providerId={2},this.phoneNumber={3},mobileNumber.phoneNumber={4}", this.getClass().getSimpleName(), this.getMobileProvider().getProviderId(), mobileNumber.getMobileProvider().getProviderId(), this.getPhoneNumber(), mobileNumber.getPhoneNumber())); //NOI18N // Is the mobile provider and number the same? - if ((Objects.equals(this.getMobileProvider(), this.beanHelper.getMobileNumber().getMobileProvider())) && (Objects.equals(this.getPhoneNumber(), this.beanHelper.getMobileNumber().getPhoneNumber()))) { + if ((Objects.equals(this.getMobileProvider(), mobileNumber.getMobileProvider())) && (Objects.equals(this.getPhoneNumber(), mobileNumber.getPhoneNumber()))) { // Log message System.out.println(MessageFormat.format("{0}.editMobileData: No difference - EXIT!", this.getClass().getSimpleName())); //NOI18N @@ -312,11 +315,11 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements } // Set all data - this.beanHelper.getMobileNumber().setMobileProvider(this.getMobileProvider()); - this.beanHelper.getMobileNumber().setPhoneNumber(this.getPhoneNumber()); + mobileNumber.setMobileProvider(this.getMobileProvider()); + mobileNumber.setPhoneNumber(this.getPhoneNumber()); // Send to bean - DialableMobileNumber updatedNumber = this.adminPhoneBean.updateMobileData(this.beanHelper.getMobileNumber()); + DialableMobileNumber updatedNumber = this.adminPhoneBean.updateMobileData(mobileNumber); // Fire event this.mobileNumberUpdatedEvent.fire(new AdminMobileNumberUpdatedEvent(updatedNumber)); diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java index 278b72e9..436a48d1 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java @@ -58,16 +58,20 @@ public interface JobsAdminPhoneWebRequestController extends Serializable { /** * Deletes given mobile entry data *

+ * @param mobileNumber Mobile number to delete + *

* @return Redirect outcome */ - String deleteMobileData (); + String deleteMobileData (final DialableMobileNumber mobileNumber); /** * Changes mobile entry data *

+ * @param mobileNumber Mobile number to change data + *

* @return Redirect outcome */ - String editMobileData (); + String editMobileData (final DialableMobileNumber mobileNumber); /** * Getter for mobile provider diff --git a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java index 2b948d29..0fcf0e6a 100644 --- a/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java +++ b/src/java/org/mxchange/jjobs/validator/booleans/JobsUserProfileVisibilityValidator.java @@ -16,7 +16,6 @@ */ package org.mxchange.jjobs.validator.booleans; -import java.text.MessageFormat; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; @@ -39,20 +38,11 @@ public class JobsUserProfileVisibilityValidator extends BaseBooleanValidator imp @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { - // Log message - System.out.println(MessageFormat.format("{0}.validate: context={1},component={2},value={3} - CALLED!", this.getClass().getSimpleName(), context, component, value)); - // The required field String[] requiredFields = {"landLineAreaCode", "landLineNumber", "faxAreaCode", "faxNumber", "mobileNumber"}; //NOI18N - // Log message - System.out.println(MessageFormat.format("{0}.validate: component.clientId={1}", this.getClass().getSimpleName(), component.getClientId())); - // Pre-validation (example: not null, not a string, empty string ...) super.preValidate(context, component, value, requiredFields, true); - - // Log message - System.out.println(MessageFormat.format("{0}.validate: EXIT!", this.getClass().getSimpleName())); } } diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml index 508a6ff0..d16f4886 100644 --- a/web/admin/fax/admin_fax_delete.xhtml +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -41,7 +41,7 @@

- +
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index a15bc787..e9947aba 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -36,7 +36,7 @@
- +
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index f0079984..193d26b7 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -41,7 +41,7 @@
- +
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 6a25bc4c..0cd4560e 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -36,7 +36,7 @@
- +
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index 7f0d5b90..401efee6 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -41,7 +41,7 @@
- +
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index b2ff95dd..f8062a1f 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -36,7 +36,7 @@
- +