Continued:

- CoreNumberUtils was a dump name, SafeNumberUtils is much better because these
  methods are all truely null-safe

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

diff --git a/src/org/mxchange/jcontacts/model/contact/UserContact.java b/src/org/mxchange/jcontacts/model/contact/UserContact.java
index b91e85dffc6d124f474eb0197fc0ec2ce74f814f..3e35c35e1d7039dd4833984f6c55647e96373f4b 100644 (file)
--- a/src/org/mxchange/jcontacts/model/contact/UserContact.java
+++ b/src/org/mxchange/jcontacts/model/contact/UserContact.java
@@ -40,7 +40,7 @@ import javax.persistence.Transient;
 import org.apache.commons.lang3.StringUtils;
 import org.mxchange.jcontacts.model.contact.title.PersonalTitle;
 import org.mxchange.jcoreutils.Comparables;
-import org.mxchange.jcoreutils.CoreNumberUtils;
+import org.mxchange.jcoreutils.SafeNumberUtils;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jcountry.model.data.CountryData;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
@@ -258,13 +258,13 @@ public class UserContact implements Contact {
                        // First check country
                        this.getContactCountry().compareTo(contact.getContactCountry()),
                        // ... then ZIP code
-                       CoreNumberUtils.compare(this.getContactZipCode(), contact.getContactZipCode()),
+                       SafeNumberUtils.compare(this.getContactZipCode(), contact.getContactZipCode()),
                        // ... and city
                        this.getContactCity().compareTo(contact.getContactCity()),
                        // ... street name
                        StringUtils.compareIgnoreCase(this.getContactStreet(), contact.getContactStreet()),
                        // ... house number
-                       CoreNumberUtils.compare(this.getContactHouseNumber(), contact.getContactHouseNumber()),
+                       SafeNumberUtils.compare(this.getContactHouseNumber(), contact.getContactHouseNumber()),
                        // ... extension
                        StringUtils.compareIgnoreCase(this.getContactHouseNumberExtension(), contact.getContactHouseNumberExtension()),
                        // ... now it is sure that address is different/same, continue with personal title