]> git.mxchange.org Git - addressbook-war.git/commitdiff
added parameter 'createContactData'
authorRoland Häder <roland@mxchange.org>
Fri, 13 May 2016 12:57:58 +0000 (14:57 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 28 Jul 2016 19:29:19 +0000 (21:29 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java
src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java

index 78bd2a975ac43dc76ab4446ca503103003cf7f37..450f50c8fb9b17495df37a6b162243a065b123e6 100644 (file)
@@ -107,7 +107,7 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro
        @Override
        public String doFinishRegistration () {
                // Get user instance
-               User user = this.userController.createUserInstance();
+               User user = this.userController.createUserInstance(true);
 
                // Is the user already used?
                if (null == user) {
@@ -175,7 +175,7 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro
        @Override
        public String doRegisterMultiPage1 () {
                // Get user instance
-               User user = this.userController.createUserInstance();
+               User user = this.userController.createUserInstance(false);
 
                // First check if user is not null and user name is not used + if same email address is entered
                if (null == user) {
index d583d8476ec5cd9092e0088be74bf364307fb6be..25535651d460e4622d399ca489909a6352fde26d 100644 (file)
@@ -421,7 +421,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp
        }
 
        @Override
-       public User createUserInstance () {
+       public User createUserInstance (final boolean createContactData) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: CALLED!", this.getClass().getSimpleName()));
 
index c665213fca3e178330469b2c83ab8e89ea138aa9..59ca6338d29542a10c4a3bb9093656f266e039b3 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.addressbook.beans.user;
 import java.io.Serializable;
 import java.util.List;
 import org.mxchange.jcontacts.contact.Contact;
-import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
@@ -43,14 +42,6 @@ public interface AddressbookUserWebSessionController extends Serializable {
         */
        public static final Integer MINIMUM_PASSWORD_LENGTH = 5;
 
-       /**
-        * Observes events being fired when an administrator has added a new
-        * contact.
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedContact (final AdminAddedContactEvent event);
-
        /**
         * Event observer for newly added users by adminstrator
         * <p>
@@ -175,9 +166,11 @@ public interface AddressbookUserWebSessionController extends Serializable {
        /**
         * Creates an instance from all properties
         * <p>
+        * @param createContactData Whether contact data should be created
+        * <p>
         * @return A user instance
         */
-       User createUserInstance ();
+       User createUserInstance (final boolean createContactData);
 
        /**
         * Creates a user instance for login phase