From: Roland Häder <roland@mxchange.org>
Date: Tue, 23 Aug 2016 14:07:56 +0000 (+0200)
Subject: Always include primary key (id number) in equal() method
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0c1ff3c679dafbc9d23fe04b822f263f7f5bb521;p=jphone-core.git

Always include primary key (id number) in equal() method
---

diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index 9d7bcda..e9774de 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -147,6 +147,8 @@ public class FaxNumber implements DialableFaxNumber {
 
 		if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
 			return false;
+		} else if (!Objects.equals(this.getPhoneId(), other.getPhoneId())) {
+			return false;
 		} else if (!Objects.equals(this.getPhoneAreaCode(), other.getPhoneAreaCode())) {
 			return false;
 		} else if (!Objects.equals(this.getPhoneCountry(), other.getPhoneCountry())) {
@@ -156,15 +158,6 @@ public class FaxNumber implements DialableFaxNumber {
 		return true;
 	}
 
-	@Override
-	public int hashCode () {
-		int hash = 3;
-		hash = 23 * hash + Objects.hashCode(this.getPhoneNumber());
-		hash = 23 * hash + Objects.hashCode(this.getPhoneAreaCode());
-		hash = 23 * hash + Objects.hashCode(this.getPhoneCountry());
-		return hash;
-	}
-
 	@Override
 	public Integer getPhoneAreaCode () {
 		return this.faxAreaCode;
@@ -229,4 +222,16 @@ public class FaxNumber implements DialableFaxNumber {
 		this.phoneNumber = phoneNumber;
 	}
 
+	@Override
+	public int hashCode () {
+		int hash = 3;
+
+		hash = 23 * hash + Objects.hashCode(this.getPhoneId());
+		hash = 23 * hash + Objects.hashCode(this.getPhoneNumber());
+		hash = 23 * hash + Objects.hashCode(this.getPhoneAreaCode());
+		hash = 23 * hash + Objects.hashCode(this.getPhoneCountry());
+
+		return hash;
+	}
+
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index df18350..7411cf5 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -145,7 +145,9 @@ public class LandLineNumber implements DialableLandLineNumber {
 
 		final DialableLandLineNumber other = (DialableLandLineNumber) object;
 
-		if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
+		if (!Objects.equals(this.getPhoneId(), other.getPhoneId())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
 			return false;
 		} else if (!Objects.equals(this.getPhoneAreaCode(), other.getPhoneAreaCode())) {
 			return false;
@@ -224,6 +226,7 @@ public class LandLineNumber implements DialableLandLineNumber {
 	public int hashCode () {
 		int hash = 7;
 
+		hash = 47 * hash + Objects.hashCode(this.getPhoneId());
 		hash = 47 * hash + Objects.hashCode(this.getPhoneNumber());
 		hash = 47 * hash + Objects.hashCode(this.getPhoneAreaCode());
 		hash = 47 * hash + Objects.hashCode(this.getPhoneCountry());
diff --git a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java b/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java
index 4f33f99..ac2a0c2 100644
--- a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java
@@ -136,7 +136,9 @@ public class MobileNumber implements DialableMobileNumber {
 
 		final DialableMobileNumber other = (DialableMobileNumber) object;
 
-		if (!Objects.equals(this.getMobileProvider(), other.getMobileProvider())) {
+		if (!Objects.equals(this.getPhoneId(), other.getPhoneId())) {
+			return false;
+		} else if (!Objects.equals(this.getMobileProvider(), other.getMobileProvider())) {
 			return false;
 		} else if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
 			return false;
@@ -227,6 +229,7 @@ public class MobileNumber implements DialableMobileNumber {
 	public int hashCode () {
 		int hash = 5;
 
+		hash = 97 * hash + Objects.hashCode(this.getPhoneId());
 		hash = 97 * hash + Objects.hashCode(this.getMobileProvider());
 		hash = 97 * hash + Objects.hashCode(this.getPhoneNumber());