From 6c3e5918585935401027ae3e78ad6b6542a6a8f3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 26 Aug 2017 23:28:20 +0200
Subject: [PATCH] Don't cherry-pick: - renamed to Addressbook namespace + fixed
 wrong class usage
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../AddressbookCompanyHeadquartersConverter.java}    | 12 ++++++------
 .../basicdata/FinancialsCompanyNameValidator.java    |  2 +-
 .../AddressbookEmailAddressValidator.java            |  2 +-
 .../validator/url/AddressbookUrlValidator.java}      |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename src/java/org/mxchange/{jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java => addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java} (83%)
 rename src/java/org/mxchange/{jfinancials => addressbook}/validator/business/basicdata/FinancialsCompanyNameValidator.java (98%)
 rename src/java/org/mxchange/{jjobs/validator/url/JobsUrlValidator.java => addressbook/validator/url/AddressbookUrlValidator.java} (95%)

diff --git a/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java b/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java
similarity index 83%
rename from src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
rename to src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java
index bf3d0a52..22ffa828 100644
--- a/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jjobs.converter.business.headquarters;
+package org.mxchange.addressbook.converter.business.headquarters;
 
 import java.text.MessageFormat;
 import javax.faces.component.UIComponent;
@@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CompanyHeadquartersConverter")
-public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersData> {
+public class AddressbookCompanyHeadquartersConverter implements Converter<HeadquartersData> {
 
 	/**
 	 * CompanyEmployee EJB
@@ -45,7 +45,7 @@ public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersD
 	/**
 	 * Default constructor
 	 */
-	public JobsCompanyHeadquartersConverter () {
+	public AddressbookCompanyHeadquartersConverter () {
 	}
 
 	@Override
@@ -61,14 +61,14 @@ public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersD
 
 		// Is the bean there?
 		// @TODO Requires this synchronization or is it (sync) confusing the container?
-		if (null == JobsCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN) {
+		if (null == AddressbookCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN) {
 			// Try to get it
 			try {
 				// Get initial context
 				Context initialContext = new InitialContext();
 
 				// ... and user controller
-				JobsCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initialContext.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersSessionBeanRemote"); //NOI18N
+				AddressbookCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initialContext.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersSessionBeanRemote"); //NOI18N
 			} catch (final NamingException ex) {
 				// Continue to throw it
 				throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -83,7 +83,7 @@ public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersD
 			Long headquartersId = Long.valueOf(submittedValue);
 
 			// Try to get user instance from it
-			companyHeadquarters = JobsCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN.findCompanyHeadquartersById(headquartersId);
+			companyHeadquarters = AddressbookCompanyHeadquartersConverter.COMPANY_HEADQUARTERS_BEAN.findCompanyHeadquartersById(headquartersId);
 		} catch (final NumberFormatException ex) {
 			// Throw again
 			throw new ConverterException(ex);
diff --git a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java b/src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java
similarity index 98%
rename from src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
rename to src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java
index b67bc4d9..4943b513 100644
--- a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jfinancials.validator.business.basicdata;
+package org.mxchange.addressbook.validator.business.basicdata;
 
 import java.text.MessageFormat;
 import javax.faces.application.FacesMessage;
diff --git a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index 62ac246b..d5d2b452 100644
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -50,7 +50,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator {
 	/**
 	 * Pattern matcher
 	 */
-	private static final Pattern PATTERN_MATCHER = Pattern.compile(JobsEmailAddressValidator.EMAIL_REGEX);
+	private static final Pattern PATTERN_MATCHER = Pattern.compile(AddressbookEmailAddressValidator.EMAIL_REGEX);
 
 	/**
 	 * Serial number
diff --git a/src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java b/src/java/org/mxchange/addressbook/validator/url/AddressbookUrlValidator.java
similarity index 95%
rename from src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java
rename to src/java/org/mxchange/addressbook/validator/url/AddressbookUrlValidator.java
index e2be8435..43b9daab 100644
--- a/src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/url/AddressbookUrlValidator.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jjobs.validator.url;
+package org.mxchange.addressbook.validator.url;
 
 import java.text.MessageFormat;
 import java.util.regex.Pattern;
@@ -32,12 +32,12 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UrlValidator")
-public class JobsUrlValidator extends BaseStringValidator {
+public class AddressbookUrlValidator extends BaseStringValidator {
 
 	/**
 	 * Pattern matcher
 	 */
-	private static final Pattern PATTERN_MATCHER = Pattern.compile(JobsUrlValidator.URL_REGEX);
+	private static final Pattern PATTERN_MATCHER = Pattern.compile(AddressbookUrlValidator.URL_REGEX);
 
 	/**
 	 * Email pattern
@@ -52,7 +52,7 @@ public class JobsUrlValidator extends BaseStringValidator {
 	/**
 	 * Default constructor
 	 */
-	public JobsUrlValidator () {
+	public AddressbookUrlValidator () {
 	}
 
 	@Override
-- 
2.39.5