From: Roland Häder Date: Thu, 6 Oct 2022 14:00:52 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=74533b13ee8f45590d1a5103e664888ad1f9bd60;p=juser-core.git Continued: - updated package name --- diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index bb75734..cf17e5f 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -38,7 +38,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jcontacts.model.contact.Contacts; +import org.mxchange.jcontacts.model.utils.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcoreutils.Comparables; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; @@ -230,7 +230,7 @@ public class LoginUser implements User { // Init comparitors final int comparitors[] = { // First contact - Contacts.compare(this.getUserContact(), user.getUserContact()), + ContactUtils.compare(this.getUserContact(), user.getUserContact()), // ... then user name this.getUserName().compareTo(user.getUserName()) }; diff --git a/src/org/mxchange/jusercore/model/user/Users.java b/src/org/mxchange/jusercore/model/user/Users.java index 604d5cb..79bcb77 100644 --- a/src/org/mxchange/jusercore/model/user/Users.java +++ b/src/org/mxchange/jusercore/model/user/Users.java @@ -25,7 +25,7 @@ import java.util.Objects; import java.util.Properties; import java.util.Random; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jcontacts.model.contact.Contacts; +import org.mxchange.jcontacts.model.utils.ContactUtils; /** * An utilities class for users @@ -133,7 +133,7 @@ public class Users implements Serializable { // Is contact set? if (sourceUser.getUserContact() instanceof Contact) { // Copy also contact data - Contacts.copyContactData(sourceUser.getUserContact(), targetUser.getUserContact()); + ContactUtils.copyContactData(sourceUser.getUserContact(), targetUser.getUserContact()); } // Copy other data