Author: sebb
Date: Sun May 1 00:24:44 2016
New Revision: 1741829
URL: http://svn.apache.org/viewvc?rev=1741829&view=rev
Log:
Stale comments
Modified:
commons/proper/net/trunk/checkstyle.xml
commons/proper/net/trunk/pom.xml
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
Modified: commons/proper/net/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/checkstyle.xml?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
--- commons/proper/net/trunk/checkstyle.xml (original)
+++ commons/proper/net/trunk/checkstyle.xml Sun May 1 00:24:44 2016
@@ -63,9 +63,9 @@ limitations under the License.
<!-- 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 @@ limitations under the License.
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
</module>
-
+
</module>
<module name="SuppressionCommentFilter"/>
@@ -91,7 +91,7 @@ limitations under the License.
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
</module>
- <!--
+ <!--
Allow comment to suppress checkstyle for a single line
e.g. // CHECKSTYLE IGNORE MagicNumber
-->
Modified: commons/proper/net/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Sun May 1 00:24:44 2016
@@ -414,10 +414,10 @@ Supported protocols include: Echo, Finge
</configuration>
</plugin>
- <!--
+ <!--
Allow exec:java to launch examples from the classpath
For example:
-
+
mvn -q exec:java -Dexec.arguments=FTPClientExample,-A,-l,hostname
-->
<plugin>
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Sun May 1
00:24:44 2016
@@ -68,7 +68,7 @@ This is mainly a bug-fix release. See fu
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 @@ This is mainly a bug-fix release. See fu
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>
Modified:
commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java
(original)
+++ commons/proper/net/trunk/src/main/java/examples/ftp/FTPClientExample.java
Sun May 1 00:24:44 2016
@@ -533,13 +533,12 @@ __main:
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) {
Modified:
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
(original)
+++
commons/proper/net/trunk/src/main/java/examples/telnet/TelnetClientExample.java
Sun May 1 00:24:44 2016
@@ -278,7 +278,6 @@ public class TelnetClientExample impleme
* (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 @@ public class TelnetClientExample impleme
* Reads lines from the TelnetClient and echoes them
* on the screen.
***/
-// @Override
@Override
public void run()
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
Sun May 1 00:24:44 2016
@@ -42,7 +42,6 @@ public class DefaultDatagramSocketFactor
* @return a new DatagramSocket
* @exception SocketException If the socket could not be created.
***/
-// @Override
@Override
public DatagramSocket createDatagramSocket() throws SocketException
{
@@ -56,7 +55,6 @@ public class DefaultDatagramSocketFactor
* @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 @@ public class DefaultDatagramSocketFactor
* @return a new DatagramSocket
* @exception SocketException If the socket could not be created.
***/
-// @Override
@Override
public DatagramSocket createDatagramSocket(int port, InetAddress laddr)
throws SocketException
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/PrintCommandListener.java
Sun May 1 00:24:44 2016
@@ -146,7 +146,6 @@ public class PrintCommandListener implem
__directionMarker = showDirection;
}
-// @Override
@Override
public void protocolCommandSent(ProtocolCommandEvent event)
{
@@ -189,7 +188,7 @@ public class PrintCommandListener implem
}
return msg;
}
-// @Override
+
@Override
public void protocolReplyReceived(ProtocolCommandEvent event)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Sun May 1 00:24:44 2016
@@ -3647,7 +3647,6 @@ implements Configurable
* provide non-standard configurations to the parser.
* @since 1.4
*/
-// @Override
@Override
public void configure(FTPClientConfig config) {
this.__configuration = config;
@@ -3813,13 +3812,11 @@ implements Configurable
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) {
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
Sun May 1 00:24:44 2016
@@ -47,7 +47,6 @@ public abstract class FTPFileEntryParser
* @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 @@ public abstract class FTPFileEntryParser
*
* @return <code>original</code> unmodified.
*/
-// @Override
@Override
public List<String> preParse(List<String> original) {
return original;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java
Sun May 1 00:24:44 2016
@@ -28,7 +28,6 @@ public class FTPFileFilters {
* 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 @@ public class FTPFileFilters {
* 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 @@ public class FTPFileFilters {
* 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();
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Sun May 1 00:24:44 2016
@@ -37,14 +37,12 @@ public class FTPSTrustManager implements
/**
* 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 @@ public class FTPSTrustManager implements
}
}
-// @Override
@Override
public X509Certificate[] getAcceptedIssuers()
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java
Sun May 1 00:24:44 2016
@@ -41,7 +41,6 @@ public class CompositeFileEntryParser ex
this.ftpFileEntryParsers = ftpFileEntryParsers;
}
-// @Override
@Override
public FTPFile parseFTPEntry(String listEntry)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java
Sun May 1 00:24:44 2016
@@ -98,7 +98,6 @@ implements Configurable
* If it is null, a default configuration defined by
* each concrete subclass is used instead.
*/
-// @Override
@Override
public void configure(FTPClientConfig config)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Sun May 1 00:24:44 2016
@@ -85,7 +85,6 @@ public class DefaultFTPFileEntryParserFa
* the supplied key into an FTPFileEntryParser.
* @see FTPFileEntryParser
*/
-// @Override
@Override
public FTPFileEntryParser createFileEntryParser(String key)
{
@@ -198,7 +197,6 @@ public class DefaultFTPFileEntryParserFa
* @throws NullPointerException if {@code config} is {@code null}
* @since 1.4
*/
-// @Override
@Override
public FTPFileEntryParser createFileEntryParser(FTPClientConfig config)
throws ParserInitializationException
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -83,7 +83,6 @@ public class EnterpriseUnixFTPEntryParse
* @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)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Sun May 1 00:24:44 2016
@@ -164,7 +164,6 @@ public class FTPTimestampParserImpl impl
* @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 @@ public class FTPTimestampParserImpl impl
* been configured.
* </p>
*/
-// @Override
@Override
public void configure(FTPClientConfig config) {
DateFormatSymbols dfs = null;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
Sun May 1 00:24:44 2016
@@ -93,7 +93,6 @@ public class MLSxEntryParser extends FTP
super();
}
-// @Override
@Override
public FTPFile parseFTPEntry(String entry) {
if (entry.startsWith(" ")) {// leading space means no facts are present
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -258,7 +258,6 @@ public class MVSFTPEntryParser extends C
* 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;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -125,7 +125,6 @@ public class MacOsPeterFTPEntryParser ex
* @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();
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -96,7 +96,6 @@ public class NTFTPEntryParser extends Co
* @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)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -111,7 +111,6 @@ public class NetwareFTPEntryParser exten
* @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) {
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -84,7 +84,6 @@ public class OS2FTPEntryParser extends C
* @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)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -278,7 +278,6 @@ public class OS400FTPEntryParser extends
}
-// @Override
@Override
public FTPFile parseFTPEntry(String entry)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -206,7 +206,6 @@ public class UnixFTPEntryParser extends
* @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();
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
Sun May 1 00:24:44 2016
@@ -103,7 +103,6 @@ public class VMSFTPEntryParser extends C
* @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)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
Sun May 1 00:24:44 2016
@@ -60,7 +60,6 @@ public class CopyStreamAdapter implement
* @param event The CopyStreamEvent fired by the copying of a block of
* bytes.
*/
-// @Override
@Override
public void bytesTransferred(CopyStreamEvent event)
{
@@ -85,7 +84,6 @@ public class CopyStreamAdapter implement
* 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)
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/Article.java
Sun May 1 00:24:44 2016
@@ -227,25 +227,21 @@ public class Article implements Threadab
}
-// @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 @@ public class Article implements Threadab
}
-// @Override
@Override
public boolean subjectIsReply() {
return isReply;
}
-// @Override
@Override
public void setChild(Threadable child) {
this.kid = (Article) child;
@@ -274,7 +268,6 @@ public class Article implements Threadab
}
-// @Override
@Override
public void setNext(Threadable next) {
this.next = (Article)next;
@@ -282,7 +275,6 @@ public class Article implements Threadab
}
-// @Override
@Override
public Threadable makeDummy() {
return new Article();
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java
Sun May 1 00:24:44 2016
@@ -32,7 +32,6 @@ class ArticleIterator implements Iterato
stringIterator = iterableString.iterator();
}
-// @Override
@Override
public boolean hasNext() {
return stringIterator.hasNext();
@@ -43,19 +42,17 @@ class ArticleIterator implements Iterato
* @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;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java
Sun May 1 00:24:44 2016
@@ -32,26 +32,22 @@ class NewsgroupIterator implements Itera
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;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/ReplyIterator.java
Sun May 1 00:24:44 2016
@@ -57,7 +57,6 @@ class ReplyIterator implements Iterator<
this(_reader, true);
}
-// @Override
@Override
public boolean hasNext() {
if (savedException != null){
@@ -66,7 +65,6 @@ class ReplyIterator implements Iterator<
return line != null;
}
-// @Override
@Override
public String next() throws NoSuchElementException {
if (savedException != null){
@@ -88,13 +86,11 @@ class ReplyIterator implements Iterator<
return prev;
}
-// @Override
@Override
public void remove() {
throw new UnsupportedOperationException();
}
-// @Override
@Override
public Iterator<String> iterator() {
return this;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
Sun May 1 00:24:44 2016
@@ -67,7 +67,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return mode as defined in RFC-1305.
*/
-// @Override
@Override
public int getMode()
{
@@ -79,7 +78,6 @@ public class NtpV3Impl implements NtpV3P
* RFC 1305.
* @return mode name as string.
*/
-// @Override
@Override
public String getModeName()
{
@@ -91,7 +89,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param mode the mode to set
*/
-// @Override
@Override
public void setMode(int mode)
{
@@ -107,7 +104,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return leap indicator as defined in RFC-1305.
*/
-// @Override
@Override
public int getLeapIndicator()
{
@@ -119,7 +115,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param li leap indicator.
*/
-// @Override
@Override
public void setLeapIndicator(int li)
{
@@ -135,7 +130,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return poll interval as defined in RFC-1305.
*/
-// @Override
@Override
public int getPoll()
{
@@ -147,7 +141,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param poll poll interval.
*/
-// @Override
@Override
public void setPoll(int poll)
{
@@ -161,7 +154,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return precision as defined in RFC-1305.
*/
-// @Override
@Override
public int getPrecision()
{
@@ -184,7 +176,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return NTP version number.
*/
-// @Override
@Override
public int getVersion()
{
@@ -196,7 +187,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param version NTP version.
*/
-// @Override
@Override
public void setVersion(int version)
{
@@ -210,7 +200,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return Stratum level as defined in RFC-1305.
*/
-// @Override
@Override
public int getStratum()
{
@@ -222,7 +211,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param stratum stratum level.
*/
-// @Override
@Override
public void setStratum(int stratum)
{
@@ -236,7 +224,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return root delay as defined in RFC-1305.
*/
-// @Override
@Override
public int getRootDelay()
{
@@ -249,7 +236,6 @@ public class NtpV3Impl implements NtpV3P
* @param delay root delay
* @since 3.4
*/
-// @Override
@Override
public void setRootDelay(int delay)
{
@@ -264,7 +250,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return root delay in milliseconds
*/
-// @Override
@Override
public double getRootDelayInMillisDouble()
{
@@ -276,7 +261,6 @@ public class NtpV3Impl implements NtpV3P
* Returns root dispersion as defined in RFC-1305.
* @return root dispersion.
*/
-// @Override
@Override
public int getRootDispersion()
{
@@ -289,7 +273,6 @@ public class NtpV3Impl implements NtpV3P
* @param dispersion root dispersion
* @since 3.4
*/
-// @Override
@Override
public void setRootDispersion(int dispersion)
{
@@ -301,7 +284,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return root dispersion in milliseconds
*/
-// @Override
@Override
public long getRootDispersionInMillis()
{
@@ -315,7 +297,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return root dispersion in milliseconds
*/
-// @Override
@Override
public double getRootDispersionInMillisDouble()
{
@@ -329,7 +310,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param refId reference clock identifier.
*/
-// @Override
@Override
public void setReferenceId(int refId)
{
@@ -342,7 +322,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return the reference id as defined in RFC-1305.
*/
-// @Override
@Override
public int getReferenceId()
{
@@ -357,7 +336,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return the reference id string.
*/
-// @Override
@Override
public String getReferenceIdString()
{
@@ -417,7 +395,6 @@ public class NtpV3Impl implements NtpV3P
* @return the transmit timestamp as defined in RFC-1305.
* Never returns a null object.
*/
-// @Override
@Override
public TimeStamp getTransmitTimeStamp()
{
@@ -430,7 +407,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts NTP timestamp
*/
-// @Override
@Override
public void setTransmitTime(TimeStamp ts)
{
@@ -443,7 +419,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts NTP timestamp
*/
-// @Override
@Override
public void setOriginateTimeStamp(TimeStamp ts)
{
@@ -456,7 +431,6 @@ public class NtpV3Impl implements NtpV3P
* @return the originate time.
* Never returns null.
*/
-// @Override
@Override
public TimeStamp getOriginateTimeStamp()
{
@@ -469,7 +443,6 @@ public class NtpV3Impl implements NtpV3P
* @return the reference time as <code>TimeStamp</code> object.
* Never returns null.
*/
-// @Override
@Override
public TimeStamp getReferenceTimeStamp()
{
@@ -482,7 +455,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts NTP timestamp
*/
-// @Override
@Override
public void setReferenceTime(TimeStamp ts)
{
@@ -495,7 +467,6 @@ public class NtpV3Impl implements NtpV3P
* @return the receive time.
* Never returns null.
*/
-// @Override
@Override
public TimeStamp getReceiveTimeStamp()
{
@@ -508,7 +479,6 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts timestamp
*/
-// @Override
@Override
public void setReceiveTimeStamp(TimeStamp ts)
{
@@ -521,7 +491,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return packet type string identifier which in this case is "NTP".
*/
-// @Override
@Override
public String getType()
{
@@ -607,7 +576,6 @@ public class NtpV3Impl implements NtpV3P
*
* @return a datagram packet.
*/
-// @Override
@Override
public synchronized DatagramPacket getDatagramPacket()
{
@@ -624,7 +592,6 @@ public class NtpV3Impl implements NtpV3P
* @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)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
Sun May 1 00:24:44 2016
@@ -444,7 +444,6 @@ public class TimeStamp implements java.i
* numerically greater than the TimeStamp argument
* (signed comparison).
*/
-// @Override
@Override
public int compareTo(TimeStamp anotherTimeStamp)
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
Sun May 1 00:24:44 2016
@@ -588,7 +588,6 @@ final class TelnetInputStream extends Bu
}
-// @Override
@Override
public void run()
{
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
Sun May 1 00:24:44 2016
@@ -208,7 +208,6 @@ public final class KeyManagerUtils {
}
// Call sequence: 1
-// @Override
@Override
public String chooseClientAlias(String[] keyType, Principal[] issuers,
Socket socket) {
@@ -216,32 +215,27 @@ public final class KeyManagerUtils {
}
// 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;
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
Sun May 1 00:24:44 2016
@@ -45,14 +45,12 @@ public final class TrustManagerUtils
/**
* 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 @@ public final class TrustManagerUtils
/**
* @return an empty array of certificates
*/
-// @Override
@Override
public X509Certificate[] getAcceptedIssuers()
{
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
Sun May 1 00:24:44 2016
@@ -99,7 +99,6 @@ public class FTPClientConfigFunctionalTe
// 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;
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
Sun May 1 00:24:44 2016
@@ -43,7 +43,6 @@ import org.junit.Test;
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 class MLSDComparison {
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");
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java
Sun May 1 00:24:44 2016
@@ -87,12 +87,10 @@ public class MLSxEntryParserTest extends
return f;
}
-// @Override
@Override
public void testParseFieldsOnFile() throws Exception {
}
-// @Override
@Override
public void testParseFieldsOnDirectory() throws Exception {
}
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
Sun May 1 00:24:44 2016
@@ -878,7 +878,6 @@ extends TestCase implements TelnetNotifi
* @param option_code - code of the option negotiated
* <p>
*/
-// @Override
@Override
public void receivedNegotiation(int negotiation_code, int option_code)
{
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java
Sun May 1 00:24:44 2016
@@ -58,7 +58,6 @@ public class TelnetTestResponder impleme
/***
* Runs the responder
***/
-// @Override
@Override
public void run()
{
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
Sun May 1 00:24:44 2016
@@ -47,7 +47,6 @@ public class TelnetTestSimpleServer impl
listener.start();
}
-// @Override
@Override
public void run()
{
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
Sun May 1 00:24:44 2016
@@ -271,7 +271,6 @@ public class TFTPServer implements Runna
return !shutdownServer;
}
-// @Override
@Override
public void run()
{
@@ -374,7 +373,6 @@ public class TFTPServer implements Runna
}
}
-// @Override
@Override
public void run()
{
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java?rev=1741829&r1=1741828&r2=1741829&view=diff
==============================================================================
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java
Sun May 1 00:24:44 2016
@@ -95,7 +95,6 @@ public class TimeTestSimpleServer implem
}
}
-// @Override
@Override
public void run()
{
