Continued:

[addressbook-war.git] / src / java / org / mxchange / addressbook / beans / user / AddressbookAdminUserWebRequestBean.java

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
index eae1bfe8b70b761b215ee31e2812c5e44251bd8e..1805a99bcdc1a962bc58eb3b78f54a93a65c0bc6 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
@@ -31,6 +31,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.jcontacts.contact.Contact;
 import org.mxchange.jusercore.events.user.AdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.AdminUserAddedEvent;
@@ -44,7 +45,6 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
 import org.mxchange.jusercore.model.user.UserUtils;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
-import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController;
 
 /**
  * A user bean (controller)
@@ -78,6 +78,12 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
         */
        private final UserSessionBeanRemote userBean;
 
+       /**
+        * Regular user controller
+        */
+       @Inject
+       private AddressbookUserWebSessionController userController;
+
        /**
         * A list of all user profiles
         */
@@ -98,18 +104,6 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
         */
        private String userPasswordRepeat;
 
-       /**
-<<<<<<< HEAD:src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
- ZIP code
-        */
-       private Integer zipCode;
-
-       /**
-        * Regular user controller
-        */
-       @Inject
-       private AddressbookUserWebSessionController userController;
-
        /**
         * Default constructor
         */
@@ -202,6 +196,11 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                return Collections.unmodifiableList(this.userList);
        }
 
+       @Override
+       public void editUserData () {
+               throw new UnsupportedOperationException("Not supported yet."); //NOI18N
+       }
+
        @Override
        public String getUserName () {
                return this.userName;