From 78b55492c24908d0111dfbcb44da3185898cd1cc Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 12 Mar 2016 12:43:55 +0100 Subject: [PATCH] Cleanup: - compareTo()/Comparable was used back in the TDGP times and is no longer needed --- src/org/mxchange/jcountry/data/Country.java | 2 +- src/org/mxchange/jcountry/data/CountryData.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/org/mxchange/jcountry/data/Country.java b/src/org/mxchange/jcountry/data/Country.java index 3e41b11..e76d656 100644 --- a/src/org/mxchange/jcountry/data/Country.java +++ b/src/org/mxchange/jcountry/data/Country.java @@ -121,7 +121,7 @@ public interface Country extends Serializable { * Setter for whether the local dial prefix is required for local calls *

* @param countryIsLocalPrefixRequired Whether the local dial prefix is - * required + * required */ void setCountryIsLocalPrefixRequired (final Boolean countryIsLocalPrefixRequired); diff --git a/src/org/mxchange/jcountry/data/CountryData.java b/src/org/mxchange/jcountry/data/CountryData.java index 08185d3..8965007 100644 --- a/src/org/mxchange/jcountry/data/CountryData.java +++ b/src/org/mxchange/jcountry/data/CountryData.java @@ -40,7 +40,7 @@ import javax.persistence.TemporalType; @NamedQueries ( @NamedQuery (name = "AllCountries", query = "SELECT c FROM country_data AS c ORDER BY c.countryId ASC") ) -public class CountryData implements Country, Comparable { +public class CountryData implements Country { /** * Serial number @@ -110,14 +110,9 @@ public class CountryData implements Country, Comparable { @Column (name = "country_phone_code", length = 2, nullable = false, updatable = false) private Short countryPhoneCode; - @Override - public int compareTo (final Country country) { - 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; -- 2.39.5