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 2010/03/25 20:34:35 UTC
svn commit: r927559 - in
/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net:
SocketClient.java ftp/FTPFile.java util/Base64.java
Author: sebb
Date: Thu Mar 25 19:34:34 2010
New Revision: 927559
URL: http://svn.apache.org/viewvc?rev=927559&view=rev
Log:
Javadoc fixes
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/SocketClient.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/util/Base64.java
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/SocketClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/SocketClient.java?rev=927559&r1=927558&r2=927559&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/SocketClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/SocketClient.java Thu Mar 25 19:34:34 2010
@@ -40,7 +40,7 @@ import javax.net.SocketFactory;
* creates for initiating network connections. This is especially useful
* for adding SSL or proxy support as well as better support for applets. For
* example, you could create a
- * {@link org.apache.commons.net.SocketFactory} that
+ * {@link javax.net.SocketFactory} that
* requests browser security capabilities before creating a socket.
* All classes derived from SocketClient should use the
* {@link #_socketFactory_ _socketFactory_ } member variable to
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=927559&r1=927558&r2=927559&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 25 19:34:34 2010
@@ -21,22 +21,11 @@ import java.util.Calendar;
/***
* The FTPFile class is used to represent information about files stored
- * on an FTP server. Because there is no standard representation for
- * file information on FTP servers, it may not always be possible to
- * extract all the information that can be represented by FTPFile, or
- * it may even be possible to extract more information. In cases where
- * more information can be extracted, you will want to subclass FTPFile
- * and implement your own {@link org.apache.commons.net.ftp.FTPFileListParser}
- * to extract the information.
- * However, most FTP servers return file information in a format that
- * can be completely parsed by
- * {@link org.apache.commons.net.ftp.DefaultFTPFileListParser}
- * and stored in FTPFile.
+ * on an FTP server.
* <p>
* <p>
* @author Daniel F. Savarese
- * @see FTPFileListParser
- * @see DefaultFTPFileListParser
+ * @see FTPFileEntryParser
* @see FTPClient#listFiles
***/
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/Base64.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/Base64.java?rev=927559&r1=927558&r2=927559&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/Base64.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/Base64.java Thu Mar 25 19:34:34 2010
@@ -696,7 +696,7 @@ public class Base64 {
* @param pObject
* Object to decode
* @return An object (of type byte[]) containing the binary data which corresponds to the byte[] or String supplied.
- * @throws DecoderException
+ * @throws RuntimeException
* if the parameter supplied is not of type byte[]
*/
public Object decode(Object pObject) {
@@ -877,7 +877,7 @@ public class Base64 {
* @param pObject
* Object to encode
* @return An object (of type byte[]) containing the base64 encoded data which corresponds to the byte[] supplied.
- * @throws EncoderException
+ * @throws RuntimeException
* if the parameter supplied is not of type byte[]
*/
public Object encode(Object pObject) {