From: Roland Haeder <roland@mxchange.org>
Date: Tue, 13 Oct 2015 12:31:15 +0000 (+0200)
Subject: Added equals() hashCode() for easy comparison + updated jar(s)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cb3d405ce32698cd8c22068238d4ade58ebb945d;p=jphone-core.git

Added equals() hashCode() for easy comparison + updated jar(s)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index 049ef5f..7166776 100644
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ
diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
index af396ba..0e536ec 100644
--- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jphone.phonenumbers.cellphone;
 
+import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -83,6 +84,25 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	protected CellphoneNumber () {
 	}
 
+	@Override
+	public boolean equals (final Object object) {
+		if (object == null) {
+			return false;
+		} else if (getClass() != object.getClass()) {
+			return false;
+		}
+
+		final DialableCellphoneNumber other = (DialableCellphoneNumber) object;
+
+		if (!Objects.equals(this.getCellphoneProvider(), other.getCellphoneProvider())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
+			return false;
+		}
+
+		return true;
+	}
+
 	@Override
 	@Deprecated
 	public Country getPhoneCountry () {
@@ -141,4 +161,12 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	public int compareTo (final DialableCellphoneNumber dialableCellphoneNumber) {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
+
+	@Override
+	public int hashCode () {
+		int hash = 5;
+		hash = 97 * hash + Objects.hashCode(this.getCellphoneProvider());
+		hash = 97 * hash + Objects.hashCode(this.getPhoneNumber());
+		return hash;
+	}
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java
index 5fed971..953c17a 100644
--- a/src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/cellphone/DialableCellphoneNumber.java
@@ -39,4 +39,10 @@ public interface DialableCellphoneNumber extends DialableNumber {
 	 * @param cellphoneProvider SMS provider instance
 	 */
 	public void setCellphoneProvider (final SmsProvider cellphoneProvider);
+
+	@Override
+	public boolean equals (final Object object);
+
+	@Override
+	public int hashCode ();
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java
index 4e904e3..4cd57d2 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/DialableFaxNumber.java
@@ -24,4 +24,10 @@ import org.mxchange.jphone.phonenumbers.DialableNumber;
  * @author Roland Haeder
  */
 public interface DialableFaxNumber extends DialableNumber {
+
+	@Override
+	public boolean equals (final Object object);
+
+	@Override
+	public int hashCode ();
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index 18520a7..5e55e59 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jphone.phonenumbers.fax;
 
+import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -69,7 +70,7 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "fax_country_id", nullable = false)
-	@OneToOne(targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
 	private Country faxCountry;
 
 	/**
@@ -91,6 +92,27 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 	protected FaxNumber () {
 	}
 
+	@Override
+	public boolean equals (final Object object) {
+		if (object == null) {
+			return false;
+		} else if (getClass() != object.getClass()) {
+			return false;
+		}
+
+		final DialableFaxNumber other = (DialableFaxNumber) object;
+
+		if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneAreaCode(), other.getPhoneAreaCode())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneCountry(), other.getPhoneCountry())) {
+			return false;
+		}
+
+		return true;
+	}
+
 	@Override
 	public Long getPhoneId () {
 		return this.phoneId;
@@ -136,4 +158,13 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 		this.faxCountry = faxCountry;
 	}
 
+	@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;
+	}
+
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java
index 6d45894..4a93997 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/DialableLandLineNumber.java
@@ -20,7 +20,14 @@ import org.mxchange.jphone.phonenumbers.DialableNumber;
 
 /**
  * A POJI for dialable land-line numbers
+ * <p>
  * @author Roland Haeder
  */
 public interface DialableLandLineNumber extends DialableNumber {
+
+	@Override
+	public boolean equals (final Object object);
+
+	@Override
+	public int hashCode ();
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index 70285f7..aca8d08 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jphone.phonenumbers.landline;
 
+import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -69,7 +70,7 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	 * Connection to table "country_data"
 	 */
 	@JoinColumn (name = "phone_country_id", nullable = false, updatable = false)
-	@OneToOne(targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
 	private Country phoneCountry;
 
 	/**
@@ -91,6 +92,27 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	protected LandLineNumber () {
 	}
 
+	@Override
+	public boolean equals (Object object) {
+		if (object == null) {
+			return false;
+		} else if (getClass() != object.getClass()) {
+			return false;
+		}
+
+		final DialableLandLineNumber other = (DialableLandLineNumber) object;
+
+		if (!Objects.equals(this.getPhoneNumber(), other.getPhoneNumber())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneAreaCode(), other.getPhoneAreaCode())) {
+			return false;
+		} else if (!Objects.equals(this.getPhoneCountry(), other.getPhoneCountry())) {
+			return false;
+		}
+
+		return true;
+	}
+
 	@Override
 	public Long getPhoneId () {
 		return this.phoneId;
@@ -135,4 +157,13 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	public void setPhoneCountry (final Country phoneCountry) {
 		this.phoneCountry = phoneCountry;
 	}
+
+	@Override
+	public int hashCode () {
+		int hash = 7;
+		hash = 47 * hash + Objects.hashCode(this.getPhoneNumber());
+		hash = 47 * hash + Objects.hashCode(this.getPhoneAreaCode());
+		hash = 47 * hash + Objects.hashCode(this.getPhoneCountry());
+		return hash;
+	}
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
index 26dae62..1e3b360 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jphone.phonenumbers.smsprovider;
 
+import java.util.Objects;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -41,7 +42,7 @@ import org.mxchange.jcountry.data.CountryData;
 @NamedQueries (
 		@NamedQuery (name = "AllSmsProvider", query = "SELECT p FROM cellphone_provider AS p ORDER BY p.providerId ASC")
 )
-public class CellphoneProvider implements SmsProvider {
+public class CellphoneProvider implements SmsProvider, Comparable<SmsProvider> {
 
 	/**
 	 * Serial number
@@ -74,9 +75,35 @@ public class CellphoneProvider implements SmsProvider {
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "provider_country_id", nullable = false)
-	@OneToOne(targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, optional = false, fetch = FetchType.EAGER)
 	private Country providerCountry;
 
+	@Override
+	public int compareTo (final SmsProvider provider) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public boolean equals (final Object object) {
+		if (object == null) {
+			return false;
+		} else if (getClass() != object.getClass()) {
+			return false;
+		}
+
+		final SmsProvider other = (SmsProvider) object;
+
+		if (!Objects.equals(this.getProviderDialPrefix(), other.getProviderDialPrefix())) {
+			return false;
+		} else if (!Objects.equals(this.getProviderName(), other.getProviderName())) {
+			return false;
+		} else if (!Objects.equals(this.getProviderCountry(), other.getProviderCountry())) {
+			return false;
+		}
+
+		return true;
+	}
+
 	@Override
 	public Long getProviderId () {
 		return providerId;
@@ -117,4 +144,13 @@ public class CellphoneProvider implements SmsProvider {
 		this.providerCountry = providerCountry;
 	}
 
+	@Override
+	public int hashCode () {
+		int hash = 7;
+		hash = 19 * hash + Objects.hashCode(this.getProviderDialPrefix());
+		hash = 19 * hash + Objects.hashCode(this.getProviderName());
+		hash = 19 * hash + Objects.hashCode(this.getProviderCountry());
+		return hash;
+	}
+
 }
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java
index 65354f9..619a07c 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/SmsProvider.java
@@ -81,4 +81,10 @@ public interface SmsProvider extends Serializable {
 	 * @param country Country instance
 	 */
 	public void setProviderCountry (final Country country);
+
+	@Override
+	public boolean equals (final Object object);
+
+	@Override
+	public int hashCode ();
 }