Stale comments
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1741829 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/checkstyle.xml b/checkstyle.xml
index 006b23f..987b86e 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -63,9 +63,9 @@
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
<module name="ModifierOrder"/>
-
+
<!--module name="RedundantModifier"/-->
-
+
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<!--module name="AvoidNestedBlocks"/-->
@@ -81,7 +81,7 @@
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
</module>
-
+
</module>
<module name="SuppressionCommentFilter"/>
@@ -91,7 +91,7 @@
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
</module>
- <!--
+ <!--
Allow comment to suppress checkstyle for a single line
e.g. // CHECKSTYLE IGNORE MagicNumber
-->
diff --git a/pom.xml b/pom.xml
index 41278e4..17bbc73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,10 +414,10 @@
</configuration>
</plugin>
- <!--
+ <!--
Allow exec:java to launch examples from the classpath
For example:
-
+
mvn -q exec:java -Dexec.arguments=FTPClientExample,-A,-l,hostname
-->
<plugin>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6f0b777..b4d5cba 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -68,7 +68,7 @@
This release is binary compatible with previous releases.
However it is not source compatible with releases before 3.4, as some methods were added to the interface NtpV3Packet in 3.4
-
+
The code now requires a minimum of Java 1.6.
Notable additions:
@@ -100,7 +100,6 @@
IMAPExportMbox (example app) allows IMAP folders to be exported into an mbox file.
This is the inverse of the IMAPImportMbox example added previously
">
-
<action issue="NET-581" type="fix" dev="sebb">
SimpleSMTPHeader fails to supply the required Date: header
</action>
diff --git a/src/main/java/examples/ftp/FTPClientExample.java b/src/main/java/examples/ftp/FTPClientExample.java
index 3e00508..79af91e 100644
--- a/src/main/java/examples/ftp/FTPClientExample.java
+++ b/src/main/java/examples/ftp/FTPClientExample.java
@@ -533,13 +533,12 @@
private static CopyStreamListener createListener(){
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) {
diff --git a/src/main/java/examples/telnet/TelnetClientExample.java b/src/main/java/examples/telnet/TelnetClientExample.java
index 4b58609..9d9449e 100644
--- a/src/main/java/examples/telnet/TelnetClientExample.java
+++ b/src/main/java/examples/telnet/TelnetClientExample.java
@@ -278,7 +278,6 @@
* (RECEIVED_DO, RECEIVED_DONT, RECEIVED_WILL, RECEIVED_WONT, RECEIVED_COMMAND)
* @param option_code - code of the option negotiated
***/
-// @Override
@Override
public void receivedNegotiation(int negotiation_code, int option_code)
{
@@ -311,7 +310,6 @@
* Reads lines from the TelnetClient and echoes them
* on the screen.
***/
-// @Override
@Override
public void run()
{
diff --git a/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java b/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
index e3a4195..6f46619 100644
--- a/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
+++ b/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
@@ -42,7 +42,6 @@
* @return a new DatagramSocket
* @exception SocketException If the socket could not be created.
***/
-// @Override
@Override
public DatagramSocket createDatagramSocket() throws SocketException
{
@@ -56,7 +55,6 @@
* @return a new DatagramSocket
* @exception SocketException If the socket could not be created.
***/
-// @Override
@Override
public DatagramSocket createDatagramSocket(int port) throws SocketException
{
@@ -72,7 +70,6 @@
* @return a new DatagramSocket
* @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 e6f4530..8fff4ed 100644
--- a/src/main/java/org/apache/commons/net/PrintCommandListener.java
+++ b/src/main/java/org/apache/commons/net/PrintCommandListener.java
@@ -146,7 +146,6 @@
__directionMarker = showDirection;
}
-// @Override
@Override
public void protocolCommandSent(ProtocolCommandEvent event)
{
@@ -189,7 +188,7 @@
}
return msg;
}
-// @Override
+
@Override
public void protocolReplyReceived(ProtocolCommandEvent event)
{
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 aa356af..107515a 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -3647,7 +3647,6 @@
* provide non-standard configurations to the parser.
* @since 1.4
*/
-// @Override
@Override
public void configure(FTPClientConfig config) {
this.__configuration = config;
@@ -3813,13 +3812,11 @@
parent.setSoTimeout(maxWait);
}
-// @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) {
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 f96732a..f6a83df 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
@@ -47,7 +47,6 @@
* @return A string representing the next ftp entry or null if none found.
* @exception java.io.IOException thrown on any IO Error reading from the reader.
*/
-// @Override
@Override
public String readNextEntry(BufferedReader reader) throws IOException
{
@@ -65,7 +64,6 @@
*
* @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 f0e3444..29eba60 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
@@ -28,7 +28,6 @@
* Accepts all FTPFile entries, including null.
*/
public static final FTPFileFilter ALL = new FTPFileFilter() {
-// @Override
@Override
public boolean accept(FTPFile file) {
return true;
@@ -39,7 +38,6 @@
* Accepts all non-null FTPFile entries.
*/
public static final FTPFileFilter NON_NULL = new FTPFileFilter() {
-// @Override
@Override
public boolean accept(FTPFile file) {
return file != null;
@@ -50,7 +48,6 @@
* Accepts all (non-null) FTPFile directory entries.
*/
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 3158b0f..56fbea2 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
@@ -37,14 +37,12 @@
/**
* No-op
*/
-// @Override
@Override
public void checkClientTrusted(X509Certificate[] certificates, String authType)
{
return;
}
-// @Override
@Override
public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException
{
@@ -54,7 +52,6 @@
}
}
-// @Override
@Override
public X509Certificate[] getAcceptedIssuers()
{
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 c8712be..7c26643 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
@@ -41,7 +41,6 @@
this.ftpFileEntryParsers = ftpFileEntryParsers;
}
-// @Override
@Override
public FTPFile parseFTPEntry(String listEntry)
{
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 6d9a4e3..d61693e 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
@@ -98,7 +98,6 @@
* If it is null, a default configuration defined by
* each concrete subclass is used instead.
*/
-// @Override
@Override
public void configure(FTPClientConfig config)
{
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 7f49430..4a6b0ba 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
@@ -85,7 +85,6 @@
* the supplied key into an FTPFileEntryParser.
* @see FTPFileEntryParser
*/
-// @Override
@Override
public FTPFileEntryParser createFileEntryParser(String key)
{
@@ -198,7 +197,6 @@
* @throws NullPointerException if {@code config} is {@code null}
* @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 3183f42..b43e2ab 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
@@ -83,7 +83,6 @@
* @param entry A line of text from the file listing
* @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 082de64..44cfec7 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
@@ -164,7 +164,6 @@
* @param timestampStr The timestamp to be parsed
* @return a Calendar with the parsed timestamp
*/
-// @Override
@Override
public Calendar parseTimestamp(String timestampStr) throws ParseException {
Calendar now = Calendar.getInstance();
@@ -364,7 +363,6 @@
* been configured.
* </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 497fb50..6cdf9ea 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
@@ -93,7 +93,6 @@
super();
}
-// @Override
@Override
public FTPFile parseFTPEntry(String entry) {
if (entry.startsWith(" ")) {// leading space means no facts are present
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 e55e64c..184e341 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
@@ -258,7 +258,6 @@
* A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
-// @Override
@Override
public FTPFile parseFTPEntry(String entry) {
boolean isParsed = false;
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 05c0936..1718c1c 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
@@ -125,7 +125,6 @@
* @param entry A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
-// @Override
@Override
public FTPFile parseFTPEntry(String entry) {
FTPFile file = new FTPFile();
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 4d14de9..13408c6 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
@@ -96,7 +96,6 @@
* @param entry A line of text from the file listing
* @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/NetwareFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
index 8f92cf8..ae0cd44 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
@@ -111,7 +111,6 @@
* @param entry A line of text from the file listing
* @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/OS2FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
index 17c2edb..74ebab2 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
@@ -84,7 +84,6 @@
* @param entry A line of text from the file listing
* @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 80d7b1a..3d0ae1e 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
@@ -278,7 +278,6 @@
}
-// @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 c5d467f..894d0bc 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
@@ -206,7 +206,6 @@
* @param entry A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
-// @Override
@Override
public FTPFile parseFTPEntry(String entry) {
FTPFile file = new FTPFile();
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 d2534a5..4c66a48 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
@@ -103,7 +103,6 @@
* @param entry A line of text from the file listing
* @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/io/CopyStreamAdapter.java b/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
index 07269dd..89539d1 100644
--- a/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
+++ b/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
@@ -60,7 +60,6 @@
* @param event The CopyStreamEvent fired by the copying of a block of
* bytes.
*/
-// @Override
@Override
public void bytesTransferred(CopyStreamEvent event)
{
@@ -85,7 +84,6 @@
* This may be equal to CopyStreamEvent.UNKNOWN_STREAM_SIZE if
* 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 18c2151..ba23507 100644
--- a/src/main/java/org/apache/commons/net/nntp/Article.java
+++ b/src/main/java/org/apache/commons/net/nntp/Article.java
@@ -227,25 +227,21 @@
}
-// @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) {
@@ -255,14 +251,12 @@
}
-// @Override
@Override
public boolean subjectIsReply() {
return isReply;
}
-// @Override
@Override
public void setChild(Threadable child) {
this.kid = (Article) child;
@@ -274,7 +268,6 @@
}
-// @Override
@Override
public void setNext(Threadable next) {
this.next = (Article)next;
@@ -282,7 +275,6 @@
}
-// @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 6a56c5f..ef82ba6 100644
--- a/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
+++ b/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
@@ -32,7 +32,6 @@
stringIterator = iterableString.iterator();
}
-// @Override
@Override
public boolean hasNext() {
return stringIterator.hasNext();
@@ -43,19 +42,17 @@
* @return the next {@link Article}, never {@code null}, if unparseable then isDummy()
* 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 bbd2b1c..8171461 100644
--- a/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
+++ b/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
@@ -32,26 +32,22 @@
stringIterator = iterableString.iterator();
}
-// @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 1ebd969..b20136d 100644
--- a/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
+++ b/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
@@ -57,7 +57,6 @@
this(_reader, true);
}
-// @Override
@Override
public boolean hasNext() {
if (savedException != null){
@@ -66,7 +65,6 @@
return line != null;
}
-// @Override
@Override
public String next() throws NoSuchElementException {
if (savedException != null){
@@ -88,13 +86,11 @@
return prev;
}
-// @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 7dd7b7f..b1e33cb 100644
--- a/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
+++ b/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
@@ -67,7 +67,6 @@
*
* @return mode as defined in RFC-1305.
*/
-// @Override
@Override
public int getMode()
{
@@ -79,7 +78,6 @@
* RFC 1305.
* @return mode name as string.
*/
-// @Override
@Override
public String getModeName()
{
@@ -91,7 +89,6 @@
*
* @param mode the mode to set
*/
-// @Override
@Override
public void setMode(int mode)
{
@@ -107,7 +104,6 @@
*
* @return leap indicator as defined in RFC-1305.
*/
-// @Override
@Override
public int getLeapIndicator()
{
@@ -119,7 +115,6 @@
*
* @param li leap indicator.
*/
-// @Override
@Override
public void setLeapIndicator(int li)
{
@@ -135,7 +130,6 @@
*
* @return poll interval as defined in RFC-1305.
*/
-// @Override
@Override
public int getPoll()
{
@@ -147,7 +141,6 @@
*
* @param poll poll interval.
*/
-// @Override
@Override
public void setPoll(int poll)
{
@@ -161,7 +154,6 @@
*
* @return precision as defined in RFC-1305.
*/
-// @Override
@Override
public int getPrecision()
{
@@ -184,7 +176,6 @@
*
* @return NTP version number.
*/
-// @Override
@Override
public int getVersion()
{
@@ -196,7 +187,6 @@
*
* @param version NTP version.
*/
-// @Override
@Override
public void setVersion(int version)
{
@@ -210,7 +200,6 @@
*
* @return Stratum level as defined in RFC-1305.
*/
-// @Override
@Override
public int getStratum()
{
@@ -222,7 +211,6 @@
*
* @param stratum stratum level.
*/
-// @Override
@Override
public void setStratum(int stratum)
{
@@ -236,7 +224,6 @@
*
* @return root delay as defined in RFC-1305.
*/
-// @Override
@Override
public int getRootDelay()
{
@@ -249,7 +236,6 @@
* @param delay root delay
* @since 3.4
*/
-// @Override
@Override
public void setRootDelay(int delay)
{
@@ -264,7 +250,6 @@
*
* @return root delay in milliseconds
*/
-// @Override
@Override
public double getRootDelayInMillisDouble()
{
@@ -276,7 +261,6 @@
* Returns root dispersion as defined in RFC-1305.
* @return root dispersion.
*/
-// @Override
@Override
public int getRootDispersion()
{
@@ -289,7 +273,6 @@
* @param dispersion root dispersion
* @since 3.4
*/
-// @Override
@Override
public void setRootDispersion(int dispersion)
{
@@ -301,7 +284,6 @@
*
* @return root dispersion in milliseconds
*/
-// @Override
@Override
public long getRootDispersionInMillis()
{
@@ -315,7 +297,6 @@
*
* @return root dispersion in milliseconds
*/
-// @Override
@Override
public double getRootDispersionInMillisDouble()
{
@@ -329,7 +310,6 @@
*
* @param refId reference clock identifier.
*/
-// @Override
@Override
public void setReferenceId(int refId)
{
@@ -342,7 +322,6 @@
*
* @return the reference id as defined in RFC-1305.
*/
-// @Override
@Override
public int getReferenceId()
{
@@ -357,7 +336,6 @@
*
* @return the reference id string.
*/
-// @Override
@Override
public String getReferenceIdString()
{
@@ -417,7 +395,6 @@
* @return the transmit timestamp as defined in RFC-1305.
* Never returns a null object.
*/
-// @Override
@Override
public TimeStamp getTransmitTimeStamp()
{
@@ -430,7 +407,6 @@
*
* @param ts NTP timestamp
*/
-// @Override
@Override
public void setTransmitTime(TimeStamp ts)
{
@@ -443,7 +419,6 @@
*
* @param ts NTP timestamp
*/
-// @Override
@Override
public void setOriginateTimeStamp(TimeStamp ts)
{
@@ -456,7 +431,6 @@
* @return the originate time.
* Never returns null.
*/
-// @Override
@Override
public TimeStamp getOriginateTimeStamp()
{
@@ -469,7 +443,6 @@
* @return the reference time as <code>TimeStamp</code> object.
* Never returns null.
*/
-// @Override
@Override
public TimeStamp getReferenceTimeStamp()
{
@@ -482,7 +455,6 @@
*
* @param ts NTP timestamp
*/
-// @Override
@Override
public void setReferenceTime(TimeStamp ts)
{
@@ -495,7 +467,6 @@
* @return the receive time.
* Never returns null.
*/
-// @Override
@Override
public TimeStamp getReceiveTimeStamp()
{
@@ -508,7 +479,6 @@
*
* @param ts timestamp
*/
-// @Override
@Override
public void setReceiveTimeStamp(TimeStamp ts)
{
@@ -521,7 +491,6 @@
*
* @return packet type string identifier which in this case is "NTP".
*/
-// @Override
@Override
public String getType()
{
@@ -607,7 +576,6 @@
*
* @return a datagram packet.
*/
-// @Override
@Override
public synchronized DatagramPacket getDatagramPacket()
{
@@ -624,7 +592,6 @@
* @param srcDp source DatagramPacket to copy contents from, never null.
* @throws IllegalArgumentException if srcDp is null or byte length is less than minimum length of 48 bytes
*/
-// @Override
@Override
public void setDatagramPacket(DatagramPacket srcDp)
{
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 9595328..d40a0a9 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
@@ -444,7 +444,6 @@
* numerically greater than the TimeStamp argument
* (signed comparison).
*/
-// @Override
@Override
public int compareTo(TimeStamp anotherTimeStamp)
{
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 9e14bf1..082bbea 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
@@ -588,7 +588,6 @@
}
-// @Override
@Override
public void run()
{
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 cc94072..01a0b8a 100644
--- a/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
+++ b/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
@@ -208,7 +208,6 @@
}
// Call sequence: 1
-// @Override
@Override
public String chooseClientAlias(String[] keyType, Principal[] issuers,
Socket socket) {
@@ -216,32 +215,27 @@
}
// 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/TrustManagerUtils.java b/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
index 01bac44..c2649f7 100644
--- a/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
+++ b/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
@@ -45,14 +45,12 @@
/**
* 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
@@ -68,7 +66,6 @@
/**
* @return an empty array of certificates
*/
-// @Override
@Override
public X509Certificate[] getAcceptedIssuers()
{
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 4b2bbd7..26db09f 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
@@ -99,7 +99,6 @@
// as it is added.
TreeSet<FTPFile> sorted = new TreeSet<FTPFile>(new Comparator<Object>() {
-// @Override
@Override
public int compare(Object o1, Object o2) {
FTPFile f1 = (FTPFile) o1;
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 7afd4b9..11f7d5f 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
@@ -43,7 +43,6 @@
public class MLSDComparison {
private final Comparator<FTPFile> cmp = new Comparator<FTPFile>() {
-// @Override
@Override
public int compare(FTPFile o1, FTPFile o2) {
String n1 = o1.getName();
@@ -56,7 +55,6 @@
public void testFile() throws Exception{
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/ftp/parser/MLSxEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
index 78154ed..bdb4e42 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
@@ -87,12 +87,10 @@
return f;
}
-// @Override
@Override
public void testParseFieldsOnFile() throws Exception {
}
-// @Override
@Override
public void testParseFieldsOnDirectory() throws Exception {
}
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 4c56919..068b252 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -878,7 +878,6 @@
* @param option_code - code of the option negotiated
* <p>
*/
-// @Override
@Override
public void receivedNegotiation(int negotiation_code, int option_code)
{
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 81a89e1..09dbfb0 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
@@ -58,7 +58,6 @@
/***
* Runs the responder
***/
-// @Override
@Override
public void run()
{
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 00e30a0..aaa50b2 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
@@ -47,7 +47,6 @@
listener.start();
}
-// @Override
@Override
public void run()
{
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 9d8bf4b..c8dac18 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -271,7 +271,6 @@
return !shutdownServer;
}
-// @Override
@Override
public void run()
{
@@ -374,7 +373,6 @@
}
}
-// @Override
@Override
public void run()
{
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 49ec812..0a90eb6 100644
--- a/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
+++ b/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
@@ -95,7 +95,6 @@
}
}
-// @Override
@Override
public void run()
{
