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 f2ad1c85d97e64c5a60b7580b4a440554a198134..3f35cb503dc349a077aa978ba857bb1175b5c861 100644 (file)
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 8f2a52866c7ad118b28db9a470c105f6fc62f655..70a1a6a6565139b666bc696a133750c5800a8b3b 100644 (file)
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 e98fa088f12866446744bb165249b7610b5bfa87..987ea0a966809427c04032bc640fcd3ffba05375 100644 (file)
--- 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 870127c6cc91e4d4657cd701615991aff1f180de..c49c11fe6b163688ba5880017cb2ab1df3c422db 100644 (file)
--- 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 e5365d1010feb40f7b798accbe870cf4defc7098..2f192bb465873171050e16eeb19f8d47147b4aa9 100644 (file)
--- 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 e6ee369a6f6e67fef99db5be1f07b7cc741229c5..a35e266051756e68e9f97f1d364d66f9fddb6abd 100644 (file)
--- 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;