Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / addressbook / JobsAddressbookWebSessionBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
index 3b9972ab6f973335abc0d310502ccd81fc401802..baf73ea962c9c10d9b3760c5b59c7767ff7d556d 100644 (file)
--- 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,16 @@ 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.BaseJobsController;
 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;
 
@@ -53,7 +53,7 @@ import org.mxchange.jusercore.model.user.User;
  */
 @Named ("addressbookController")
 @SessionScoped
-public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionController {
+public class JobsAddressbookWebSessionBean extends BaseJobsController implements JobsAddressbookWebSessionController {
 
        /**
         * Serial number
@@ -68,7 +68,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        /**
         * Remote address book bean
         */
-       private JobsAddressbookSessionBeanRemote addressbookBean;
+       private AddressbookSessionBeanRemote addressbookBean;
 
        /**
         * When this address book has been created
@@ -101,7 +101,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
         * Login controller
         */
        @Inject
-       private JobsUserLoginWebSessionController loginController;
+       private JobsUserLoginWebSessionController userLoginController;
 
        /**
         * A list of all user's address books
@@ -118,7 +118,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.addressbookBean = (JobsAddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.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);
@@ -128,7 +128,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public String addAddressbook () {
                // Is this name already used?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                } else if (this.getAddressbookName() == null) {
@@ -143,7 +143,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.userLoginController.getLoggedInUser());
 
                try {
                        // Register this address book
@@ -164,7 +164,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        }
 
        @Override
-       public void afterAddressbookLoadedEvent (final @Observes AddressbookLoadedEvent event) {
+       public void afterAddressbookLoadedEvent (@Observes final AddressbookLoadedEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -197,18 +197,18 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        }
 
        @Override
-       public void afterLoginEvent (final @Observes UserLoggedInEvent event) {
+       public void afterLoginEvent (@Observes final UserLoggedInEvent event) {
                // Is the user logged in?
                if (null == event) {
                        // Is null
                        throw new NullPointerException("event is null"); //NOI18N
-               } else if (event.getUser() == null) {
+               } else if (event.getLoggedInUser()== null) {
                        // user is null
                        throw new NullPointerException("event.user is null"); //NOI18N
-               } else if (!event.getUser().equals(this.loginController.getLoggedInUser())) {
+               } else if (!event.getLoggedInUser().equals(this.userLoginController.getLoggedInUser())) {
                        // Not matching
-                       throw new IllegalStateException("event.user and loginController.loggedInUser don't match."); //NOI18N
-               } else if (!this.loginController.isUserLoggedIn()) {
+                       throw new IllegalStateException("event.user and userLoginController.loggedInUser don't match."); //NOI18N
+               } else if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -220,7 +220,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public List<Addressbook> allAddressbooks () {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -231,7 +231,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public List<AddressbookEntry> allEntries (final Addressbook addressbook) {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -257,11 +257,13 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        }
 
        @Override
+       @SuppressWarnings ("ReturnOfDateField")
        public Calendar getAddressbookCreated () {
                return this.addressbookCreated;
        }
 
        @Override
+       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
        public void setAddressbookCreated (final Calendar addressbookCreated) {
                this.addressbookCreated = addressbookCreated;
        }
@@ -299,7 +301,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public boolean hasCreatedAddressbooks () {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // Not logged in
                        throw new FaceletException("This method can only be called as logged-in user."); //NOI18N
                }
@@ -317,7 +319,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
                this.usersAddressbooks = new LinkedList<>();
 
                // Is the user logged-in?
-               if (this.loginController.isUserLoggedIn()) {
+               if (this.userLoginController.isUserLoggedIn()) {
                        // Initialize list
                        this.initAddressbookList();
                }
@@ -371,13 +373,13 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        @Override
        public boolean isOwnAddressbook () {
                // Is the user logged in?
-               if (!this.loginController.isUserLoggedIn()) {
+               if (!this.userLoginController.isUserLoggedIn()) {
                        // No, then no own address book
                        throw new IllegalStateException("isOwnAddressbook() has been invoked for a guest account"); //NOI18N
                }
 
                // Is same user?
-               return Objects.equals(this.getAddressbookUser(), this.loginController.getLoggedInUser());
+               return Objects.equals(this.getAddressbookUser(), this.userLoginController.getLoggedInUser());
        }
 
        @Override
@@ -417,7 +419,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
         */
        private void initAddressbookList () {
                // Get user instance
-               User user = this.loginController.getLoggedInUser();
+               User user = this.userLoginController.getLoggedInUser();
 
                // Fill list with entries
                this.usersAddressbooks = this.addressbookBean.getUsersAddressbookList(user);