From 4d2d1c58d902988be9880d1c1a090de079f3b9be Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 23 Apr 2016 12:57:28 +0200 Subject: [PATCH] fixed imports (maybe not cherry-pick?) --- .../JobsAddressbookWebSessionBean.java | 23 +++++++++---------- .../JobsAddressbookWebSessionController.java | 6 ++--- .../JobsAdminContactWebRequestBean.java | 5 ++-- .../user/JobsAdminUserWebRequestBean.java | 5 ++-- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java index ea674fd9..e232ee8d 100644 --- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java @@ -19,7 +19,6 @@ package org.mxchange.jjobs.beans.addressbook; import java.text.MessageFormat; import java.util.Calendar; import java.util.Collections; -import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -34,15 +33,15 @@ import javax.inject.Named; 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.LoadedAddressbookEvent; +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.jjobs.beans.login.JobsUserLoginWebSessionController; -import org.mxchange.jjobs.events.addressbook.AddressbookLoadedEvent; -import org.mxchange.jjobs.events.addressbook.LoadedAddressbookEvent; -import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException; -import org.mxchange.jjobs.exceptions.AddressbookNotFoundException; -import org.mxchange.jjobs.model.addressbook.Addressbook; -import org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote; -import org.mxchange.jjobs.model.addressbook.UserAddressbook; -import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.model.user.User; @@ -68,7 +67,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC /** * Remote address book bean */ - private JobsAddressbookSessionBeanRemote addressbookBean; + private AddressbookSessionBeanRemote addressbookBean; /** * When this address book has been created @@ -118,7 +117,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC Context context = new InitialContext(); // Try to lookup - this.addressbookBean = (JobsAddressbookSessionBeanRemote) context.lookup("java:global/jjobs-ejb/jjobs-adr!org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote"); //NOI18N + this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/jjobs-ejb/jjobs-adr!org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -143,7 +142,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC } // Create address book instance with name - Addressbook book = new UserAddressbook(this.getAddressbookName(), this.loginController.getLoggedInUser(), new GregorianCalendar()); + Addressbook book = new UserAddressbook(this.getAddressbookName(), this.loginController.getLoggedInUser()); try { // Register this address book diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java index ee47235e..b518795f 100644 --- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java @@ -19,9 +19,9 @@ package org.mxchange.jjobs.beans.addressbook; import java.io.Serializable; import java.util.Calendar; import java.util.List; -import org.mxchange.jjobs.events.addressbook.AddressbookLoadedEvent; -import org.mxchange.jjobs.model.addressbook.Addressbook; -import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry; +import org.mxchange.jaddressbookcore.events.addressbook.AddressbookLoadedEvent; +import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; +import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.model.user.User; diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index b01440c6..aa7e7a8a 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java @@ -32,15 +32,14 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcontacts.contact.utils.ContactUtils; -import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.AdminContactUpdatedEvent; import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; import org.mxchange.jcountry.data.Country; import org.mxchange.jjobs.beans.helper.JobsAdminWebRequestController; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; -import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent; -import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController; /** * A user bean (controller) diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 877ef69a..2bb7ee7b 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -34,6 +34,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; +import org.mxchange.jjobs.beans.helper.JobsAdminWebRequestController; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.user.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.AdminUserAddedEvent; @@ -50,8 +51,6 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; -import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; -import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController; /** * A user bean (controller) @@ -78,7 +77,7 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr * Admin helper instance */ @Inject - private PizzaAdminWebRequestController adminHelper; + private JobsAdminWebRequestController adminHelper; /** * Regular contact controller -- 2.39.5