From: Roland Haeder <roland@mxchange.org>
Date: Sat, 12 Mar 2016 11:45:27 +0000 (+0100)
Subject: Cleanup:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e4bf17a99503e4efd4f713f7514fb77dd49646c4;p=jphone-core.git

Cleanup:
- compareTo()/Comparable<T> was used back in the TDGP times and is no longer needed
- value first, then variable on comparison to avoid accidently assignments
- updated jar(s)
---

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index f2ad1c8..3f35cb5 100644
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ
diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index 8f2a528..70a1a6a 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 e98fa08..987ea0a 100644
--- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
@@ -41,7 +41,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider;
  */
 @Entity (name = "cellphone_numbers")
 @Table (name = "cellphone_numbers")
-public class CellphoneNumber implements DialableCellphoneNumber, Comparable<DialableCellphoneNumber> {
+public class CellphoneNumber implements DialableCellphoneNumber {
 
 	/**
 	 * Serial number
@@ -101,11 +101,6 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	public CellphoneNumber () {
 	}
 
-	@Override
-	public int compareTo (final DialableCellphoneNumber dialableCellphoneNumber) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
 	@Override
 	public void copyAll (final DialableCellphoneNumber sourceNumber) {
 		// Copy all
@@ -117,7 +112,7 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 
 	@Override
 	public boolean equals (final Object object) {
-		if (object == null) {
+		if (null == object) {
 			return false;
 		} else if (this.getClass() != object.getClass()) {
 			return false;
diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index 870127c..c49c11f 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -40,7 +40,7 @@ import org.mxchange.jcountry.data.CountryData;
  */
 @Entity (name = "fax_numbers")
 @Table (name = "fax_numbers")
-public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumber> {
+public class FaxNumber implements DialableFaxNumber {
 
 	/**
 	 * Serial number
@@ -109,11 +109,6 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 	public FaxNumber () {
 	}
 
-	@Override
-	public int compareTo (final DialableFaxNumber dialableFaxNumber) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
 	@Override
 	public void copyAll (final DialableFaxNumber sourceNumber) {
 		// Copy all
@@ -126,7 +121,7 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 
 	@Override
 	public boolean equals (final Object object) {
-		if (object == null) {
+		if (null == object) {
 			return false;
 		} else if (this.getClass() != object.getClass()) {
 			return false;
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index e5365d1..2f192bb 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -40,7 +40,7 @@ import org.mxchange.jcountry.data.CountryData;
  */
 @Entity (name = "phone_numbers")
 @Table (name = "phone_numbers")
-public class LandLineNumber implements DialableLandLineNumber, Comparable<DialableLandLineNumber> {
+public class LandLineNumber implements DialableLandLineNumber {
 
 	/**
 	 * Serial number
@@ -109,11 +109,6 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	public LandLineNumber () {
 	}
 
-	@Override
-	public int compareTo (final DialableLandLineNumber dialableNumber) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
 	@Override
 	public void copyAll (final DialableLandLineNumber sourceNumber) {
 		// Copy all
@@ -126,7 +121,7 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 
 	@Override
 	public boolean equals (final Object object) {
-		if (object == null) {
+		if (null == object) {
 			return false;
 		} else if (this.getClass() != object.getClass()) {
 			return false;
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
index e6ee369..a35e266 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
@@ -45,7 +45,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, Comparable<SmsProvider> {
+public class CellphoneProvider implements SmsProvider {
 
 	/**
 	 * Serial number
@@ -114,14 +114,9 @@ public class CellphoneProvider implements SmsProvider, Comparable<SmsProvider> {
 	public CellphoneProvider () {
 	}
 
-	@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) {
+		if (null == object) {
 			return false;
 		} else if (this.getClass() != object.getClass()) {
 			return false;