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 cd9fb5854d5d5f2f57b0dfeb2140f074a35155d2..c24504dd1f63a38544f7ba2c3ff153e6b089e188 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Häder
+ * Copyright (C) 2016, 2017 Roland Häder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -34,17 +34,17 @@ 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.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.JobsUserLoginWebSessionController;
-import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jaddressbookcore.events.addressbook.ObservableAddressbookLoadedEvent;
+import org.mxchange.jjobs.beans.login.user.JobsUserLoginWebSessionController;
 import org.mxchange.jusercore.events.login.ObservableUserLoggedInEvent;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * An address book bean (controller)
@@ -112,17 +112,8 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements
         * Default constructor
         */
        public JobsAddressbookWebSessionBean () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup
-                       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);
-               }
+               // Call super constructor
+               super();
        }
 
        @Override
@@ -202,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())) {
@@ -315,6 +306,18 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements
         */
        @PostConstruct
        public void init () {
+               // Try it
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Try to lookup
+                       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);
+               }
+
                // Init list
                this.usersAddressbooks = new LinkedList<>();
 
@@ -424,4 +427,5 @@ public class JobsAddressbookWebSessionBean extends BaseJobsController implements
                // Fill list with entries
                this.usersAddressbooks = this.addressbookBean.getUsersAddressbookList(user);
        }
+
 }