Author: rwinston Date: Tue Dec 5 16:36:58 2006 New Revision: 482847 URL: http://svn.apache.org/viewvc?view=rev&rev=482847 Log: Remove some deprecated classes
Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileIterator.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileList.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java?view=diff&rev=482847&r1=482846&r2=482847 ============================================================================== --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java Tue Dec 5 16:36:58 2006 @@ -239,7 +239,7 @@ this.serverTimeZoneId = serverTimeZoneId; } - private static Map LANGUAGE_CODE_MAP = new TreeMap(); + private static Map<String, Object> LANGUAGE_CODE_MAP = new TreeMap<String, Object>(); static { // if there are other commonly used month name encodings which Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java?view=diff&rev=482847&r1=482846&r2=482847 ============================================================================== --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java Tue Dec 5 16:36:58 2006 @@ -16,7 +16,6 @@ package org.apache.commons.net.ftp; import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.util.Iterator; import java.util.List; @@ -34,49 +33,6 @@ */ public FTPFileEntryParserImpl() { - } - - - /*** - * Parses an FTP server file listing and converts it into a usable format - * in the form of an array of <code> FTPFile </code> instances. If the - * file list contains no files, <code> null </code> should be - * returned, otherwise an array of <code> FTPFile </code> instances - * representing the files in the directory is returned. - * <p> - * @param listStream The InputStream from which the file list should be - * read. - * @return The list of file information contained in the given path. null - * if the list could not be obtained or if there are no files in - * the directory. - * @exception java.io.IOException If an I/O error occurs reading the listStream. - ***/ - public FTPFile[] parseFileList(InputStream listStream, String encoding) throws IOException - { - FTPFileList ffl = FTPFileList.create(listStream, this, encoding); - return ffl.getFiles(); - - } - - /*** - * Parses an FTP server file listing and converts it into a usable format - * in the form of an array of <code> FTPFile </code> instances. If the - * file list contains no files, <code> null </code> should be - * returned, otherwise an array of <code> FTPFile </code> instances - * representing the files in the directory is returned. - * <p> - * @param listStream The InputStream from which the file list should be - * read. - * @return The list of file information contained in the given path. null - * if the list could not be obtained or if there are no files in - * the directory. - * @exception java.io.IOException If an I/O error occurs reading the listStream. - * - * @deprecated The version of this method which takes an encoding should be used. - ***/ - public FTPFile[] parseFileList(InputStream listStream) throws IOException - { - return parseFileList(listStream, null); } /** Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java?view=diff&rev=482847&r1=482846&r2=482847 ============================================================================== --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java Tue Dec 5 16:36:58 2006 @@ -71,7 +71,7 @@ * @version $Id$ */ public class FTPListParseEngine { - private List entries = new LinkedList(); + private List<String> entries = new LinkedList<String>(); private ListIterator _internalIterator = entries.listIterator(); FTPFileEntryParser parser = null; @@ -94,7 +94,7 @@ public void readServerList(InputStream stream, String encoding) throws IOException { - this.entries = new LinkedList(); + this.entries = new LinkedList<String>(); readStream(stream, encoding); this.parser.preParse(this.entries); resetIterator(); @@ -181,7 +181,7 @@ * check each entry for null before referencing it. */ public FTPFile[] getNext(int quantityRequested) { - List tmpResults = new LinkedList(); + List<FTPFile> tmpResults = new LinkedList<FTPFile>(); int count = quantityRequested; while (count > 0 && this._internalIterator.hasNext()) { String entry = (String) this._internalIterator.next(); @@ -220,7 +220,7 @@ * check each entry for null before referencing it. */ public FTPFile[] getPrevious(int quantityRequested) { - List tmpResults = new LinkedList(); + List<FTPFile> tmpResults = new LinkedList<FTPFile>(); int count = quantityRequested; while (count > 0 && this._internalIterator.hasPrevious()) { String entry = (String) this._internalIterator.previous(); @@ -246,7 +246,7 @@ public FTPFile[] getFiles() throws IOException { - List tmpResults = new LinkedList(); + List<FTPFile> tmpResults = new LinkedList<FTPFile>(); Iterator iter = this.entries.iterator(); while (iter.hasNext()) { String entry = (String) iter.next(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]