Please cherry-pick:

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

diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java
index aec9e121e5c5b84116260fcd5c81f5bc1f773b48..0967f56d9a920cf4a3c1bc6faba4ca09af53125a 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java
@@ -109,13 +109,13 @@ public class JobsBasicDataEmailAddressValidator extends BaseStringValidator {
                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/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java
index f9c911a6798ada1c152a6a61b7d15507ef37f6d4..79522ecd603e62fd825bec59ef92897e7ad72e82 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java
@@ -106,13 +106,13 @@ public class JobsBranchOfficeEmailAddressValidator extends BaseStringValidator {
                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/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java
index e236b7564345b7b92605ef4879c3af31fbccaeff..fbe1ddbc9ca745acd97e95637c74845bef24575b 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java
@@ -109,13 +109,13 @@ public class JobsEmployeeEmailAddressValidator 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/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java
index cda7086a8dc1e69fe37c883b01aa008322e54ec2..a9c5ef781f2da0961a796b4b9dbe122f4a7ccf07 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java
@@ -109,13 +109,13 @@ public class JobsHeadquarterEmailAddressValidator extends BaseStringValidator {
                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