From: Roland Häder <roland@mxchange.org>
Date: Mon, 19 Mar 2018 23:54:24 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3beb34ed61ff8772d8f7d8fd5e30276b55663185;p=jcontacts-core.git

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 b91e85d..3e35c35 100644
--- 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