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 2008/03/13 19:35:00 UTC
svn commit: r636825 [1/2] - in /commons/proper/net/branches/NET_2_0/src:
main/java/org/apache/commons/net/ main/java/org/apache/commons/net/bsd/
main/java/org/apache/commons/net/echo/
main/java/org/apache/commons/net/ftp/ main/java/org/apache/commons/n...
Author: sebb
Date: Thu Mar 13 11:34:52 2008
New Revision: 636825
URL: http://svn.apache.org/viewvc?rev=636825&view=rev
Log:
Add Override markers
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/DefaultSocketFactory.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RExecClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTP.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPFile.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketInputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketOutputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/NNTP.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/pop3/POP3.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/RelayPath.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/DefaultSocketFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/DefaultSocketFactory.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/DefaultSocketFactory.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/DefaultSocketFactory.java Thu Mar 13 11:34:52 2008
@@ -51,6 +51,7 @@
* @exception UnknownHostException If the hostname cannot be resolved.
* @exception IOException If an I/O error occurs while creating the Socket.
***/
+ @Override
public Socket createSocket(String host, int port)
throws UnknownHostException, IOException
{
@@ -65,6 +66,7 @@
* @return A Socket connected to the given host and port.
* @exception IOException If an I/O error occurs while creating the Socket.
***/
+ @Override
public Socket createSocket(InetAddress address, int port)
throws IOException
{
@@ -83,6 +85,7 @@
* @exception UnknownHostException If the hostname cannot be resolved.
* @exception IOException If an I/O error occurs while creating the Socket.
***/
+ @Override
public Socket createSocket(String host, int port,
InetAddress localAddr, int localPort)
throws UnknownHostException, IOException
@@ -101,6 +104,7 @@
* @return A Socket connected to the given host and port.
* @exception IOException If an I/O error occurs while creating the Socket.
***/
+ @Override
public Socket createSocket(InetAddress address, int port,
InetAddress localAddr, int localPort)
throws IOException
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RCommandClient.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RCommandClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RCommandClient.java Thu Mar 13 11:34:52 2008
@@ -107,6 +107,7 @@
// Overrides method in RExecClient in order to implement proper
// port number limitations.
+ @Override
InputStream _createErrorStream() throws IOException
{
int localPort;
@@ -224,6 +225,7 @@
* cases you will only want to catch IOException since SocketException is
* derived from it.
***/
+ @Override
public void connect(InetAddress host, int port)
throws SocketException, IOException
{
@@ -247,6 +249,7 @@
* derived from it.
* @exception UnknownHostException If the hostname cannot be resolved.
***/
+ @Override
public void connect(String hostname, int port)
throws SocketException, IOException
{
@@ -297,6 +300,7 @@
* @exception IllegalArgumentException If an invalid local port number
* is specified.
***/
+ @Override
public void connect(InetAddress host, int port,
InetAddress localAddr, int localPort)
throws SocketException, IOException, IllegalArgumentException
@@ -328,6 +332,7 @@
* @exception IllegalArgumentException If an invalid local port number
* is specified.
***/
+ @Override
public void connect(String hostname, int port,
InetAddress localAddr, int localPort)
throws SocketException, IOException, IllegalArgumentException
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RExecClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RExecClient.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RExecClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/bsd/RExecClient.java Thu Mar 13 11:34:52 2008
@@ -252,6 +252,7 @@
* <p>
* @exception IOException If there an error occurs while disconnecting.
***/
+ @Override
public void disconnect() throws IOException
{
if (_errorStream_ != null)
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java Thu Mar 13 11:34:52 2008
@@ -58,6 +58,7 @@
* @exception IOException If an error occurs during the datagram send
* operation.
***/
+ @Override
public void send(byte[] data, int length, InetAddress host)
throws IOException
{
@@ -66,6 +67,7 @@
/*** Same as <code> send(data, data.length, host) </code> ***/
+ @Override
public void send(byte[] data, InetAddress host) throws IOException
{
send(data, data.length, host, DEFAULT_PORT);
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTP.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTP.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTP.java Thu Mar 13 11:34:52 2008
@@ -351,6 +351,7 @@
* Initiates control connections and gets initial reply.
* Initializes {@link #_controlInput_} and {@link #_controlOutput_}.
*/
+ @Override
protected void _connectAction_() throws IOException
{
super._connectAction_();
@@ -421,6 +422,7 @@
* <p>
* @exception IOException If an error occurs while disconnecting.
***/
+ @Override
public void disconnect() throws IOException
{
super.disconnect();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java Thu Mar 13 11:34:52 2008
@@ -534,6 +534,7 @@
}
+ @Override
protected void _connectAction_() throws IOException
{
super._connectAction_();
@@ -574,6 +575,7 @@
* <p>
* @exception IOException If an error occurs while disconnecting.
***/
+ @Override
public void disconnect() throws IOException
{
super.disconnect();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPFile.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPFile.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPFile.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPFile.java Thu Mar 13 11:34:52 2008
@@ -383,6 +383,7 @@
* <p>
* @return A string representation of the FTPFile information.
***/
+ @Override
public String toString()
{
return _rawListing;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java Thu Mar 13 11:34:52 2008
@@ -163,6 +163,7 @@
* @throws IOException If it throw by _connectAction_.
* @see org.apache.commons.net.SocketClient#_connectAction_()
*/
+ @Override
protected void _connectAction_() throws IOException {
// Implicit mode.
if (isImplicit) sslNegotiation();
@@ -437,6 +438,7 @@
* the command.
* @see org.apache.commons.net.ftp.FTP#sendCommand(java.lang.String)
*/
+ @Override
public int sendCommand(String command, String args) throws IOException {
int repCode = super.sendCommand(command, args);
if (FTPSCommand._commands[FTPSCommand.CCC].equals(command)) {
@@ -464,6 +466,7 @@
* @throws IOException If there is any problem with the connection.
* @see org.apache.commons.net.ftp.FTPClient#_openDataConnection_(java.lang.String, int)
*/
+ @Override
protected Socket _openDataConnection_(int command, String arg)
throws IOException {
Socket socket = super._openDataConnection_(command, arg);
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java Thu Mar 13 11:34:52 2008
@@ -42,18 +42,22 @@
this.context = context;
}
+ @Override
public Socket createSocket(String address, int port) throws UnknownHostException, IOException {
return this.context.getSocketFactory().createSocket(address, port);
}
+ @Override
public Socket createSocket(InetAddress address, int port) throws IOException {
return this.context.getSocketFactory().createSocket(address, port);
}
+ @Override
public Socket createSocket(String address, int port, InetAddress localAddress, int localPort) throws UnknownHostException, IOException {
return this.context.getSocketFactory().createSocket(address, port, localAddress, localPort);
}
+ @Override
public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
return this.context.getSocketFactory().createSocket(address, port, localAddress, localPort);
}
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -439,6 +439,7 @@
* before the parsing takes place. Three kind of lists is recognize:
* z/OS-MVS File lists z/OS-MVS Member lists unix file lists
*/
+ @Override
public List preParse(List orig) {
// simply remove the header line. Composite logic will take care of the
// two different types of
@@ -484,6 +485,7 @@
/*
* @return
*/
+ @Override
protected FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(FTPClientConfig.SYST_MVS,
DEFAULT_DATE_FORMAT, null, null, null, null);
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -136,7 +136,8 @@
* parameter being specified.
* @return the default configuration for this parser.
*/
- public FTPClientConfig getDefaultConfiguration() {
+ @Override
+ public FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(
FTPClientConfig.SYST_NT,
DEFAULT_DATE_FORMAT,
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -165,6 +165,7 @@
* parameter being specified.
* @return the default configuration for this parser.
*/
+ @Override
protected FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(FTPClientConfig.SYST_NETWARE,
DEFAULT_DATE_FORMAT, DEFAULT_RECENT_DATE_FORMAT, null, null,
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -136,6 +136,7 @@
* parameter being specified.
* @return the default configuration for this parser.
*/
+ @Override
protected FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(
FTPClientConfig.SYST_OS2,
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -147,6 +147,7 @@
* parameter being specified.
* @return the default configuration for this parser.
*/
+ @Override
protected FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(
FTPClientConfig.SYST_OS400,
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -283,6 +283,7 @@
* parameter being specified.
* @return the default configuration for this parser.
*/
+ @Override
protected FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(
FTPClientConfig.SYST_UNIX,
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -219,6 +219,7 @@
* @return A string representing the next ftp entry or null if none found.
* @exception IOException thrown on any IO Error reading from the reader.
*/
+ @Override
public String readNextEntry(BufferedReader reader) throws IOException
{
String line = reader.readLine();
@@ -250,7 +251,8 @@
* parameter being specified.
* @return the default configuration for this parser.
*/
- protected FTPClientConfig getDefaultConfiguration() {
+ @Override
+ protected FTPClientConfig getDefaultConfiguration() {
return new FTPClientConfig(
FTPClientConfig.SYST_VMS,
DEFAULT_DATE_FORMAT,
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java Thu Mar 13 11:34:52 2008
@@ -116,6 +116,7 @@
*
* @return Original list purged of duplicates
*/
+ @Override
public List preParse(List<String> original) {
original = super.preParse(original);
HashMap<String, NameVersion> existingEntries = new HashMap<String, NameVersion>();
@@ -166,6 +167,7 @@
}
+ @Override
protected boolean isVersioning() {
return true;
}
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java Thu Mar 13 11:34:52 2008
@@ -81,6 +81,7 @@
* @exception IOException If an error occurs while reading the underlying
* stream.
*/
+ @Override
public int read() throws IOException
{
int ch;
@@ -178,6 +179,7 @@
* @exception IOException If an error occurs in reading the underlying
* stream.
*/
+ @Override
public int read(char[] buffer) throws IOException
{
return read(buffer, 0, buffer.length);
@@ -197,6 +199,7 @@
* @exception IOException If an error occurs in reading the underlying
* stream.
*/
+ @Override
public int read(char[] buffer, int offset, int length) throws IOException
{
int ch, off;
@@ -228,6 +231,7 @@
* @exception IOException If an error occurs while checking the underlying
* stream.
*/
+ @Override
public boolean ready() throws IOException
{
synchronized (lock)
@@ -250,6 +254,7 @@
* @exception IOException If an error occurs while reading the
* underlying stream.
*/
+ @Override
public void close() throws IOException
{
synchronized (lock)
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java Thu Mar 13 11:34:52 2008
@@ -72,6 +72,7 @@
* @exception IOException If an error occurs while writing to the
* underlying output.
***/
+ @Override
public void write(int ch) throws IOException
{
synchronized (lock)
@@ -112,6 +113,7 @@
* @exception IOException If an error occurs while writing to the underlying
* output.
***/
+ @Override
public void write(char[] buffer, int offset, int length) throws IOException
{
synchronized (lock)
@@ -129,6 +131,7 @@
* @exception IOException If an error occurs while writing to the underlying
* output.
***/
+ @Override
public void write(char[] buffer) throws IOException
{
write(buffer, 0, buffer.length);
@@ -142,6 +145,7 @@
* @exception IOException If an error occurs while writing to the underlying
* output.
***/
+ @Override
public void write(String string) throws IOException
{
write(string.toCharArray());
@@ -157,6 +161,7 @@
* @exception IOException If an error occurs while writing to the underlying
* output.
***/
+ @Override
public void write(String string, int offset, int length) throws IOException
{
write(string.toCharArray(), offset, length);
@@ -169,6 +174,7 @@
* @exception IOException If an error occurs while writing to the underlying
* output.
***/
+ @Override
public void flush() throws IOException
{
synchronized (lock)
@@ -186,6 +192,7 @@
* @exception IOException If an error occurs while writing to the underlying
* output or closing the Writer.
***/
+ @Override
public void close() throws IOException
{
synchronized (lock)
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java Thu Mar 13 11:34:52 2008
@@ -127,6 +127,7 @@
* @exception IOException If an error occurs while reading the underlying
* stream.
***/
+ @Override
public int read() throws IOException
{
if (_noConversionRequired)
@@ -147,6 +148,7 @@
* @exception IOException If an error occurs in reading the underlying
* stream.
***/
+ @Override
public int read(byte buffer[]) throws IOException
{
return read(buffer, 0, buffer.length);
@@ -167,6 +169,7 @@
* @exception IOException If an error occurs while reading the underlying
* stream.
***/
+ @Override
public int read(byte buffer[], int offset, int length) throws IOException
{
int ch, off;
@@ -209,6 +212,7 @@
* rely on the value returned by this method if you are trying to avoid
* blocking.
***/
+ @Override
public int available() throws IOException
{
return (buf.length - pos) + in.available();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java Thu Mar 13 11:34:52 2008
@@ -96,6 +96,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public synchronized void write(int ch)
throws IOException
{
@@ -116,6 +117,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public synchronized void write(byte buffer[])
throws IOException
{
@@ -133,6 +135,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public synchronized void write(byte buffer[], int offset, int length)
throws IOException
{
@@ -154,6 +157,7 @@
* <p>
* @exception IOException If an error occurs while closing the stream.
***/
+ @Override
public synchronized void close()
throws IOException
{
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketInputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketInputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketInputStream.java Thu Mar 13 11:34:52 2008
@@ -60,6 +60,7 @@
* @exception IOException If there is an error in closing the stream
* or socket.
***/
+ @Override
public void close() throws IOException
{
super.close();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketOutputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketOutputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/SocketOutputStream.java Thu Mar 13 11:34:52 2008
@@ -66,6 +66,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public void write(byte buffer[], int offset, int length) throws IOException
{
out.write(buffer, offset, length);
@@ -79,6 +80,7 @@
* @exception IOException If there is an error in closing the stream
* or socket.
***/
+ @Override
public void close() throws IOException
{
super.close();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java Thu Mar 13 11:34:52 2008
@@ -62,6 +62,7 @@
* @exception IOException If an error occurs while reading the underlying
* stream.
***/
+ @Override
public int read() throws IOException
{
int ch;
@@ -106,6 +107,7 @@
* @exception IOException If an error occurs in reading the underlying
* stream.
***/
+ @Override
public int read(byte buffer[]) throws IOException
{
return read(buffer, 0, buffer.length);
@@ -126,6 +128,7 @@
* @exception IOException If an error occurs while reading the underlying
* stream.
***/
+ @Override
public int read(byte buffer[], int offset, int length) throws IOException
{
int ch, off;
@@ -157,11 +160,13 @@
}
/*** Returns false. Mark is not supported. ***/
+ @Override
public boolean markSupported()
{
return false;
}
+ @Override
public int available() throws IOException
{
int result;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java Thu Mar 13 11:34:52 2008
@@ -61,6 +61,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public synchronized void write(int ch)
throws IOException
{
@@ -89,6 +90,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public synchronized void write(byte buffer[])
throws IOException
{
@@ -106,6 +108,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public synchronized void write(byte buffer[], int offset, int length)
throws IOException
{
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/NNTP.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/NNTP.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/NNTP.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/NNTP.java Thu Mar 13 11:34:52 2008
@@ -171,6 +171,7 @@
* {@link #_reader_} and {@link #_writer_} to wrap
* {@link SocketClient#_input_} and {@link SocketClient#_output_}.
***/
+ @Override
protected void _connectAction_() throws IOException
{
super._connectAction_();
@@ -215,6 +216,7 @@
* <p>
* @exception IOException If an error occurs while disconnecting.
***/
+ @Override
public void disconnect() throws IOException
{
super.disconnect();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java Thu Mar 13 11:34:52 2008
@@ -143,6 +143,7 @@
* <p>
* @return The article header in the form of a String.
***/
+ @Override
public String toString()
{
StringBuffer header = new StringBuffer();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java Thu Mar 13 11:34:52 2008
@@ -568,6 +568,7 @@
*
* @return details of NTP packet as a string.
*/
+ @Override
public String toString()
{
return "[" +
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/TimeStamp.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/TimeStamp.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/TimeStamp.java Thu Mar 13 11:34:52 2008
@@ -317,6 +317,7 @@
*
* @return a hash code value for this object.
*/
+ @Override
public int hashCode()
{
return (int) (ntpTime ^ (ntpTime >>> 32));
@@ -332,6 +333,7 @@
* @return <code>true</code> if the objects are the same;
* <code>false</code> otherwise.
*/
+ @Override
public boolean equals(Object obj)
{
if (obj instanceof TimeStamp) {
@@ -349,6 +351,7 @@
* @return NTP timestamp 64-bit long value as hex string with seconds
* separated by fractional seconds.
*/
+ @Override
public String toString()
{
return toString(ntpTime);
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/pop3/POP3.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/pop3/POP3.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/pop3/POP3.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/pop3/POP3.java Thu Mar 13 11:34:52 2008
@@ -138,6 +138,7 @@
* Performs connection initialization and sets state to
* <code> AUTHORIZATION_STATE </code>.
***/
+ @Override
protected void _connectAction_() throws IOException
{
super._connectAction_();
@@ -224,6 +225,7 @@
* <p>
* @exception IOException If there is an error in disconnecting.
***/
+ @Override
public void disconnect() throws IOException
{
super.disconnect();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/RelayPath.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/RelayPath.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/RelayPath.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/RelayPath.java Thu Mar 13 11:34:52 2008
@@ -70,6 +70,7 @@
* <p>
* @return The properly formatted string representation of the relay path.
***/
+ @Override
public String toString()
{
StringBuffer buffer = new StringBuffer();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java Thu Mar 13 11:34:52 2008
@@ -235,6 +235,7 @@
}
/*** Initiates control connections and gets initial reply. ***/
+ @Override
protected void _connectAction_() throws IOException
{
super._connectAction_();
@@ -280,6 +281,7 @@
* <p>
* @exception IOException If an error occurs while disconnecting.
***/
+ @Override
public void disconnect() throws IOException
{
super.disconnect();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java Thu Mar 13 11:34:52 2008
@@ -117,6 +117,7 @@
* <p>
* @return The message header in the form of a String.
***/
+ @Override
public String toString()
{
StringBuffer header = new StringBuffer();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java Thu Mar 13 11:34:52 2008
@@ -59,6 +59,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] answerSubnegotiation(int suboptionData[],
int suboptionLength)
{
@@ -70,6 +71,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationLocal()
{
return null;
@@ -80,6 +82,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationRemote()
{
return null;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java Thu Mar 13 11:34:52 2008
@@ -54,6 +54,7 @@
* <p>
* @return the error message.
***/
+ @Override
public String getMessage()
{
return (msg + ": " + optionCode);
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java Thu Mar 13 11:34:52 2008
@@ -66,6 +66,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] answerSubnegotiation(int suboptionData[], int suboptionLength)
{
return null;
@@ -76,6 +77,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationLocal()
{
return null;
@@ -86,6 +88,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationRemote()
{
return null;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java Thu Mar 13 11:34:52 2008
@@ -59,6 +59,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] answerSubnegotiation(int suboptionData[], int suboptionLength)
{
return null;
@@ -69,6 +70,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationLocal()
{
return null;
@@ -79,6 +81,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationRemote()
{
return null;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java Thu Mar 13 11:34:52 2008
@@ -824,6 +824,7 @@
* <p>
* @throws IOException - Exception in I/O.
***/
+ @Override
protected void _connectAction_() throws IOException
{
/* (start). BUGFIX: clean the option info for each connection*/
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetClient.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetClient.java Thu Mar 13 11:34:52 2008
@@ -89,6 +89,7 @@
* <p>
* @exception IOException If an error occurs during connection setup.
***/
+ @Override
protected void _connectAction_() throws IOException
{
super._connectAction_();
@@ -123,6 +124,7 @@
* close them yourself, but rather call disconnect to properly close
* the connection.
***/
+ @Override
public void disconnect() throws IOException
{
if (__input != null)
@@ -210,10 +212,11 @@
/***
* Registers a new TelnetOptionHandler for this telnet client to use.
* <p>
- * @throws InvalidTelnetOptionException
- * <p>
* @param opthand - option handler to be registered.
+ * <p>
+ * @throws InvalidTelnetOptionException
***/
+ @Override
public void addOptionHandler(TelnetOptionHandler opthand)
throws InvalidTelnetOptionException
{
@@ -224,10 +227,11 @@
/***
* Unregisters a TelnetOptionHandler.
* <p>
- * @throws InvalidTelnetOptionException
- * <p>
* @param optcode - Code of the option to be unregistered.
+ * <p>
+ * @throws InvalidTelnetOptionException
***/
+ @Override
public void deleteOptionHandler(int optcode)
throws InvalidTelnetOptionException
{
@@ -263,6 +267,7 @@
* <p>
* @param notifhand - TelnetNotificationHandler to be registered
***/
+ @Override
public void registerNotifHandler(TelnetNotificationHandler notifhand)
{
super.registerNotifHandler(notifhand);
@@ -272,6 +277,7 @@
* Unregisters the current notification handler.
* <p>
***/
+ @Override
public void unregisterNotifHandler()
{
super.unregisterNotifHandler();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java Thu Mar 13 11:34:52 2008
@@ -321,6 +321,7 @@
}
}
+ @Override
public int read() throws IOException
{
// Critical section because we're altering __bytesAvailable,
@@ -452,6 +453,7 @@
* @exception IOException If an error occurs in reading the underlying
* stream.
***/
+ @Override
public int read(byte buffer[]) throws IOException
{
return read(buffer, 0, buffer.length);
@@ -472,6 +474,7 @@
* @exception IOException If an error occurs while reading the underlying
* stream.
***/
+ @Override
public int read(byte buffer[], int offset, int length) throws IOException
{
int ch, off;
@@ -503,11 +506,13 @@
/*** Returns false. Mark is not supported. ***/
+ @Override
public boolean markSupported()
{
return false;
}
+ @Override
public int available() throws IOException
{
// Critical section because run() may change __bytesAvailable
@@ -520,6 +525,7 @@
// Cannot be synchronized. Will cause deadlock if run() is blocked
// in read because BufferedInputStream read() is synchronized.
+ @Override
public void close() throws IOException
{
// Completely disregard the fact thread may still be running.
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TelnetOutputStream.java Thu Mar 13 11:34:52 2008
@@ -49,6 +49,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public void write(int ch) throws IOException
{
@@ -108,6 +109,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public void write(byte buffer[]) throws IOException
{
write(buffer, 0, buffer.length);
@@ -124,6 +126,7 @@
* @exception IOException If an error occurs while writing to the underlying
* stream.
***/
+ @Override
public void write(byte buffer[], int offset, int length) throws IOException
{
synchronized (__client)
@@ -134,12 +137,14 @@
}
/*** Flushes the stream. ***/
+ @Override
public void flush() throws IOException
{
__client._flushOutputStream();
}
/*** Closes the stream. ***/
+ @Override
public void close() throws IOException
{
__client._closeOutputStream();
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java Thu Mar 13 11:34:52 2008
@@ -87,6 +87,7 @@
* <p>
* @return terminal type information
***/
+ @Override
public int[] answerSubnegotiation(int suboptionData[], int suboptionLength)
{
if ((suboptionData != null) && (suboptionLength > 1)
@@ -116,6 +117,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationLocal()
{
return null;
@@ -126,6 +128,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationRemote()
{
return null;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java Thu Mar 13 11:34:52 2008
@@ -104,6 +104,7 @@
* <p>
* @return terminal type information
***/
+ @Override
public int[] answerSubnegotiation(int suboptionData[], int suboptionLength)
{
return null;
@@ -115,6 +116,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationLocal()
{
int nCompoundWindowSize = m_nWidth * 0x10000 + m_nHeight;
@@ -177,6 +179,7 @@
* <p>
* @return always null (no response to subnegotiation)
***/
+ @Override
public int[] startSubnegotiationRemote()
{
return null;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java Thu Mar 13 11:34:52 2008
@@ -95,6 +95,7 @@
* @param data The buffer to store the packet and to use in the datagram.
* @return The datagram argument.
***/
+ @Override
DatagramPacket _newDatagram(DatagramPacket datagram, byte[] data)
{
data[0] = 0;
@@ -122,6 +123,7 @@
* <p>
* @return A UDP datagram containing the TFTP acknowledgement packet.
***/
+ @Override
public DatagramPacket newDatagram()
{
byte[] data;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java Thu Mar 13 11:34:52 2008
@@ -137,6 +137,7 @@
* @param data The buffer to store the packet and to use in the datagram.
* @return The datagram argument.
***/
+ @Override
DatagramPacket _newDatagram(DatagramPacket datagram, byte[] data)
{
data[0] = 0;
@@ -168,6 +169,7 @@
* <p>
* @return A UDP datagram containing the TFTP data packet.
***/
+ @Override
public DatagramPacket newDatagram()
{
byte[] data;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java Thu Mar 13 11:34:52 2008
@@ -144,6 +144,7 @@
* @param data The buffer to store the packet and to use in the datagram.
* @return The datagram argument.
***/
+ @Override
DatagramPacket _newDatagram(DatagramPacket datagram, byte[] data)
{
int length;
@@ -180,6 +181,7 @@
* <p>
* @return A UDP datagram containing the TFTP error packet.
***/
+ @Override
public DatagramPacket newDatagram()
{
byte[] data;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java Thu Mar 13 11:34:52 2008
@@ -177,6 +177,7 @@
* @param data The buffer to store the packet and to use in the datagram.
* @return The datagram argument.
***/
+ @Override
final DatagramPacket _newDatagram(DatagramPacket datagram, byte[] data)
{
int fileLength, modeLength;
@@ -210,6 +211,7 @@
* <p>
* @return A UDP datagram containing the TFTP request packet.
***/
+ @Override
public final DatagramPacket newDatagram()
{
int fileLength, modeLength;
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java Thu Mar 13 11:34:52 2008
@@ -96,7 +96,9 @@
/* /dev/null output stream (default) */
private static final PrintStream nullStream = new PrintStream(
new OutputStream() {
+ @Override
public void write(int b){}
+ @Override
public void write(byte[] b) throws IOException {}
}
);
@@ -241,6 +243,7 @@
go.start();
}
+ @Override
protected void finalize() throws Throwable
{
shutdown();
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Thu Mar 13 11:34:52 2008
@@ -64,6 +64,7 @@
/*
* @throws java.lang.Exception
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
FTPConf = new FTPClientConfig(FTPClientConfig.SYST_UNIX);
@@ -83,6 +84,7 @@
/*
* @throws java.lang.Exception
*/
+ @Override
protected void tearDown() throws Exception {
FTP.disconnect();
super.tearDown();
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java Thu Mar 13 11:34:52 2008
@@ -146,6 +146,7 @@
/*
* @see TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception
{
super.setUp();
@@ -158,6 +159,7 @@
/*
* @see TestCase#tearDown()
*/
+ @Override
protected void tearDown()
throws Exception
{
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java Thu Mar 13 11:34:52 2008
@@ -36,6 +36,7 @@
/**
* @see FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[] getGoodListing()
{
return (getGoodListings()[0]);
@@ -62,6 +63,7 @@
/**
* @see FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[] getBadListing()
{
return (getBadListings()[0]);
@@ -92,6 +94,7 @@
/* (non-Javadoc)
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testGoodListing()
*/
+ @Override
public void testBadListing() throws Exception
{
String badsamples[][] = getBadListings();
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -87,6 +87,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
+ @Override
public void testParseFieldsOnDirectory() throws Exception
{
// Everything is a File for now.
@@ -95,6 +96,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception
{
FTPFile file = getParser().parseFTPEntry("-C--E-----FTP B QUA1I1 18128 5000000000 Aug 12 13:56 QUADTEST");
@@ -129,6 +131,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[] getBadListing()
{
@@ -138,6 +141,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[] getGoodListing()
{
@@ -147,6 +151,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser()
{
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPParseTestFramework.java Thu Mar 13 11:34:52 2008
@@ -139,6 +139,7 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Override
protected void setUp() throws Exception
{
super.setUp();
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -84,6 +84,7 @@
/* (non-Javadoc)
* @see org.apache.commons.net.ftp.parser.CompositeFTPParseTestFramework#getBadListings()
*/
+ @Override
protected String[] getBadListing() {
return badsamples;
}
@@ -91,6 +92,7 @@
/* (non-Javadoc)
* @see org.apache.commons.net.ftp.parser.CompositeFTPParseTestFramework#getGoodListings()
*/
+ @Override
protected String[] getGoodListing() {
return goodsamplesDatasetList;
}
@@ -112,6 +114,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser() {
return new MVSFTPEntryParser();
}
@@ -178,6 +181,7 @@
}
}
+ @Override
public void testParseFieldsOnDirectory() throws Exception {
MVSFTPEntryParser parser = new MVSFTPEntryParser();
parser.setType(MVSFTPEntryParser.FILE_LIST_TYPE);
@@ -200,6 +204,7 @@
/* (non-Javadoc)
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception {
FTPFile file = null;
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -87,6 +87,7 @@
/**
* @see org.apache.commons.net.ftp.parser.CompositeFTPParseTestFramework#getGoodListings()
*/
+ @Override
protected String[][] getGoodListings()
{
return goodsamples;
@@ -95,6 +96,7 @@
/**
* @see org.apache.commons.net.ftp.parser.CompositeFTPParseTestFramework#getBadListings()
*/
+ @Override
protected String[][] getBadListings()
{
return badsamples;
@@ -103,6 +105,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser()
{
return new CompositeFileEntryParser(new FTPFileEntryParser[]
@@ -126,6 +129,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
+ @Override
public void testParseFieldsOnDirectory() throws Exception
{
FTPFile dir = getParser().parseFTPEntry("12-05-96 05:03PM <DIR> absoft2");
@@ -160,6 +164,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception
{
FTPFile f = getParser().parseFTPEntry("05-22-97 12:08AM 5000000000 AUTOEXEC.BAK");
@@ -186,6 +191,7 @@
}
+ @Override
protected void doAdditionalGoodTests(String test, FTPFile f)
{
if (test.indexOf("<DIR>") >= 0)
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -52,6 +52,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[] getBadListing() {
return (badsamples);
}
@@ -59,6 +60,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[] getGoodListing() {
return (goodsamples);
}
@@ -66,6 +68,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser() {
return (new NetwareFTPEntryParser());
}
@@ -73,7 +76,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
-
+ @Override
public void testParseFieldsOnDirectory() throws Exception {
String reply = "d [-W---F--] testUser 512 Apr 13 23:12 testFile";
FTPFile f = getParser().parseFTPEntry(reply);
@@ -102,6 +105,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception {
String reply = "- [R-CEAFMS] rwinston 19968 Mar 12 15:20 Document name with spaces.doc";
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -76,6 +76,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
+ @Override
public void testParseFieldsOnDirectory() throws Exception
{
FTPFile dir = getParser().parseFTPEntry(" 0 DIR 11-28-97 09:42 PC");
@@ -91,6 +92,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception
{
FTPFile file = getParser().parseFTPEntry("5000000000 A 11-17-98 16:07 POPUPLOG.OS2");
@@ -106,6 +108,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[] getBadListing()
{
@@ -115,6 +118,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[] getGoodListing()
{
@@ -124,6 +128,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser()
{
ConfigurableFTPFileEntryParserImpl parser =
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -76,6 +76,7 @@
/**
* @see FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[][] getBadListings()
{
return badsamples;
@@ -84,6 +85,7 @@
/**
* @see FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[][] getGoodListings()
{
return goodsamples;
@@ -92,6 +94,7 @@
/**
* @see FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser()
{
return new CompositeFileEntryParser(new FTPFileEntryParser[]
@@ -104,6 +107,7 @@
/**
* @see FTPParseTestFramework#testParseFieldsOnDirectory()
*/
+ @Override
public void testParseFieldsOnDirectory() throws Exception
{
FTPFile f = getParser().parseFTPEntry("PEP 36864 04/03/24 14:06:34 *DIR dir1/");
@@ -131,6 +135,7 @@
df.format(f.getTimestamp().getTime()));
}
+ @Override
protected void doAdditionalGoodTests(String test, FTPFile f)
{
if (test.startsWith("d"))
@@ -143,6 +148,7 @@
/**
* @see FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception
{
FTPFile f = getParser().parseFTPEntry("PEP 5000000000 04/03/24 14:06:29 *STMF build.xml");
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -87,6 +87,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[] getBadListing() {
return (badsamples);
}
@@ -94,6 +95,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[] getGoodListing() {
return (goodsamples);
}
@@ -136,6 +138,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser() {
return (new UnixFTPEntryParser());
}
@@ -163,6 +166,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
+ @Override
public void testParseFieldsOnDirectory() throws Exception {
FTPFile f = getParser().parseFTPEntry("drwxr-xr-x 2 user group 4096 Mar 2 15:13 zxbox");
assertNotNull("Could not parse entry.", f);
@@ -222,6 +226,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception {
FTPFile f = getParser()
.parseFTPEntry(
@@ -265,6 +270,7 @@
* @param test
* @param f
*/
+ @Override
protected void doAdditionalGoodTests(String test, FTPFile f) {
String link = f.getLink();
if (null != link) {
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java Thu Mar 13 11:34:52 2008
@@ -144,6 +144,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnDirectory()
*/
+ @Override
public void testParseFieldsOnDirectory() throws Exception
{
@@ -182,6 +183,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#testParseFieldsOnFile()
*/
+ @Override
public void testParseFieldsOnFile() throws Exception
{
FTPFile file = getParser().parseFTPEntry("1-JUN.LIS;1 9/9 2-JUN-1998 07:32:04 [GROUP,OWNER] (RWED,RWED,RWED,RE)");
@@ -219,6 +221,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getBadListing()
*/
+ @Override
protected String[] getBadListing()
{
@@ -228,6 +231,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getGoodListing()
*/
+ @Override
protected String[] getGoodListing()
{
@@ -237,6 +241,7 @@
/**
* @see org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
*/
+ @Override
protected FTPFileEntryParser getParser()
{
ConfigurableFTPFileEntryParserImpl parser =
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/EchoOptionHandlerTest.java Thu Mar 13 11:34:52 2008
@@ -34,6 +34,7 @@
/***
* setUp for the test.
***/
+ @Override
protected void setUp()
{
opthand1 = new EchoOptionHandler();
@@ -44,6 +45,7 @@
/***
* test of the constructors.
***/
+ @Override
public void testConstructors()
{
assertEquals(opthand1.getOptionCode(), TelnetOption.ECHO);
@@ -54,6 +56,7 @@
* test of client-driven subnegotiation.
* Checks that no subnegotiation is made.
***/
+ @Override
public void testStartSubnegotiation()
{
int resp1[] = opthand1.startSubnegotiationLocal();
@@ -67,6 +70,7 @@
* test of server-driven subnegotiation.
* Checks that no subnegotiation is made.
***/
+ @Override
public void testAnswerSubnegotiation()
{
int subn[] =
Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java?rev=636825&r1=636824&r2=636825&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java (original)
+++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java Thu Mar 13 11:34:52 2008
@@ -40,6 +40,7 @@
/***
* setUp for the test.
***/
+ @Override
protected void setUp()
{
msg1 = "MSG";