Injected contact controller as now stuff around contacts are done there, not in user.

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

diff --git a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
index bad5cac17bf85b67d332b5331e00cf2ac37db575..f9afe94339adcffda4587175312f0b9ebc285f86 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
@@ -26,6 +26,7 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController;
 import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 import org.mxchange.jusercore.events.registration.RegisteredUserEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
@@ -51,6 +52,12 @@ public class AddressbookUserRegisterWebSessionBean implements AddressbookUserReg
         */
        private static final long serialVersionUID = 47_828_986_719_691_592L;
 
+       /**
+        * User controller
+        */
+       @Inject
+       private AddressbookContactWebSessionController contactController;
+
        /**
         * Reemote register session bean
         */
@@ -100,12 +107,12 @@ public class AddressbookUserRegisterWebSessionBean implements AddressbookUserReg
                } else if (this.userController.isUserNameRegistered(user)) {
                        // User name is already used
                        throw new FaceletException(new UserNameAlreadyRegisteredException(user));
-               } else if (this.userController.isEmailAddressRegistered(user)) {
+               } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) {
                        // Email address has already been taken
                        throw new FaceletException(new EmailAddressAlreadyRegisteredException(user));
-               } else if (!this.userController.isSameEmailAddressEntered()) {
+               } else if (!this.contactController.isSameEmailAddressEntered()) {
                        // Not same email address entered
-                       throw new FaceletException(new DataRepeatMismatchException(MessageFormat.format("Email addresses not matching: {0} != {1}", this.userController.getEmailAddress(), this.userController.getEmailAddressRepeat()))); //NOI18N
+                       throw new FaceletException(new DataRepeatMismatchException(MessageFormat.format("Email addresses not matching: {0} != {1}", this.contactController.getEmailAddress(), this.contactController.getEmailAddressRepeat()))); //NOI18N
                } else if (!this.userController.isSamePasswordEntered()) {
                        // Not same password entered
                        throw new FaceletException(new DataRepeatMismatchException("Passwords not matching.")); //NOI18N