Please cherry-pick:

- also these need to be changed/fixed to proper form field names

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 883ba286ada19c50bbbdf6671d033a2b93897644..05d73f05203bc48e188ce1cd692291ccc2393a7b 100644 (file)
--- 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 9fff261f5ddec1dabad92b511ef65f80a2cb438e..deb6e04318849c8958a9a6380eac5a9e9b537969 100644 (file)
--- 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 976aa0ee7b8716a4c620c32c71176f383948ac40..279d2d5123e274868a32b9e49798f5e84e965e77 100644 (file)
--- 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 ccc98fc32e44af08f044da72d1375614851e5abd..bb84fe1f7d27cadf16d192331a0c007f6ad07745 100644 (file)
--- 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