From b76085ca0e480ae2c43d2cd54d82ba3c4b4e6439 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 20 Apr 2016 19:42:19 +0200 Subject: [PATCH] Injected contact controller as now stuff around contacts are done there, not in user. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AddressbookUserRegisterWebSessionBean.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java index bad5cac1..f9afe943 100644 --- 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 -- 2.39.5