From: Roland Häder <roland@mxchange.org>
Date: Sun, 2 Oct 2022 13:53:14 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd0f3fc0a7cb430f317f71598993691b6ee64f91;p=jjobs-war.git

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 aec9e121..0967f56d 100644
--- 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 f9c911a6..79522ecd 100644
--- 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 e236b756..fbe1ddbc 100644
--- 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 cda7086a..a9c5ef78 100644
--- 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