Please cherry-pick:

- updated reference UserUtils to Users

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

diff --git a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
index 4774ad3c4c2abac605b2849d1895d29f70f04389..2ba523e848f503c5f439a3ba423b5623b63ef37b 100644 (file)
--- a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
+++ b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
@@ -52,7 +52,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers;
 import org.mxchange.jphone.utils.PhoneUtils;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jusercore.model.user.UserUtils;
+import org.mxchange.jusercore.model.user.Users;
 
 /**
  * A helper class for beans that access the database.
@@ -1240,7 +1240,7 @@ public abstract class BaseAddressbookDatabaseBean extends BaseDatabaseBean {
                }
 
                // Set all values
-               final Properties variables = UserUtils.getAllUserFields(user);
+               final Properties variables = Users.getAllUserFields(user);
 
                // Set base URL and random password
                variables.put("baseUrl", baseUrl); //NOI18N

diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java
index a836ff53036a7bf2887f72778ed507b3c0cbb96a..c3e5822f05f780deb25b80b06e3a55a329ac520b 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java
@@ -215,7 +215,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl
                // Loop until a user name is found
                while ((userName == null) || (userList.contains(userName))) {
                        // Generate random name
-                       userName = UserUtils.generateRandomUserName();
+                       userName = Users.generateRandomUserName();
                }
 
                // Trace message
@@ -448,7 +448,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not merged, but should be.", managedUser.getUserId()); //NOI18N
 
                // Copy all data
-               UserUtils.copyAll(managedUser, managedUser);
+               Users.copyAll(managedUser, managedUser);
 
                // Set as updated
                managedUser.setUserUpdated(new Date());
@@ -566,7 +566,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookDatabaseBean impl
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               UserUtils.copyAll(user, managedUser);
+               Users.copyAll(user, managedUser);
 
                // Set as updated
                managedUser.setUserUpdated(new Date());