svn commit: r482832 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/org/apache/commons/net/ftp/FTPClient.java main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java site/xdoc/changes.xml

[rwinston]

Author: rwinston
Date: Tue Dec  5 15:59:10 2006
New Revision: 482832

URL: http://svn.apache.org/viewvc?view=rev&rev=482832
Log:
Minor Javadoc changes

Modified:
    
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
    
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
    jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml

Modified: 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diff&rev=482832&r1=482831&r2=482832
==============================================================================
--- 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
 (original)
+++ 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
 Tue Dec  5 15:59:10 2006
@@ -103,8 +103,7 @@
  * <code> FTP.STREAM_TRANSFER_MODE </code>, and
  * <code> FTP.FILE_STRUCTURE </code>.  The only file types directly supported
  * are <code> FTP.ASCII_FILE_TYPE </code> and
- * <code> FTP.IMAGE_FILE_TYPE </code> (which is the same as
- * <code> FTP.BINARY_FILE_TYPE </code>).  Because there are at lest 4
+ * <code> FTP.BINARY_FILE_TYPE </code>.  Because there are at least 4
  * different EBCDIC encodings, we have opted not to provide direct support
  * for EBCDIC.  To transfer EBCDIC and other unsupported file types you
  * must create your own filter InputStreams and OutputStreams and wrap
@@ -954,7 +953,7 @@
 
     /***
      * Sets the file type to be transferred.  This should be one of
-     * <code> FTP.ASCII_FILE_TYPE </code>, <code> FTP.IMAGE_FILE_TYPE </code>,
+     * <code> FTP.ASCII_FILE_TYPE </code>, <code> FTP.BINARY_FILE_TYPE</code>,
      * etc.  The file type only needs to be set when you want to change the
      * type.  After changing it, the new type stays in effect until you change
      * it again.  The default file type is <code> FTP.ASCII_FILE_TYPE </code>
@@ -986,7 +985,7 @@
     /***
      * Sets the file type to be transferred and the format.  The type should be
      * one of  <code> FTP.ASCII_FILE_TYPE </code>,
-     * <code> FTP.IMAGE_FILE_TYPE </code>, etc.  The file type only needs to
+     * <code> FTP.BINARY_FILE_TYPE </code>, etc.  The file type only needs to
      * be set when you want to change the type.  After changing it, the new
      * type stays in effect until you change it again.  The default file type
      * is <code> FTP.ASCII_FILE_TYPE </code> if this method is never called.

Modified: 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?view=diff&rev=482832&r1=482831&r2=482832
==============================================================================
--- 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
 (original)
+++ 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
 Tue Dec  5 15:59:10 2006
@@ -67,6 +67,7 @@
      *               <li>[EMAIL PROTECTED] FTPClientConfig#SYST_OS400 
OS/400}</li>
      *               <li>[EMAIL PROTECTED] FTPClientConfig#SYST_VMS VMS}</li>
      *               <li>[EMAIL PROTECTED] FTPClientConfig#SYST_MVS MVS}</li>
+     *               <li>[EMAIL PROTECTED] FTPClientConfig#SYST_NETWARE}</li>
      *               </ul>
      * @return the FTPFileEntryParser corresponding to the supplied key.
      * @throws ParserInitializationException thrown if for any reason the 
factory cannot resolve

Modified: 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diff&rev=482832&r1=482831&r2=482832
==============================================================================
--- 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml 
(original)
+++ 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml 
Tue Dec  5 15:59:10 2006
@@ -23,6 +23,9 @@
 
        <body>
                <release version="2.0" date="" description="Java 5.0 release">
+                       <action dev="rwinston" type="add">
+                               Add connection timeout functionality to 
SocketClient.
+                       </action>
                        <action dev="rwinston" type="update">
                                Make the KeyManager and TrustManager settable 
(&lt;[EMAIL PROTECTED]&gt;).
                        </action>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]