You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/12/05 15:32:08 UTC
svn commit: r1417442 - in /commons/proper/net/trunk/src:
main/java/examples/ftp/ main/java/examples/telnet/
main/java/org/apache/commons/net/ main/java/org/apache/commons/net/ftp/
main/java/org/apache/commons/net/ftp/parser/ main/java/org/apache/common...
Author: sebb
Date: Wed Dec 5 14:32:02 2012
New Revision: 1417442
URL: http://svn.apache.org/viewvc?rev=1417442&view=rev
Log:
Java 1.6 requires @Override for interfaces (yuk)
Modified:
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/ListenerList.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/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/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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -457,10 +457,12 @@ __main:
private static CopyStreamListener createListener(){
return new CopyStreamListener(){
private long megsTotal = 0;
+ @Override
public void bytesTransferred(CopyStreamEvent event) {
bytesTransferred(event.getTotalBytesTransferred(), event.getBytesTransferred(), event.getStreamSize());
}
+ @Override
public void bytesTransferred(long totalBytesTransferred,
int bytesTransferred, long streamSize) {
long megs = totalBytesTransferred / 1000000;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -267,6 +267,7 @@ public class TelnetClientExample impleme
* @param option_code - code of the option negotiated
* <p>
***/
+ @Override
public void receivedNegotiation(int negotiation_code, int option_code)
{
String command = null;
@@ -294,6 +295,7 @@ public class TelnetClientExample impleme
* Reads lines from the TelnetClient and echoes them
* on the screen.
***/
+ @Override
public void run()
{
InputStream instr = tc.getInputStream();
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -42,6 +42,7 @@ public class DefaultDatagramSocketFactor
* <p>
* @exception SocketException If the socket could not be created.
***/
+ @Override
public DatagramSocket createDatagramSocket() throws SocketException
{
return new DatagramSocket();
@@ -53,6 +54,7 @@ public class DefaultDatagramSocketFactor
* @param port The port to use for the socket.
* @exception SocketException If the socket could not be created.
***/
+ @Override
public DatagramSocket createDatagramSocket(int port) throws SocketException
{
return new DatagramSocket(port);
@@ -66,6 +68,7 @@ public class DefaultDatagramSocketFactor
* @param laddr The local address to use.
* @exception SocketException If the socket could not be created.
***/
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -147,6 +147,7 @@ public class PrintCommandListener implem
__directionMarker = showDirection;
}
+ @Override
public void protocolCommandSent(ProtocolCommandEvent event)
{
if (__directionMarker) {
@@ -188,6 +189,7 @@ public class PrintCommandListener implem
}
return msg;
}
+ @Override
public void protocolReplyReceived(ProtocolCommandEvent event)
{
if (__directionMarker) {
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -3402,6 +3402,7 @@ implements Configurable
* provide non-standard configurations to the parser.
* @since 1.4
*/
+ @Override
public void configure(FTPClientConfig config) {
this.__configuration = config;
}
@@ -3535,10 +3536,12 @@ implements Configurable
parent.setSoTimeout(maxWait);
}
+ @Override
public void bytesTransferred(CopyStreamEvent event) {
bytesTransferred(event.getTotalBytesTransferred(), event.getBytesTransferred(), event.getStreamSize());
}
+ @Override
public void bytesTransferred(long totalBytesTransferred,
int bytesTransferred, long streamSize) {
long now = System.currentTimeMillis();
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -47,6 +47,7 @@ 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
public String readNextEntry(BufferedReader reader) throws IOException
{
return reader.readLine();
@@ -63,7 +64,8 @@ public abstract class FTPFileEntryParser
*
* @return <code>original</code> unmodified.
*/
- public List<String> preParse(List<String> original) {
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -28,6 +28,7 @@ public class FTPFileFilters {
* Accepts all FTPFile entries, including null.
*/
public static final FTPFileFilter ALL = new FTPFileFilter() {
+ @Override
public boolean accept(FTPFile file) {
return true;
}
@@ -37,6 +38,7 @@ public class FTPFileFilters {
* Accepts all non-null FTPFile entries.
*/
public static final FTPFileFilter NON_NULL = new FTPFileFilter() {
+ @Override
public boolean accept(FTPFile file) {
return file != null;
}
@@ -46,6 +48,7 @@ public class FTPFileFilters {
* Accepts all (non-null) FTPFile directory entries.
*/
public static final FTPFileFilter DIRECTORIES = new FTPFileFilter() {
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -35,11 +35,13 @@ public class FTPSTrustManager implements
/**
* No-op
*/
+ @Override
public void checkClientTrusted(X509Certificate[] certificates, String authType)
{
return;
}
+ @Override
public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException
{
for (X509Certificate certificate : certificates)
@@ -48,6 +50,7 @@ public class FTPSTrustManager implements
}
}
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
return EMPTY_X509CERTIFICATE_ARRAY;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -43,6 +43,7 @@ public class CompositeFileEntryParser ex
this.ftpFileEntryParsers = ftpFileEntryParsers;
}
+ @Override
public FTPFile parseFTPEntry(String listEntry)
{
if (cachedFtpFileEntryParser != null)
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -87,6 +87,7 @@ implements Configurable
* If it is null, a default configuration defined by
* each concrete subclass is used instead.
*/
+ @Override
public void configure(FTPClientConfig config)
{
if (this.timestampParser instanceof Configurable) {
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -86,6 +86,7 @@ public class DefaultFTPFileEntryParserFa
* the supplied key into an FTPFileEntryParser.
* @see FTPFileEntryParser
*/
+ @Override
public FTPFileEntryParser createFileEntryParser(String key)
{
if (key == null) {
@@ -193,6 +194,7 @@ public class DefaultFTPFileEntryParserFa
* @throws NullPointerException if {@code config} is {@code null}
* @since 1.4
*/
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -80,6 +80,7 @@ public class EnterpriseUnixFTPEntryParse
* @param entry A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -70,6 +70,7 @@ public class FTPTimestampParserImpl impl
*
* @param timestampStr The timestamp to be parsed
*/
+ @Override
public Calendar parseTimestamp(String timestampStr) throws ParseException {
Calendar now = Calendar.getInstance();
return parseTimestamp(timestampStr, now);
@@ -247,6 +248,7 @@ public class FTPTimestampParserImpl impl
* been configured.
* </p>
*/
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -91,6 +91,7 @@ public class MLSxEntryParser extends FTP
super();
}
+ @Override
public FTPFile parseFTPEntry(String entry) {
String parts[] = entry.split(" ",2); // Path may contain space
if (parts.length != 2) {
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -229,6 +229,7 @@ public class MVSFTPEntryParser extends C
* A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
+ @Override
public FTPFile parseFTPEntry(String entry) {
boolean isParsed = false;
FTPFile f = new FTPFile();
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -125,6 +125,7 @@ public class MacOsPeterFTPEntryParser ex
* @param entry A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
+ @Override
public FTPFile parseFTPEntry(String entry) {
FTPFile file = new FTPFile();
file.setRawListing(entry);
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -97,6 +97,7 @@ 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
public FTPFile parseFTPEntry(String entry)
{
FTPFile f = new FTPFile();
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -110,6 +110,7 @@ public class NetwareFTPEntryParser exten
* @param entry A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
+ @Override
public FTPFile parseFTPEntry(String entry) {
FTPFile f = new FTPFile();
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -86,6 +86,7 @@ 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
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -73,6 +73,7 @@ public class OS400FTPEntryParser extends
}
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -164,6 +164,7 @@ public class UnixFTPEntryParser extends
* @param entry A line of text from the file listing
* @return An FTPFile instance corresponding to the supplied entry
*/
+ @Override
public FTPFile parseFTPEntry(String entry) {
FTPFile file = new FTPFile();
file.setRawListing(entry);
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -106,6 +106,7 @@ 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
public FTPFile parseFTPEntry(String entry)
{
//one block in VMS equals 512 bytes
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -60,6 +60,7 @@ public class CopyStreamAdapter implement
* @param event The CopyStreamEvent fired by the copying of a block of
* bytes.
*/
+ @Override
public void bytesTransferred(CopyStreamEvent event)
{
for (EventListener listener : internalListeners)
@@ -83,6 +84,7 @@ public class CopyStreamAdapter implement
* This may be equal to CopyStreamEvent.UNKNOWN_STREAM_SIZE if
* the size is unknown.
*/
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -194,18 +194,22 @@ public class Article implements Threadab
}
+ @Override
public boolean isDummy() {
return (articleNumber == -1);
}
+ @Override
public String messageThreadId() {
return articleId;
}
+ @Override
public String[] messageThreadReferences() {
return getReferences();
}
+ @Override
public String simplifiedSubject() {
if(simplifiedSubject == null) {
simplifySubject();
@@ -214,11 +218,13 @@ public class Article implements Threadab
}
+ @Override
public boolean subjectIsReply() {
return isReply;
}
+ @Override
public void setChild(Threadable child) {
this.kid = (Article) child;
flushSubjectCache();
@@ -229,12 +235,14 @@ public class Article implements Threadab
}
+ @Override
public void setNext(Threadable next) {
this.next = (Article)next;
flushSubjectCache();
}
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -32,6 +32,7 @@ class ArticleIterator implements Iterato
stringIterator = iterableString.iterator();
}
+ @Override
public boolean hasNext() {
return stringIterator.hasNext();
}
@@ -41,14 +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
public Article next() {
String line = stringIterator.next();
return NNTPClient.__parseArticleEntry(line);
}
+ @Override
public void remove() {
stringIterator.remove();
}
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -32,19 +32,23 @@ class NewsgroupIterator implements Itera
stringIterator = iterableString.iterator();
}
+ @Override
public boolean hasNext() {
return stringIterator.hasNext();
}
+ @Override
public NewsgroupInfo next() {
String line = stringIterator.next();
return NNTPClient.__parseNewsgroupListEntry(line);
}
+ @Override
public void remove() {
stringIterator.remove();
}
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -57,6 +57,7 @@ class ReplyIterator implements Iterator<
this(_reader, true);
}
+ @Override
public boolean hasNext() {
if (savedException != null){
throw new NoSuchElementException(savedException.toString());
@@ -64,6 +65,7 @@ class ReplyIterator implements Iterator<
return line != null;
}
+ @Override
public String next() throws NoSuchElementException {
if (savedException != null){
throw new NoSuchElementException(savedException.toString());
@@ -84,10 +86,12 @@ class ReplyIterator implements Iterator<
return prev;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
+ @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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -70,6 +70,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return mode as defined in RFC-1305.
*/
+ @Override
public int getMode()
{
return (ui(buf[MODE_INDEX]) >> MODE_SHIFT) & 0x7;
@@ -80,6 +81,7 @@ public class NtpV3Impl implements NtpV3P
* RFC 1305.
* @return mode name as string.
*/
+ @Override
public String getModeName()
{
return NtpUtils.getModeName(getMode());
@@ -89,6 +91,7 @@ public class NtpV3Impl implements NtpV3P
* Set mode as defined in RFC-1305.
* @param mode
*/
+ @Override
public void setMode(int mode)
{
buf[MODE_INDEX] = (byte) (buf[MODE_INDEX] & 0xF8 | mode & 0x7);
@@ -103,6 +106,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return leap indicator as defined in RFC-1305.
*/
+ @Override
public int getLeapIndicator()
{
return (ui(buf[LI_INDEX]) >> LI_SHIFT) & 0x3;
@@ -112,6 +116,7 @@ public class NtpV3Impl implements NtpV3P
* Set leap indicator as defined in RFC-1305.
* @param li leap indicator.
*/
+ @Override
public void setLeapIndicator(int li)
{
buf[LI_INDEX] = (byte) (buf[LI_INDEX] & 0x3F | ((li & 0x3) << LI_SHIFT));
@@ -126,6 +131,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return poll interval as defined in RFC-1305.
*/
+ @Override
public int getPoll()
{
return buf[POLL_INDEX];
@@ -136,6 +142,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param poll poll interval.
*/
+ @Override
public void setPoll(int poll)
{
buf[POLL_INDEX] = (byte) (poll & 0xFF);
@@ -148,6 +155,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return precision as defined in RFC-1305.
*/
+ @Override
public int getPrecision()
{
return buf[PRECISION_INDEX];
@@ -167,6 +175,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return NTP version number.
*/
+ @Override
public int getVersion()
{
return (ui(buf[VERSION_INDEX]) >> VERSION_SHIFT) & 0x7;
@@ -177,6 +186,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param version NTP version.
*/
+ @Override
public void setVersion(int version)
{
buf[VERSION_INDEX] = (byte) (buf[VERSION_INDEX] & 0xC7 | ((version & 0x7) << VERSION_SHIFT));
@@ -189,6 +199,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return Stratum level as defined in RFC-1305.
*/
+ @Override
public int getStratum()
{
return ui(buf[STRATUM_INDEX]);
@@ -199,6 +210,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param stratum stratum level.
*/
+ @Override
public void setStratum(int stratum)
{
buf[STRATUM_INDEX] = (byte) (stratum & 0xFF);
@@ -211,6 +223,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return root delay as defined in RFC-1305.
*/
+ @Override
public int getRootDelay()
{
return getInt(ROOT_DELAY_INDEX);
@@ -224,6 +237,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return root delay in milliseconds
*/
+ @Override
public double getRootDelayInMillisDouble()
{
double l = getRootDelay();
@@ -234,6 +248,7 @@ public class NtpV3Impl implements NtpV3P
* Returns root dispersion as defined in RFC-1305.
* @return root dispersion.
*/
+ @Override
public int getRootDispersion()
{
return getInt(ROOT_DISPERSION_INDEX);
@@ -244,6 +259,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return root dispersion in milliseconds
*/
+ @Override
public long getRootDispersionInMillis()
{
long l = getRootDispersion();
@@ -256,6 +272,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return root dispersion in milliseconds
*/
+ @Override
public double getRootDispersionInMillisDouble()
{
double l = getRootDispersion();
@@ -268,6 +285,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param refId reference clock identifier.
*/
+ @Override
public void setReferenceId(int refId)
{
for (int i = 3; i >= 0; i--) {
@@ -282,6 +300,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return the reference id as defined in RFC-1305.
*/
+ @Override
public int getReferenceId()
{
return getInt(REFERENCE_ID_INDEX);
@@ -295,6 +314,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return the reference id string.
*/
+ @Override
public String getReferenceIdString()
{
int version = getVersion();
@@ -353,6 +373,7 @@ public class NtpV3Impl implements NtpV3P
* @return the transmit timestamp as defined in RFC-1305.
* Never returns a null object.
*/
+ @Override
public TimeStamp getTransmitTimeStamp()
{
return getTimestamp(TRANSMIT_TIMESTAMP_INDEX);
@@ -364,6 +385,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts NTP timestamp
*/
+ @Override
public void setTransmitTime(TimeStamp ts)
{
setTimestamp(TRANSMIT_TIMESTAMP_INDEX, ts);
@@ -375,6 +397,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts NTP timestamp
*/
+ @Override
public void setOriginateTimeStamp(TimeStamp ts)
{
setTimestamp(ORIGINATE_TIMESTAMP_INDEX, ts);
@@ -386,6 +409,7 @@ public class NtpV3Impl implements NtpV3P
* @return the originate time.
* Never returns null.
*/
+ @Override
public TimeStamp getOriginateTimeStamp()
{
return getTimestamp(ORIGINATE_TIMESTAMP_INDEX);
@@ -397,6 +421,7 @@ public class NtpV3Impl implements NtpV3P
* @return the reference time as <code>TimeStamp</code> object.
* Never returns null.
*/
+ @Override
public TimeStamp getReferenceTimeStamp()
{
return getTimestamp(REFERENCE_TIMESTAMP_INDEX);
@@ -408,6 +433,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts NTP timestamp
*/
+ @Override
public void setReferenceTime(TimeStamp ts)
{
setTimestamp(REFERENCE_TIMESTAMP_INDEX, ts);
@@ -419,6 +445,7 @@ public class NtpV3Impl implements NtpV3P
* @return the receive time.
* Never returns null.
*/
+ @Override
public TimeStamp getReceiveTimeStamp()
{
return getTimestamp(RECEIVE_TIMESTAMP_INDEX);
@@ -430,6 +457,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param ts timestamp
*/
+ @Override
public void setReceiveTimeStamp(TimeStamp ts)
{
setTimestamp(RECEIVE_TIMESTAMP_INDEX, ts);
@@ -441,6 +469,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return packet type string identifier which in this case is "NTP".
*/
+ @Override
public String getType()
{
return "NTP";
@@ -511,6 +540,7 @@ public class NtpV3Impl implements NtpV3P
*
* @return a datagram packet.
*/
+ @Override
public synchronized DatagramPacket getDatagramPacket()
{
if (dp == null) {
@@ -525,6 +555,7 @@ public class NtpV3Impl implements NtpV3P
*
* @param srcDp source DatagramPacket to copy contents from.
*/
+ @Override
public void setDatagramPacket(DatagramPacket srcDp)
{
byte[] incomingBuf = srcDp.getData();
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -441,6 +441,7 @@ public class TimeStamp implements java.i
* numerically greater than the TimeStamp argument
* (signed comparison).
*/
+ @Override
public int compareTo(TimeStamp anotherTimeStamp)
{
long thisVal = this.ntpTime;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -597,6 +597,7 @@ final class TelnetInputStream extends Bu
__threaded = false;
}
+ @Override
public void run()
{
int ch;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -200,29 +200,35 @@ public final class KeyManagerUtils {
}
// Call sequence: 1
+ @Override
public String chooseClientAlias(String[] keyType, Principal[] issuers,
Socket socket) {
return keyStore.getAlias();
}
// Call sequence: 2
+ @Override
public X509Certificate[] getCertificateChain(String alias) {
return keyStore.getCertificateChain();
}
+ @Override
public String[] getClientAliases(String keyType, Principal[] issuers) {
return new String[]{ keyStore.getAlias()};
}
// Call sequence: 3
+ @Override
public PrivateKey getPrivateKey(String alias) {
return keyStore.getPrivateKey();
}
+ @Override
public String[] getServerAliases(String keyType, Principal[] issuers) {
return null;
}
+ @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/ListenerList.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java?rev=1417442&r1=1417441&r2=1417442&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/ListenerList.java Wed Dec 5 14:32:02 2012
@@ -58,6 +58,7 @@ public class ListenerList implements Ser
* @since 2.0
* TODO Check that this is a good defensive strategy
*/
+ @Override
public Iterator<EventListener> iterator() {
return __listeners.iterator();
}
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -45,11 +45,13 @@ public final class TrustManagerUtils
/**
* Never generates a CertificateException.
*/
+ @Override
public void checkClientTrusted(X509Certificate[] certificates, String authType)
{
return;
}
+ @Override
public void checkServerTrusted(X509Certificate[] certificates, String authType)
throws CertificateException
{
@@ -64,6 +66,7 @@ public final class TrustManagerUtils
/**
* @return an empty array of certificates
*/
+ @Override
public X509Certificate[] getAcceptedIssuers()
{
return EMPTY_X509CERTIFICATE_ARRAY;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -101,6 +101,7 @@ public class FTPClientConfigFunctionalTe
// as it is added.
TreeSet<FTPFile> sorted = new TreeSet<FTPFile>(new Comparator<Object>() {
+ @Override
public int compare(Object o1, Object o2) {
FTPFile f1 = (FTPFile) o1;
FTPFile f2 = (FTPFile) o2;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -43,6 +43,7 @@ import org.junit.Test;
public class MLSDComparison {
private Comparator<FTPFile> cmp = new Comparator<FTPFile>() {
+ @Override
public int compare(FTPFile o1, FTPFile o2) {
String n1 = o1.getName();
String n2 = o2.getName();
@@ -54,6 +55,7 @@ public class MLSDComparison {
public void testFile() throws Exception{
File path = new File(DownloadListings.DOWNLOAD_DIR);
FilenameFilter filter = new FilenameFilter(){
+ @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/telnet/TelnetClientTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java?rev=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -880,6 +880,7 @@ extends TestCase implements TelnetNotifi
* @param option_code - code of the option negotiated
* <p>
***/
+ @Override
public void receivedNegotiation(int negotiation_code, int option_code)
{
if(negotiation_code == TelnetNotificationHandler.RECEIVED_DO)
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -60,6 +60,7 @@ public class TelnetTestResponder impleme
/***
* Runs the responder
***/
+ @Override
public void run()
{
boolean result = false;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -51,6 +51,7 @@ public class TelnetTestSimpleServer impl
/***
* Run for the thread. Waits for new connections
***/
+ @Override
public void run()
{
boolean bError = false;
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -269,6 +269,7 @@ public class TFTPServer implements Runna
return !shutdownServer;
}
+ @Override
public void run()
{
try
@@ -370,6 +371,7 @@ public class TFTPServer implements Runna
}
}
+ @Override
public void run()
{
try
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=1417442&r1=1417441&r2=1417442&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 Wed Dec 5 14:32:02 2012
@@ -105,6 +105,7 @@ public class TimeTestSimpleServer implem
}
}
+ @Override
public void run()
{
Socket socket = null;