From e4bf17a99503e4efd4f713f7514fb77dd49646c4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 12 Mar 2016 12:45:27 +0100 Subject: [PATCH] Cleanup: - compareTo()/Comparable 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) --- lib/jcoreee.jar | Bin 18919 -> 18919 bytes lib/jcountry-core.jar | Bin 6761 -> 6264 bytes .../cellphone/CellphoneNumber.java | 9 ++------- .../jphone/phonenumbers/fax/FaxNumber.java | 9 ++------- .../phonenumbers/landline/LandLineNumber.java | 9 ++------- .../smsprovider/CellphoneProvider.java | 9 ++------- 6 files changed, 8 insertions(+), 28 deletions(-) diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index f2ad1c85d97e64c5a60b7580b4a440554a198134..3f35cb503dc349a077aa978ba857bb1175b5c861 100644 GIT binary patch delta 407 zcmaDpneq8#M&1B#W)?061`Y;>ODQ=Mc{P|X0x666%pl$^c`)@y14K<$XEXrQQH+*g zdK#k@n7+(t52jZ#8BD(GF2aLs;N+h`!2}QX$#a;vpo)CK^iL*7Fm2214x%@=GoNPz zGa|XnI0S(r9y5b(u}bqWFo3Y#!1)DLX`D^kSCx}z|ob^EpCObG=faz*y2QaQMPTR51`c8dqoXWf#)w6S|8n4a(60H&2ZGQf1N PM;VxA^UMO%#hxVqi5-{X delta 407 zcmaDpneq8#M&1B#W)?061`Y-W#on}uyc*03K+0l1n7Snorv88hC#y3WfVh*R7%jo{ zG)5~heVNf7Os`}zn0(h=ga>XQNbyggV1ftxPJFE zJWcPigGDrLQ(2jT-kLno$pR!W`HU09seI1*V7`MhM7-MB0nFd$>?+Sol4OwV_30Mkky8DP5C PqYO;5d1is>V$Tu)*g=4B diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 8f2a52866c7ad118b28db9a470c105f6fc62f655..70a1a6a6565139b666bc696a133750c5800a8b3b 100644 GIT binary patch delta 2235 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 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 { +public class CellphoneNumber implements DialableCellphoneNumber { /** * Serial number @@ -101,11 +101,6 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable { +public class FaxNumber implements DialableFaxNumber { /** * Serial number @@ -109,11 +109,6 @@ public class FaxNumber implements DialableFaxNumber, Comparable { +public class LandLineNumber implements DialableLandLineNumber { /** * Serial number @@ -109,11 +109,6 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable { +public class CellphoneProvider implements SmsProvider { /** * Serial number @@ -114,14 +114,9 @@ public class CellphoneProvider implements SmsProvider, Comparable { 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; -- 2.39.5