Please cherry-pick:

[addressbook-war.git] / src / java / org / mxchange / addressbook / beans / helper / AddressbookWebRequestHelperBean.java

diff --git a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java b/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java
index bed5ac5219f40b7f57e1cde21a236006cc0ddb18..dc337716d21ed1eebf149ca70326efc755967265 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java
+++ b/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelperBean.java
@@ -25,19 +25,19 @@ import javax.inject.Named;
 import org.mxchange.addressbook.beans.contact.AddressbookAdminContactWebRequestController;
 import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestController;
 import org.mxchange.addressbook.beans.user.AddressbookAdminUserWebRequestController;
-import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
-import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.addressbook.beans.user.AddressbookUserWebRequestController;
 import org.mxchange.jcontacts.events.contact.created.CreatedContactEvent;
 import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent;
+import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jphone.events.fax.created.CreatedFaxNumberEvent;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
 import org.mxchange.jphone.events.landline.created.CreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent;
 import org.mxchange.jphone.events.mobile.created.CreatedMobileNumberEvent;
 import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent;
-import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
-import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
-import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jusercore.events.user.created.CreatedUserEvent;
 import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
 import org.mxchange.jusercore.model.user.User;
@@ -136,7 +136,7 @@ public class AddressbookWebRequestHelperBean implements AddressbookWebRequestHel
         * Regular user controller
         */
        @Inject
-       private AddressbookUserWebSessionController userController;
+       private AddressbookUserWebRequestController userController;
 
        /**
         * Event for when a user instance was created
@@ -200,11 +200,8 @@ public class AddressbookWebRequestHelperBean implements AddressbookWebRequestHel
                // Default key is "unused"
                String messageKey = "CONTACT_IS_UNUSED"; //NOI18N
 
-               // Check user contact
-               boolean isUserContact = this.userController.isContactFound(contact);
-
                // Check user first
-               if (isUserContact) {
+               if (this.userController.isContactFound(contact)) {
                        // Only user
                        messageKey = "CONTACT_IS_USER"; //NOI18N
                }
@@ -453,7 +450,7 @@ public class AddressbookWebRequestHelperBean implements AddressbookWebRequestHel
                }
 
                // Get contact
-               Contact userContact = this.getUser().getUserContact();
+               final Contact userContact = this.getUser().getUserContact();
 
                // Set contact here, too. This avoids parameters that cannot auto-complete in IDEs.
                this.setContact(userContact);