cvs commit: jakarta-commons/net/src/java/org/apache/commons/net/ftp FTPFileEntryParser.java FTPFileIterator.java FTPFileList.java FTPFileListParserImpl.java FTPClient.java

2003-03-02 Thread scohen
scohen  2003/03/02 10:15:24

  Modified:net/src/java/org/apache/commons/net/ftp FTPClient.java
  Added:   net/src/java/org/apache/commons/net/ftp
FTPFileEntryParser.java FTPFileIterator.java
FTPFileList.java FTPFileListParserImpl.java
  Log:
  new parsing system formerly in ftp 2 directory, moving to main stem now.  This 
version provides a means of solving the problem of ftp entries that span more than one
  line.
  
  Revision  ChangesPath
  1.6   +84 -0 
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java
  
  Index: FTPClient.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FTPClient.java26 Jan 2003 00:21:43 -  1.5
  +++ FTPClient.java2 Mar 2003 18:15:24 -   1.6
  @@ -2020,6 +2020,90 @@
   return listFiles(__fileListParser);
   }
   
  +/**
  + * Using a programmer specified code FTPFileEntryParser /code, 
  + * initialize an object containing a raw file information for the 
  + * current working directory.  This information is obtained through 
  + * the LIST command.  This object is then capable of being iterated to 
  + * return a sequence of FTPFile objects with information filled in by the
  + * code FTPFileEntryParser /code used.
  + * The server may or may not expand glob expressions.  You should avoid
  + * using glob expressions because the return format for glob listings
  + * differs from server to server and will likely cause this method to fail.
  + * p
  + * @param parser The code FTPFileEntryParser /code that should be
  + * used to parse each server file listing.   
  + * @return An iteratable object that holds the raw information and is 
  + * capable of providing parsed FTPFile objects, one for each file containing
  + * information contained in the given path in the format determined by the 
  + * code parser /code parameter.   Null will be returned if a 
  + * data connection cannot be opened.  If the current working directory 
  + * contains no files, an empty array will be the return.
  + * @exception FTPConnectionClosedException
  + *  If the FTP server prematurely closes the connection as a result
  + *  of the client being idle or some other reason causing the server
  + *  to send FTP reply code 421.  This exception may be caught either
  + *  as an IOException or independently as itself.
  + * @exception IOException  If an I/O error occurs while either sending a
  + *  command to the server or receiving a reply from the server.
  + * @see FTPFileList
  + */
  +public FTPFileList createFileList(FTPFileEntryParser parser)
  +throws IOException
  +{
  +return createFileList(null, parser);
  +}
  +
  +/**
  + * Using a programmer specified code FTPFileEntryParser /code, 
  + * initialize an object containing a raw file information for a directory 
  + * or information for a single file.  This information is obtained through 
  + * the LIST command.  This object is then capable of being iterated to 
  + * return a sequence of FTPFile objects with information filled in by the
  + * code FTPFileEntryParser /code used.
  + * The server may or may not expand glob expressions.  You should avoid
  + * using glob expressions because the return format for glob listings
  + * differs from server to server and will likely cause this method to fail.
  + * p
  + * @param parser The code FTPFileEntryParser /code that should be
  + * used to parse each server file listing.   
  + * @param pathname  The file or directory to list.
  + * @return An iteratable object that holds the raw information and is 
  + * capable of providing parsed FTPFile objects, one for each file containing
  + * information contained in the given path in the format determined by the 
  + * code parser /code parameter.  Null will be returned if a 
  + * data connection cannot be opened.  If the supplied path contains
  + * no files, an empty array will be the return.
  + * @exception FTPConnectionClosedException
  + *  If the FTP server prematurely closes the connection as a result
  + *  of the client being idle or some other reason causing the server
  + *  to send FTP reply code 421.  This exception may be caught either
  + *  as an IOException or independently as itself.
  + * @exception IOException  If an I/O error occurs while either sending a
  + *  command to the server or receiving a reply from the server.
  + * @see FTPFileList
  + */
  +public FTPFileList createFileList(String 

cvs commit: jakarta-commons/net/src/java/org/apache/commons/net/ftp FTPFileEntryParser.java FTPFileIterator.java FTPFileList.java

2003-03-02 Thread scohen
scohen  2003/03/02 19:42:06

  Modified:net/src/java/org/apache/commons/net/ftp
FTPFileEntryParser.java FTPFileIterator.java
FTPFileList.java
  Log:
  remove stale @see references from javadocs
  
  Revision  ChangesPath
  1.3   +2 -2  
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParser.java
  
  Index: FTPFileEntryParser.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FTPFileEntryParser.java   2 Mar 2003 19:36:43 -   1.2
  +++ FTPFileEntryParser.java   3 Mar 2003 03:42:05 -   1.3
  @@ -67,7 +67,7 @@
* @author a href=mailto:[EMAIL PROTECTED]Steve Cohen/a
* @version $Id$
* @see org.apache.commons.net.ftp.FTPFile
  - * @see FTPClient2#listFiles
  + * @see org.apache.commons.net.ftp.FTPClient#createFileList
*/
   public interface FTPFileEntryParser
   {
  
  
  
  1.3   +2 -2  
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileIterator.java
  
  Index: FTPFileIterator.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FTPFileIterator.java  2 Mar 2003 19:36:43 -   1.2
  +++ FTPFileIterator.java  3 Mar 2003 03:42:05 -   1.3
  @@ -65,7 +65,7 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Steve Cohen/a
* @version $Id$
  - * @see org.apache.commons.net.ftp.ftp2.FTPFileList
  + * @see org.apache.commons.net.ftp.FTPFileList
*/
   public class FTPFileIterator
   {
  
  
  
  1.3   +2 -3  
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileList.java
  
  Index: FTPFileList.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FTPFileList.java  2 Mar 2003 19:36:43 -   1.2
  +++ FTPFileList.java  3 Mar 2003 03:42:05 -   1.3
  @@ -77,8 +77,7 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Steve Cohen/a
* @version $Id$
  - * @see FTPClient2#listFiles
  - * @see FTPClient2#createFileList
  + * @see org.apache.commons.net.ftp.FTPClient#createFileList
*/
   public class FTPFileList
   {
  
  
  

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