From a2ecb8fed752eb9c3d736c614c2d6d59217a9b79 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 24 Mar 2018 23:20:53 +0100
Subject: [PATCH] Please cherry-pick: - updated reference UserUtils to Users
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
.../addressbook/database/BaseAddressbookDatabaseBean.java | 4 ++--
.../jusercore/model/user/AddressbookUserSessionBean.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java b/src/java/org/mxchange/addressbook/database/BaseAddressbookDatabaseBean.java
index 4774ad3..2ba523e 100644
--- 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 a836ff5..c3e5822 100644
--- 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());
--
2.39.5