From 35f0b23609f1aafe94155ff8b58c2f34701e420a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 6 Oct 2022 16:06:44 +0200
Subject: [PATCH] Continued: - renamed utilities class Users to UserUtils -
 moved it to own package

---
 .../mxchange/jusercore/model/user/LoginUser.java  |  6 +++---
 .../{user/Users.java => utils/UserUtils.java}     | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)
 rename src/org/mxchange/jusercore/model/{user/Users.java => utils/UserUtils.java} (96%)

diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java
index cf17e5f..d6de5bf 100644
--- a/src/org/mxchange/jusercore/model/user/LoginUser.java
+++ b/src/org/mxchange/jusercore/model/user/LoginUser.java
@@ -38,8 +38,8 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import org.mxchange.jcontacts.model.contact.Contact;
-import org.mxchange.jcontacts.model.utils.ContactUtils;
 import org.mxchange.jcontacts.model.contact.UserContact;
+import org.mxchange.jcontacts.model.utils.ContactUtils;
 import org.mxchange.jcoreutils.Comparables;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.jusercore.model.user.status.UserAccountStatus;
@@ -221,8 +221,8 @@ public class LoginUser implements User {
 		// Checkparameter and return 0 if equal
 		if (null == user) {
 			// Should not happen
-			throw new NullPointerException("user is null"); //NOI18N
-		} else if (user.equals(this)) {
+			throw new NullPointerException("Parameter 'user' is null"); //NOI18N
+		} else if (Objects.equals(this, user)) {
 			// Same object
 			return 0;
 		}
diff --git a/src/org/mxchange/jusercore/model/user/Users.java b/src/org/mxchange/jusercore/model/utils/UserUtils.java
similarity index 96%
rename from src/org/mxchange/jusercore/model/user/Users.java
rename to src/org/mxchange/jusercore/model/utils/UserUtils.java
index 79bcb77..6a21724 100644
--- a/src/org/mxchange/jusercore/model/user/Users.java
+++ b/src/org/mxchange/jusercore/model/utils/UserUtils.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jusercore.model.user;
+package org.mxchange.jusercore.model.utils;
 
 import java.io.Serializable;
 import java.security.SecureRandom;
@@ -26,13 +26,14 @@ import java.util.Properties;
 import java.util.Random;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jcontacts.model.utils.ContactUtils;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * An utilities class for users
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-public class Users implements Serializable {
+public class UserUtils implements Serializable {
 
 	/**
 	 * Password alphabet
@@ -79,10 +80,10 @@ public class Users implements Serializable {
 		RANDOM_NUMBER_GENERATOR = new SecureRandom();
 
 		// Init alphabet
-		PASSWORD_ALPHABET = Users.PASSWORD_ALPHABET_PARTS[0] +
-							Users.PASSWORD_ALPHABET_PARTS[1] +
-							Users.PASSWORD_ALPHABET_PARTS[2] +
-							Users.PASSWORD_ALPHABET_PARTS[3];
+		PASSWORD_ALPHABET = UserUtils.PASSWORD_ALPHABET_PARTS[0] +
+							UserUtils.PASSWORD_ALPHABET_PARTS[1] +
+							UserUtils.PASSWORD_ALPHABET_PARTS[2] +
+							UserUtils.PASSWORD_ALPHABET_PARTS[3];
 	}
 
 	/**
@@ -305,7 +306,7 @@ public class Users implements Serializable {
 	/**
 	 * No instance from this class
 	 */
-	private Users () {
+	private UserUtils () {
 	}
 
 }
-- 
2.39.5