From af8f776988f1d7276d044285cfcd8c6efe027318 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 2 Oct 2022 15:53:14 +0200 Subject: [PATCH] Please cherry-pick: - also these need to be changed/fixed to proper form field names --- .../basicdata/FinancialsBasicDataEmailAddressValidator.java | 4 ++-- .../FinancialsBranchOfficeEmailAddressValidator.java | 4 ++-- .../employee/FinancialsEmployeeEmailAddressValidator.java | 4 ++-- .../FinancialsHeadquarterEmailAddressValidator.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/basicdata/FinancialsBasicDataEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/basicdata/FinancialsBasicDataEmailAddressValidator.java index 883ba286..05d73f05 100644 --- a/src/java/org/mxchange/jfinancials/validator/emailaddress/basicdata/FinancialsBasicDataEmailAddressValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/basicdata/FinancialsBasicDataEmailAddressValidator.java @@ -109,13 +109,13 @@ public class FinancialsBasicDataEmailAddressValidator extends BaseStringValidato final Boolean isRegistered = BASIC_DATA_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress); // Is the email address already registered? - if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N + if ((!clientId.endsWith("companyEmailAddress")) && (isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N // No, then abort here throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message)); - } else if ((clientId.endsWith("resendEmailAddress")) && (!isRegistered)) { //NOI18N + } else if ((clientId.endsWith("companyEmailAddress")) && (!isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/branchoffice/FinancialsBranchOfficeEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/branchoffice/FinancialsBranchOfficeEmailAddressValidator.java index 9fff261f..deb6e043 100644 --- a/src/java/org/mxchange/jfinancials/validator/emailaddress/branchoffice/FinancialsBranchOfficeEmailAddressValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/branchoffice/FinancialsBranchOfficeEmailAddressValidator.java @@ -106,13 +106,13 @@ public class FinancialsBranchOfficeEmailAddressValidator extends BaseStringValid final Boolean isRegistered = BRANCH_OFFICE_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress); // Is the email address already registered? - if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N + if ((!clientId.endsWith("branchEmailAddress")) && (isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N // No, then abort here throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message)); - } else if ((clientId.endsWith("resendEmailAddress")) && (!isRegistered)) { //NOI18N + } else if ((clientId.endsWith("branchEmailAddress")) && (!isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/employee/FinancialsEmployeeEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/employee/FinancialsEmployeeEmailAddressValidator.java index 976aa0ee..279d2d51 100644 --- a/src/java/org/mxchange/jfinancials/validator/emailaddress/employee/FinancialsEmployeeEmailAddressValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/employee/FinancialsEmployeeEmailAddressValidator.java @@ -109,13 +109,13 @@ public class FinancialsEmployeeEmailAddressValidator extends BaseStringValidator final Boolean isRegistered = EMPLOYEE_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress); // Is the email address already registered? - if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N + if ((!clientId.endsWith("employeeEmailAddress")) && (isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N // No, then abort here throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message)); - } else if ((clientId.endsWith("resendEmailAddress")) && (!isRegistered)) { //NOI18N + } else if ((clientId.endsWith("employeeEmailAddress")) && (!isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/headquarter/FinancialsHeadquarterEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/headquarter/FinancialsHeadquarterEmailAddressValidator.java index ccc98fc3..bb84fe1f 100644 --- a/src/java/org/mxchange/jfinancials/validator/emailaddress/headquarter/FinancialsHeadquarterEmailAddressValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/headquarter/FinancialsHeadquarterEmailAddressValidator.java @@ -109,13 +109,13 @@ public class FinancialsHeadquarterEmailAddressValidator extends BaseStringValida final Boolean isRegistered = HEADQUARTER_LIST_CONTROLLER.isEmailAddressRegistered(emailAddress); // Is the email address already registered? - if ((!clientId.endsWith("resendEmailAddress")) && (isRegistered)) { //NOI18N + if ((!clientId.endsWith("headquarterEmailAddress")) && (isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N // No, then abort here throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message)); - } else if ((clientId.endsWith("resendEmailAddress")) && (!isRegistered)) { //NOI18N + } else if ((clientId.endsWith("headquarterEmailAddress")) && (!isRegistered)) { //NOI18N // Generate message final String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N -- 2.39.5