Add missing '@Override' annotations to implementations of interface methods.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1739388 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/examples/ftp/FTPClientExample.java b/src/main/java/examples/ftp/FTPClientExample.java
index 3fc13c9..3e00508 100644
--- a/src/main/java/examples/ftp/FTPClientExample.java
+++ b/src/main/java/examples/ftp/FTPClientExample.java
@@ -534,11 +534,13 @@
         return new CopyStreamListener(){
             private long megsTotal = 0;
 //            @Override
+            @Override
             public void bytesTransferred(CopyStreamEvent event) {
                 bytesTransferred(event.getTotalBytesTransferred(), event.getBytesTransferred(), event.getStreamSize());
             }
 
 //            @Override
+            @Override
             public void bytesTransferred(long totalBytesTransferred,
                     int bytesTransferred, long streamSize) {
                 long megs = totalBytesTransferred / 1000000;
diff --git a/src/main/java/examples/mail/IMAPExportMbox.java b/src/main/java/examples/mail/IMAPExportMbox.java
index 18422b9..38b498c 100644
--- a/src/main/java/examples/mail/IMAPExportMbox.java
+++ b/src/main/java/examples/mail/IMAPExportMbox.java
@@ -337,6 +337,7 @@
           this.checkSequence = checkSequence;
         }
 
+        @Override
         public boolean chunkReceived(IMAP imap) {
             final String[] replyStrings = imap.getReplyStrings();
             Date received = new Date();
diff --git a/src/main/java/examples/ntp/SimpleNTPServer.java b/src/main/java/examples/ntp/SimpleNTPServer.java
index b3b8da8..bf04df4 100644
--- a/src/main/java/examples/ntp/SimpleNTPServer.java
+++ b/src/main/java/examples/ntp/SimpleNTPServer.java
@@ -132,6 +132,7 @@
     /**
      * main thread to service client connections.
      */
+    @Override
     public void run()
     {
         running = true;
diff --git a/src/main/java/examples/telnet/TelnetClientExample.java b/src/main/java/examples/telnet/TelnetClientExample.java
index 4c7199b..4b58609 100644
--- a/src/main/java/examples/telnet/TelnetClientExample.java
+++ b/src/main/java/examples/telnet/TelnetClientExample.java
@@ -279,6 +279,7 @@
      * @param option_code - code of the option negotiated
      ***/
 //    @Override
+    @Override
     public void receivedNegotiation(int negotiation_code, int option_code)
     {
         String command = null;
@@ -311,6 +312,7 @@
      * on the screen.
      ***/
 //    @Override
+    @Override
     public void run()
     {
         InputStream instr = tc.getInputStream();
diff --git a/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java b/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
index 751aa35..e3a4195 100644
--- a/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
+++ b/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
@@ -43,6 +43,7 @@
      * @exception SocketException If the socket could not be created.
      ***/
 //    @Override
+    @Override
     public DatagramSocket createDatagramSocket() throws SocketException
     {
         return new DatagramSocket();
@@ -56,6 +57,7 @@
      * @exception SocketException If the socket could not be created.
      ***/
 //    @Override
+    @Override
     public DatagramSocket createDatagramSocket(int port) throws SocketException
     {
         return new DatagramSocket(port);
@@ -71,6 +73,7 @@
      * @exception SocketException If the socket could not be created.
      ***/
 //    @Override
+    @Override
     public DatagramSocket createDatagramSocket(int port, InetAddress laddr)
     throws SocketException
     {
diff --git a/src/main/java/org/apache/commons/net/PrintCommandListener.java b/src/main/java/org/apache/commons/net/PrintCommandListener.java
index c946951..e6f4530 100644
--- a/src/main/java/org/apache/commons/net/PrintCommandListener.java
+++ b/src/main/java/org/apache/commons/net/PrintCommandListener.java
@@ -147,6 +147,7 @@
     }
 
 //    @Override
+    @Override
     public void protocolCommandSent(ProtocolCommandEvent event)
     {
         if (__directionMarker) {
@@ -189,6 +190,7 @@
         return msg;
     }
 //    @Override
+    @Override
     public void protocolReplyReceived(ProtocolCommandEvent event)
     {
         if (__directionMarker) {
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 413af48..aa356af 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -3648,6 +3648,7 @@
      * @since 1.4
      */
 //    @Override
+    @Override
     public void configure(FTPClientConfig config) {
         this.__configuration = config;
     }
@@ -3813,11 +3814,13 @@
         }
 
 //        @Override
+        @Override
         public void bytesTransferred(CopyStreamEvent event) {
             bytesTransferred(event.getTotalBytesTransferred(), event.getBytesTransferred(), event.getStreamSize());
         }
 
 //        @Override
+        @Override
         public void bytesTransferred(long totalBytesTransferred,
                 int bytesTransferred, long streamSize) {
             long now = System.currentTimeMillis();
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java b/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
index 93da907..f96732a 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
@@ -48,6 +48,7 @@
      * @exception java.io.IOException thrown on any IO Error reading from the reader.
      */
 //    @Override
+    @Override
     public String readNextEntry(BufferedReader reader) throws IOException
     {
         return reader.readLine();
@@ -65,6 +66,7 @@
      * @return <code>original</code> unmodified.
      */
 //     @Override
+    @Override
     public List<String> preParse(List<String> original) {
          return original;
      }
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java b/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
index 97f2e86..f0e3444 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
@@ -29,6 +29,7 @@
      */
     public static final FTPFileFilter ALL = new FTPFileFilter() {
 //        @Override
+        @Override
         public boolean accept(FTPFile file) {
             return true;
         }
@@ -39,6 +40,7 @@
      */
     public static final FTPFileFilter NON_NULL = new FTPFileFilter() {
 //        @Override
+        @Override
         public boolean accept(FTPFile file) {
             return file != null;
         }
@@ -49,6 +51,7 @@
      */
     public static final FTPFileFilter DIRECTORIES = new FTPFileFilter() {
 //        @Override
+        @Override
         public boolean accept(FTPFile file) {
             return file != null && file.isDirectory();
         }
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java b/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
index ca39a5e..3158b0f 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
@@ -38,12 +38,14 @@
      * No-op
      */
 //    @Override
+    @Override
     public void checkClientTrusted(X509Certificate[] certificates, String authType)
     {
         return;
     }
 
 //    @Override
+    @Override
     public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException
     {
         for (X509Certificate certificate : certificates)
@@ -53,6 +55,7 @@
     }
 
 //    @Override
+    @Override
     public X509Certificate[] getAcceptedIssuers()
     {
         return EMPTY_X509CERTIFICATE_ARRAY;
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
index 3d564f6..c8712be 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
@@ -42,6 +42,7 @@
     }
 
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String listEntry)
     {
         if (cachedFtpFileEntryParser != null)
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java b/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
index 35693b7..6d9a4e3 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
@@ -99,6 +99,7 @@
      * each concrete subclass is used instead.
      */
 //    @Override
+    @Override
     public void configure(FTPClientConfig config)
     {
         if (this.timestampParser instanceof Configurable) {
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
index 14a63b6..7f49430 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
@@ -86,6 +86,7 @@
      * @see FTPFileEntryParser
      */
 //    @Override
+    @Override
     public FTPFileEntryParser createFileEntryParser(String key)
     {
         if (key == null) {
@@ -198,6 +199,7 @@
      * @since 1.4
      */
 //    @Override
+    @Override
     public FTPFileEntryParser createFileEntryParser(FTPClientConfig config)
     throws ParserInitializationException
     {
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
index 6f4cd4a..3183f42 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
@@ -84,6 +84,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry)
     {
 
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java b/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
index ed73634..082de64 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
@@ -165,6 +165,7 @@
      * @return a Calendar with the parsed timestamp
      */
 //    @Override
+    @Override
     public Calendar parseTimestamp(String timestampStr) throws ParseException {
         Calendar now = Calendar.getInstance();
         return parseTimestamp(timestampStr, now);
@@ -364,6 +365,7 @@
      * </p>
      */
 //    @Override
+    @Override
     public void configure(FTPClientConfig config) {
         DateFormatSymbols dfs = null;
 
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
index 81615c6..497fb50 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
@@ -94,6 +94,7 @@
     }
 
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry) {
         if (entry.startsWith(" ")) {// leading space means no facts are present
             if (entry.length() > 1) { // is there a path name?
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
index 4942da9..e55e64c 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
@@ -259,6 +259,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry) {
         boolean isParsed = false;
         FTPFile f = new FTPFile();
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
index 47af2ea..05c0936 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
@@ -126,6 +126,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry) {
         FTPFile file = new FTPFile();
         file.setRawListing(entry);
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
index 4eaa643..4d14de9 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
@@ -97,6 +97,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry)
     {
         FTPFile f = new FTPFile();
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
index 29f19bc..8f92cf8 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
@@ -112,6 +112,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry) {
 
         FTPFile f = new FTPFile();
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
index 64ee53e..17c2edb 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
@@ -85,6 +85,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry)
     {
 
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
index 9f3e4a1..80d7b1a 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
@@ -279,6 +279,7 @@
 
 
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry)
     {
 
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
index 13b7004..c5d467f 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
@@ -207,6 +207,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry) {
         FTPFile file = new FTPFile();
         file.setRawListing(entry);
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
index be11af3..d2534a5 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
@@ -104,6 +104,7 @@
      * @return An FTPFile instance corresponding to the supplied entry
      */
 //    @Override
+    @Override
     public FTPFile parseFTPEntry(String entry)
     {
         //one block in VMS equals 512 bytes
diff --git a/src/main/java/org/apache/commons/net/imap/IMAP.java b/src/main/java/org/apache/commons/net/imap/IMAP.java
index 0ab97f7..b255e2b 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAP.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAP.java
@@ -101,6 +101,7 @@
      * @since 3.4
      */
     public static final IMAPChunkListener TRUE_CHUNK_LISTENER = new IMAPChunkListener(){
+        @Override
         public boolean chunkReceived(IMAP imap) {
             return true;
         }
diff --git a/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java b/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
index eb88709..07269dd 100644
--- a/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
+++ b/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
@@ -61,6 +61,7 @@
      *              bytes.
      */
 //    @Override
+    @Override
     public void bytesTransferred(CopyStreamEvent event)
     {
         for (EventListener listener : internalListeners)
@@ -85,6 +86,7 @@
      *        the size is unknown.
      */
 //    @Override
+    @Override
     public void bytesTransferred(long totalBytesTransferred,
                                  int bytesTransferred, long streamSize)
     {
diff --git a/src/main/java/org/apache/commons/net/nntp/Article.java b/src/main/java/org/apache/commons/net/nntp/Article.java
index 57c8e84..18c2151 100644
--- a/src/main/java/org/apache/commons/net/nntp/Article.java
+++ b/src/main/java/org/apache/commons/net/nntp/Article.java
@@ -228,21 +228,25 @@
 
 
 //    @Override
+    @Override
     public boolean isDummy() {
         return (articleNumber == -1);
     }
 
 //    @Override
+    @Override
     public String messageThreadId() {
         return articleId;
     }
 
 //    @Override
+    @Override
     public String[] messageThreadReferences() {
         return getReferences();
     }
 
 //    @Override
+    @Override
     public String simplifiedSubject() {
         if(simplifiedSubject == null) {
             simplifySubject();
@@ -252,12 +256,14 @@
 
 
 //    @Override
+    @Override
     public boolean subjectIsReply() {
         return isReply;
     }
 
 
 //    @Override
+    @Override
     public void setChild(Threadable child) {
         this.kid = (Article) child;
         flushSubjectCache();
@@ -269,6 +275,7 @@
 
 
 //    @Override
+    @Override
     public void setNext(Threadable next) {
         this.next = (Article)next;
         flushSubjectCache();
@@ -276,6 +283,7 @@
 
 
 //    @Override
+    @Override
     public Threadable makeDummy() {
         return new Article();
     }
diff --git a/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java b/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
index aa9970f..6a56c5f 100644
--- a/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
+++ b/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
@@ -33,6 +33,7 @@
     }
 
 //    @Override
+    @Override
     public boolean hasNext() {
         return stringIterator.hasNext();
     }
@@ -43,16 +44,19 @@
      * will be true, and the subject will contain the raw info.
      */
 //    @Override
+    @Override
     public Article next() {
         String line = stringIterator.next();
         return NNTPClient.__parseArticleEntry(line);
     }
 
 //    @Override
+    @Override
     public void remove() {
         stringIterator.remove();
     }
 //    @Override
+    @Override
     public Iterator<Article> iterator() {
         return this;
     }
diff --git a/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java b/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
index 67f5c43..bbd2b1c 100644
--- a/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
+++ b/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
@@ -33,22 +33,26 @@
     }
 
 //    @Override
+    @Override
     public boolean hasNext() {
         return stringIterator.hasNext();
     }
 
 //    @Override
+    @Override
     public NewsgroupInfo next() {
         String line = stringIterator.next();
         return NNTPClient.__parseNewsgroupListEntry(line);
     }
 
 //    @Override
+    @Override
     public void remove() {
         stringIterator.remove();
     }
 
 //    @Override
+    @Override
     public Iterator<NewsgroupInfo> iterator() {
         return this;
     }
diff --git a/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java b/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
index 7ae146d..1ebd969 100644
--- a/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
+++ b/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
@@ -58,6 +58,7 @@
     }
 
 //    @Override
+    @Override
     public boolean hasNext() {
         if (savedException != null){
             throw new NoSuchElementException(savedException.toString());
@@ -66,6 +67,7 @@
     }
 
 //    @Override
+    @Override
     public String next() throws NoSuchElementException {
         if (savedException != null){
             throw new NoSuchElementException(savedException.toString());
@@ -87,11 +89,13 @@
     }
 
 //    @Override
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
 
 //    @Override
+    @Override
     public Iterator<String> iterator() {
         return this;
     }
diff --git a/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java b/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
index 661bbc3..7dd7b7f 100644
--- a/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
+++ b/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
@@ -68,6 +68,7 @@
      * @return mode as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getMode()
     {
         return (ui(buf[MODE_INDEX]) >> MODE_SHIFT) & 0x7;
@@ -79,6 +80,7 @@
      * @return mode name as string.
      */
 //    @Override
+    @Override
     public String getModeName()
     {
         return NtpUtils.getModeName(getMode());
@@ -90,6 +92,7 @@
      * @param mode the mode to set
      */
 //    @Override
+    @Override
     public void setMode(int mode)
     {
         buf[MODE_INDEX] = (byte) (buf[MODE_INDEX] & 0xF8 | mode & 0x7);
@@ -105,6 +108,7 @@
      * @return leap indicator as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getLeapIndicator()
     {
         return (ui(buf[LI_INDEX]) >> LI_SHIFT) & 0x3;
@@ -116,6 +120,7 @@
      * @param li leap indicator.
      */
 //    @Override
+    @Override
     public void setLeapIndicator(int li)
     {
         buf[LI_INDEX] = (byte) (buf[LI_INDEX] & 0x3F | ((li & 0x3) << LI_SHIFT));
@@ -131,6 +136,7 @@
      * @return poll interval as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getPoll()
     {
         return buf[POLL_INDEX];
@@ -142,6 +148,7 @@
      * @param poll poll interval.
      */
 //    @Override
+    @Override
     public void setPoll(int poll)
     {
         buf[POLL_INDEX] = (byte) (poll & 0xFF);
@@ -155,6 +162,7 @@
      * @return precision as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getPrecision()
     {
         return buf[PRECISION_INDEX];
@@ -165,6 +173,7 @@
      * @param precision the precision to set
      * @since 3.4
      */
+    @Override
     public void setPrecision(int precision)
     {
         buf[PRECISION_INDEX] = (byte) (precision & 0xFF);
@@ -176,6 +185,7 @@
      * @return NTP version number.
      */
 //    @Override
+    @Override
     public int getVersion()
     {
         return (ui(buf[VERSION_INDEX]) >> VERSION_SHIFT) & 0x7;
@@ -187,6 +197,7 @@
      * @param version NTP version.
      */
 //    @Override
+    @Override
     public void setVersion(int version)
     {
         buf[VERSION_INDEX] = (byte) (buf[VERSION_INDEX] & 0xC7 | ((version & 0x7) << VERSION_SHIFT));
@@ -200,6 +211,7 @@
      * @return Stratum level as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getStratum()
     {
         return ui(buf[STRATUM_INDEX]);
@@ -211,6 +223,7 @@
      * @param stratum stratum level.
      */
 //    @Override
+    @Override
     public void setStratum(int stratum)
     {
         buf[STRATUM_INDEX] = (byte) (stratum & 0xFF);
@@ -224,6 +237,7 @@
      * @return root delay as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getRootDelay()
     {
         return getInt(ROOT_DELAY_INDEX);
@@ -236,6 +250,7 @@
      * @since 3.4
      */
 //    @Override
+    @Override
     public void setRootDelay(int delay)
     {
         setInt(ROOT_DELAY_INDEX, delay);
@@ -250,6 +265,7 @@
      * @return root delay in milliseconds
      */
 //    @Override
+    @Override
     public double getRootDelayInMillisDouble()
     {
         double l = getRootDelay();
@@ -261,6 +277,7 @@
      * @return root dispersion.
      */
 //    @Override
+    @Override
     public int getRootDispersion()
     {
         return getInt(ROOT_DISPERSION_INDEX);
@@ -273,6 +290,7 @@
      * @since 3.4
      */
 //    @Override
+    @Override
     public void setRootDispersion(int dispersion)
     {
         setInt(ROOT_DISPERSION_INDEX, dispersion);
@@ -284,6 +302,7 @@
      * @return root dispersion in milliseconds
      */
 //    @Override
+    @Override
     public long getRootDispersionInMillis()
     {
         long l = getRootDispersion();
@@ -297,6 +316,7 @@
      * @return root dispersion in milliseconds
      */
 //    @Override
+    @Override
     public double getRootDispersionInMillisDouble()
     {
         double l = getRootDispersion();
@@ -310,6 +330,7 @@
      * @param refId reference clock identifier.
      */
 //    @Override
+    @Override
     public void setReferenceId(int refId)
     {
         setInt(REFERENCE_ID_INDEX, refId);
@@ -322,6 +343,7 @@
      * @return the reference id as defined in RFC-1305.
      */
 //    @Override
+    @Override
     public int getReferenceId()
     {
         return getInt(REFERENCE_ID_INDEX);
@@ -336,6 +358,7 @@
      * @return the reference id string.
      */
 //    @Override
+    @Override
     public String getReferenceIdString()
     {
         int version = getVersion();
@@ -395,6 +418,7 @@
      * Never returns a null object.
      */
 //    @Override
+    @Override
     public TimeStamp getTransmitTimeStamp()
     {
         return getTimestamp(TRANSMIT_TIMESTAMP_INDEX);
@@ -407,6 +431,7 @@
      * @param ts NTP timestamp
      */
 //    @Override
+    @Override
     public void setTransmitTime(TimeStamp ts)
     {
         setTimestamp(TRANSMIT_TIMESTAMP_INDEX, ts);
@@ -419,6 +444,7 @@
      * @param ts NTP timestamp
      */
 //    @Override
+    @Override
     public void setOriginateTimeStamp(TimeStamp ts)
     {
         setTimestamp(ORIGINATE_TIMESTAMP_INDEX, ts);
@@ -431,6 +457,7 @@
      * Never returns null.
      */
 //    @Override
+    @Override
     public TimeStamp getOriginateTimeStamp()
     {
         return getTimestamp(ORIGINATE_TIMESTAMP_INDEX);
@@ -443,6 +470,7 @@
      * Never returns null.
      */
 //    @Override
+    @Override
     public TimeStamp getReferenceTimeStamp()
     {
         return getTimestamp(REFERENCE_TIMESTAMP_INDEX);
@@ -455,6 +483,7 @@
      * @param ts NTP timestamp
      */
 //    @Override
+    @Override
     public void setReferenceTime(TimeStamp ts)
     {
         setTimestamp(REFERENCE_TIMESTAMP_INDEX, ts);
@@ -467,6 +496,7 @@
      * Never returns null.
      */
 //    @Override
+    @Override
     public TimeStamp getReceiveTimeStamp()
     {
         return getTimestamp(RECEIVE_TIMESTAMP_INDEX);
@@ -479,6 +509,7 @@
      * @param ts timestamp
      */
 //    @Override
+    @Override
     public void setReceiveTimeStamp(TimeStamp ts)
     {
         setTimestamp(RECEIVE_TIMESTAMP_INDEX, ts);
@@ -491,6 +522,7 @@
      * @return packet type string identifier which in this case is "NTP".
      */
 //    @Override
+    @Override
     public String getType()
     {
         return "NTP";
@@ -576,6 +608,7 @@
      * @return a datagram packet.
      */
 //    @Override
+    @Override
     public synchronized DatagramPacket getDatagramPacket()
     {
         if (dp == null) {
@@ -592,6 +625,7 @@
      * @throws IllegalArgumentException if srcDp is null or byte length is less than minimum length of 48 bytes
      */
 //    @Override
+    @Override
     public void setDatagramPacket(DatagramPacket srcDp)
     {
         if (srcDp == null || srcDp.getLength() < buf.length) {
diff --git a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
index 981c112..9595328 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
@@ -445,6 +445,7 @@
      *          (signed comparison).
      */
 //    @Override
+    @Override
     public int compareTo(TimeStamp anotherTimeStamp)
     {
         long thisVal = this.ntpTime;
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
index 5c04f16..9e14bf1 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
@@ -589,6 +589,7 @@
     }
 
 //    @Override
+    @Override
     public void run()
     {
         int ch;
diff --git a/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java b/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
index 1a66385..cc94072 100644
--- a/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
+++ b/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
@@ -209,6 +209,7 @@
 
         // Call sequence: 1
 //        @Override
+        @Override
         public String chooseClientAlias(String[] keyType, Principal[] issuers,
                 Socket socket) {
             return keyStore.getAlias();
@@ -216,27 +217,32 @@
 
         // Call sequence: 2
 //        @Override
+        @Override
         public X509Certificate[] getCertificateChain(String alias) {
             return keyStore.getCertificateChain();
         }
 
 //        @Override
+        @Override
         public String[] getClientAliases(String keyType, Principal[] issuers) {
             return new String[]{ keyStore.getAlias()};
         }
 
         // Call sequence: 3
 //        @Override
+        @Override
         public PrivateKey getPrivateKey(String alias) {
             return keyStore.getPrivateKey();
         }
 
 //        @Override
+        @Override
         public String[] getServerAliases(String keyType, Principal[] issuers) {
             return null;
         }
 
 //        @Override
+        @Override
         public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
             return null;
         }
diff --git a/src/main/java/org/apache/commons/net/util/ListenerList.java b/src/main/java/org/apache/commons/net/util/ListenerList.java
index 178f3ba..8b48615 100644
--- a/src/main/java/org/apache/commons/net/util/ListenerList.java
+++ b/src/main/java/org/apache/commons/net/util/ListenerList.java
@@ -59,6 +59,7 @@
      * TODO Check that this is a good defensive strategy
      */
 //    @Override
+    @Override
     public Iterator<EventListener> iterator() {
             return __listeners.iterator();
     }
diff --git a/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java b/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
index a2412ae..01bac44 100644
--- a/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
+++ b/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
@@ -46,12 +46,14 @@
          * Never generates a CertificateException.
          */
 //        @Override
+        @Override
         public void checkClientTrusted(X509Certificate[] certificates, String authType)
         {
             return;
         }
 
 //        @Override
+        @Override
         public void checkServerTrusted(X509Certificate[] certificates, String authType)
             throws CertificateException
         {
@@ -67,6 +69,7 @@
          * @return an empty array of certificates
          */
 //        @Override
+        @Override
         public X509Certificate[] getAcceptedIssuers()
         {
             return EMPTY_X509CERTIFICATE_ARRAY;
diff --git a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
index 9db2837..4b2bbd7 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
@@ -100,6 +100,7 @@
         TreeSet<FTPFile> sorted = new TreeSet<FTPFile>(new Comparator<Object>() {
 
 //            @Override
+            @Override
             public int compare(Object o1, Object o2) {
                 FTPFile f1 = (FTPFile) o1;
                 FTPFile f2 = (FTPFile) o2;
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
index bdaed63..7afd4b9 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
@@ -44,6 +44,7 @@
 
     private final Comparator<FTPFile> cmp = new Comparator<FTPFile>() {
 //        @Override
+        @Override
         public int compare(FTPFile o1, FTPFile o2) {
                 String n1 = o1.getName();
                 String n2 = o2.getName();
@@ -56,6 +57,7 @@
         File path = new File(DownloadListings.DOWNLOAD_DIR);
         FilenameFilter filter = new FilenameFilter(){
 //            @Override
+            @Override
             public boolean accept(File dir, String name) {
                 return name.endsWith("_mlsd.txt");
             }
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
index 499171b..4c56919 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -879,6 +879,7 @@
      * <p>
      */
 //    @Override
+    @Override
     public void receivedNegotiation(int negotiation_code, int option_code)
     {
         if(negotiation_code == TelnetNotificationHandler.RECEIVED_DO)
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java b/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
index 5a45ebc..81a89e1 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
@@ -59,6 +59,7 @@
      * Runs the responder
      ***/
 //    @Override
+    @Override
     public void run()
     {
         boolean result = false;
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
index 1f5605f..00e30a0 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
@@ -48,6 +48,7 @@
     }
 
 //    @Override
+    @Override
     public void run()
     {
         boolean bError = false;
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index 54620e4..9d8bf4b 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -272,6 +272,7 @@
     }
 
 //    @Override
+    @Override
     public void run()
     {
         try
@@ -374,6 +375,7 @@
         }
 
 //        @Override
+        @Override
         public void run()
         {
             try
diff --git a/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java b/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
index 26968a3..49ec812 100644
--- a/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
+++ b/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
@@ -96,6 +96,7 @@
     }
 
 //    @Override
+    @Override
     public void run()
     {
         Socket socket = null;
diff --git a/src/test/java/org/apache/commons/net/util/UtilTest.java b/src/test/java/org/apache/commons/net/util/UtilTest.java
index 3185f5e..2156131 100644
--- a/src/test/java/org/apache/commons/net/util/UtilTest.java
+++ b/src/test/java/org/apache/commons/net/util/UtilTest.java
@@ -172,9 +172,11 @@
             this.expectedBytes = bytesTransferred;
             this.expectedSize = streamSize;
         }
+        @Override
         public void bytesTransferred(CopyStreamEvent event) {
         }
 
+        @Override
         public void bytesTransferred(long totalBytesTransferred, int bytesTransferred, long streamSize) {
             Assert.assertEquals("Wrong total", expectedTotal, totalBytesTransferred);
             Assert.assertEquals("Wrong streamSize", expectedSize, streamSize);
@@ -195,9 +197,11 @@
             this.expectedTotal = totalBytesTransferred;
             this.expectedBytes = bytesTransferred;
         }
+        @Override
         public void bytesTransferred(CopyStreamEvent event) {
         }
 
+        @Override
         public void bytesTransferred(long totalBytesTransferred, int bytesTransferred, long streamSize) {
             Assert.assertEquals("Wrong bytes", expectedBytes, bytesTransferred);
             this.totalBytesTransferredTotal = totalBytesTransferred;