From: Roland Häder Date: Thu, 6 Oct 2022 14:10:41 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=097f49b3b3bbe9d2f22fe8a4f9a0041d86862562;p=jbonuscard-core.git Continued: - updated package/class references - used BasicDataUtils.compare() again --- diff --git a/src/org/mxchange/jbonuscard/model/bonus_card/RoyalityCard.java b/src/org/mxchange/jbonuscard/model/bonus_card/RoyalityCard.java index 9979610..ada09ef 100644 --- a/src/org/mxchange/jbonuscard/model/bonus_card/RoyalityCard.java +++ b/src/org/mxchange/jbonuscard/model/bonus_card/RoyalityCard.java @@ -34,11 +34,11 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.apache.commons.lang3.StringUtils; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jcontacts.model.contact.Contacts; import org.mxchange.jcontacts.model.contact.UserContact; +import org.mxchange.jcontacts.model.utils.ContactUtils; import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.BasicDataUtils; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.utils.BasicDataUtils; import org.mxchange.jcoreutils.Comparables; import org.mxchange.jcustomercore.model.customer.ContactCustomer; import org.mxchange.jcustomercore.model.customer.Customer; @@ -187,9 +187,9 @@ public class RoyalityCard implements BonusCard { // ... customer data Customers.compare(this.getBonusCardCustomer(), bonusCard.getBonusCardCustomer()), // ... contact data (card holder) - Contacts.compare(this.getBonusCardContact(), bonusCard.getBonusCardContact()), + ContactUtils.compare(this.getBonusCardContact(), bonusCard.getBonusCardContact()), // ... issuing company data - this.getBonusCardIssuer().compareTo(bonusCard.getBonusCardIssuer()), + BasicDataUtils.compare(this.getBonusCardIssuer(), bonusCard.getBonusCardIssuer()), // ... partner company data BasicDataUtils.compare(this.getBonusCardPartner(), bonusCard.getBonusCardPartner()) };