]> git.mxchange.org Git - jcountry-core.git/commitdiff
Cleanup:
authorRoland Haeder <roland@mxchange.org>
Sat, 12 Mar 2016 11:43:55 +0000 (12:43 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 12 Mar 2016 11:43:55 +0000 (12:43 +0100)
- compareTo()/Comparable<T> was used back in the TDGP times and is no longer needed

src/org/mxchange/jcountry/data/Country.java
src/org/mxchange/jcountry/data/CountryData.java

index 3e41b11c41fe10ba3481825f3cdfd9c0ea5d8088..e76d6560e70bf01522ed92ee287bc4b031039b87 100644 (file)
@@ -121,7 +121,7 @@ public interface Country extends Serializable {
         * Setter for whether the local dial prefix is required for local calls
         * <p>
         * @param countryIsLocalPrefixRequired Whether the local dial prefix is
-        * required
+        *                                     required
         */
        void setCountryIsLocalPrefixRequired (final Boolean countryIsLocalPrefixRequired);
 
index 08185d3a91d247bad2fe90d3f726239be95b5237..8965007d40359e48c6cf2f16187b896908cececb 100644 (file)
@@ -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<Country> {
+public class CountryData implements Country {
 
        /**
         * Serial number
@@ -110,14 +110,9 @@ public class CountryData implements Country, Comparable<Country> {
        @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;