From: Roland Häder <roland@mxchange.org>
Date: Thu, 27 Apr 2017 12:30:22 +0000 (+0200)
Subject: ported project to new libraries jaddressbook-share-core/lib
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c248e3472c292ca5ea35a11745d37805337b57ac;p=jjobs-war.git

ported project to new libraries jaddressbook-share-core/lib

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
index 7bf277ac..8abb8ff4 100644
--- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
@@ -34,13 +34,13 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
-import org.mxchange.jaddressbookcore.events.addressbook.AddressbookLoadedEvent;
-import org.mxchange.jaddressbookcore.events.addressbook.ObservableAddressbookLoadedEvent;
-import org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException;
-import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
-import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
-import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook;
-import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
+import org.mxchange.jaddressbook.events.addressbook.AddressbookLoadedEvent;
+import org.mxchange.jaddressbook.events.addressbook.ObservableAddressbookLoadedEvent;
+import org.mxchange.jaddressbook.exceptions.AddressbookNameAlreadyUsedException;
+import org.mxchange.jaddressbook.exceptions.AddressbookNotFoundException;
+import org.mxchange.jaddressbook.model.addressbook.Addressbook;
+import org.mxchange.jaddressbook.model.addressbook.UserAddressbook;
+import org.mxchange.jaddressbook.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jjobs.beans.BaseJobsController;
 import org.mxchange.jjobs.beans.login.user.JobsUserLoginWebSessionController;
 import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
@@ -193,7 +193,7 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements
 		if (null == event) {
 			// Is null
 			throw new NullPointerException("event is null"); //NOI18N
-		} else if (event.getLoggedInUser()== null) {
+		} else if (event.getLoggedInUser() == null) {
 			// user is null
 			throw new NullPointerException("event.user is null"); //NOI18N
 		} else if (!event.getLoggedInUser().equals(this.userLoginController.getLoggedInUser())) {
diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java
index 94666b90..c728f9cf 100644
--- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java
@@ -19,11 +19,11 @@ package org.mxchange.jjobs.beans.addressbook;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.List;
-import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
-import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
-import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jaddressbookcore.events.addressbook.ObservableAddressbookLoadedEvent;
+import org.mxchange.jaddressbook.events.addressbook.ObservableAddressbookLoadedEvent;
+import org.mxchange.jaddressbook.model.addressbook.Addressbook;
+import org.mxchange.jaddressbook.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * An interface for address book beans
diff --git a/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java b/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java
index d55607e2..79e799e4 100644
--- a/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java
@@ -26,8 +26,8 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
-import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
-import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
+import org.mxchange.jaddressbook.exceptions.AddressbookNotFoundException;
+import org.mxchange.jaddressbook.model.addressbook.Addressbook;
 import org.mxchange.jcoreee.validator.number.BaseLongValidator;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
diff --git a/web/guest/user/user_show_addressbook.xhtml b/web/guest/user/user_show_addressbook.xhtml
index 0ebf6524..68315390 100644
--- a/web/guest/user/user_show_addressbook.xhtml
+++ b/web/guest/user/user_show_addressbook.xhtml
@@ -14,7 +14,7 @@
 		</f:viewParam>
 	</f:metadata>
 
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}/#{userLoginController.baseTemplatePathName}_base.tpl">
 		<ui:define name="login_title">
 			<h:outputText value="#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}" />
 		</ui:define>
diff --git a/web/user/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml
index 6eb82de6..3a121242 100644
--- a/web/user/login_start_sharing_addressbook.xhtml
+++ b/web/user/login_start_sharing_addressbook.xhtml
@@ -8,7 +8,7 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
 	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}/#{userLoginController.baseTemplatePathName}_base.tpl">
 		<ui:define name="login_title">
 			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}" />
 		</ui:define>