Author: ggregory Date: Thu Mar 22 18:16:04 2012 New Revision: 1303950 URL: http://svn.apache.org/viewvc?rev=1303950&view=rev Log: Use "@since 1.1" instead of "@since Commons IO 1.1"
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileSystemUtils.java Thu Mar 22 18:16:04 2012 @@ -40,7 +40,7 @@ import java.util.StringTokenizer; * </ul> * * @version $Id$ - * @since Commons IO 1.1 + * @since 1.1 */ public class FileSystemUtils { @@ -133,7 +133,7 @@ public class FileSystemUtils { * @throws IllegalArgumentException if the path is invalid * @throws IllegalStateException if an error occurred in initialisation * @throws IOException if an error occurs when finding the free space - * @since Commons IO 1.1, enhanced OS support in 1.2 and 1.3 + * @since 1.1, enhanced OS support in 1.2 and 1.3 * @deprecated Use freeSpaceKb(String) * Deprecated from 1.3, may be removed in 2.0 */ Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java Thu Mar 22 18:16:04 2012 @@ -841,7 +841,7 @@ public class FileUtils { * if there was a <code>null</code> at that index in the input array * @throws IllegalArgumentException if any file is not a URL file * @throws IllegalArgumentException if any file is incorrectly encoded - * @since Commons IO 1.1 + * @since 1.1 */ public static File[] toFiles(URL[] urls) { if (urls == null || urls.length == 0) { @@ -1153,7 +1153,7 @@ public class FileUtils { * @throws NullPointerException if source or destination is <code>null</code> * @throws IOException if source or destination is invalid * @throws IOException if an IO error occurs during copying - * @since Commons IO 1.1 + * @since 1.1 */ public static void copyDirectory(File srcDir, File destDir) throws IOException { copyDirectory(srcDir, destDir, true); @@ -1183,7 +1183,7 @@ public class FileUtils { * @throws NullPointerException if source or destination is <code>null</code> * @throws IOException if source or destination is invalid * @throws IOException if an IO error occurs during copying - * @since Commons IO 1.1 + * @since 1.1 */ public static void copyDirectory(File srcDir, File destDir, boolean preserveFileDate) throws IOException { @@ -1327,7 +1327,7 @@ public class FileUtils { * @param preserveFileDate whether to preserve the file date * @param exclusionList List of files and directories to exclude from the copy, may be null * @throws IOException if an error occurs - * @since Commons IO 1.1 + * @since 1.1 */ private static void doCopyDirectory(File srcDir, File destDir, FileFilter filter, boolean preserveFileDate, List<String> exclusionList) throws IOException { @@ -1665,7 +1665,7 @@ public class FileUtils { * @param file the file to read, must not be <code>null</code> * @return the file contents, never <code>null</code> * @throws IOException in case of an I/O error - * @since Commons IO 1.1 + * @since 1.1 */ public static byte[] readFileToByteArray(File file) throws IOException { InputStream in = null; @@ -1686,7 +1686,7 @@ public class FileUtils { * @return the list of Strings representing each line in the file, never <code>null</code> * @throws IOException in case of an I/O error * @throws java.io.UnsupportedEncodingException if the encoding is not supported by the VM - * @since Commons IO 1.1 + * @since 1.1 */ public static List<String> readLines(File file, String encoding) throws IOException { InputStream in = null; @@ -1900,7 +1900,7 @@ public class FileUtils { * @param file the file to write to * @param data the content to write to the file * @throws IOException in case of an I/O error - * @since Commons IO 1.1 + * @since 1.1 */ public static void writeByteArrayToFile(File file, byte[] data) throws IOException { writeByteArrayToFile(file, data, false); @@ -1940,7 +1940,7 @@ public class FileUtils { * @param lines the lines to write, <code>null</code> entries produce blank lines * @throws IOException in case of an I/O error * @throws java.io.UnsupportedEncodingException if the encoding is not supported by the VM - * @since Commons IO 1.1 + * @since 1.1 */ public static void writeLines(File file, String encoding, Collection<?> lines) throws IOException { writeLines(file, encoding, lines, null, false); @@ -2008,7 +2008,7 @@ public class FileUtils { * @param lineEnding the line separator to use, <code>null</code> is system default * @throws IOException in case of an I/O error * @throws java.io.UnsupportedEncodingException if the encoding is not supported by the VM - * @since Commons IO 1.1 + * @since 1.1 */ public static void writeLines(File file, String encoding, Collection<?> lines, String lineEnding) throws IOException { Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java Thu Mar 22 18:16:04 2012 @@ -78,7 +78,7 @@ import java.util.Stack; * Origin of code: Excalibur, Alexandria, Tomcat, Commons-Utils. * * @version $Id$ - * @since Commons IO 1.1 + * @since 1.1 */ public class FilenameUtils { Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java Thu Mar 22 18:16:04 2012 @@ -524,7 +524,7 @@ public class IOUtils { * @return the requested byte array * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static byte[] toByteArray(Reader input, String encoding) throws IOException { @@ -563,7 +563,7 @@ public class IOUtils { * @return the requested character array * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static char[] toCharArray(InputStream is) throws IOException { CharArrayWriter output = new CharArrayWriter(); @@ -586,7 +586,7 @@ public class IOUtils { * @return the requested character array * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static char[] toCharArray(InputStream is, String encoding) throws IOException { @@ -605,7 +605,7 @@ public class IOUtils { * @return the requested character array * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static char[] toCharArray(Reader input) throws IOException { CharArrayWriter sw = new CharArrayWriter(); @@ -784,7 +784,7 @@ public class IOUtils { * @return the list of Strings, never null * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static List<String> readLines(InputStream input) throws IOException { InputStreamReader reader = new InputStreamReader(input); @@ -806,7 +806,7 @@ public class IOUtils { * @return the list of Strings, never null * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static List<String> readLines(InputStream input, String encoding) throws IOException { if (encoding == null) { @@ -828,7 +828,7 @@ public class IOUtils { * @return the list of Strings, never null * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static List<String> readLines(Reader input) throws IOException { BufferedReader reader = new BufferedReader(input); @@ -952,7 +952,7 @@ public class IOUtils { * * @param input the string to convert * @return an input stream - * @since Commons IO 1.1 + * @since 1.1 */ public static InputStream toInputStream(String input) { byte[] bytes = input.getBytes(); @@ -970,7 +970,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws IOException if the encoding is invalid * @return an input stream - * @since Commons IO 1.1 + * @since 1.1 */ public static InputStream toInputStream(String input, String encoding) throws IOException { byte[] bytes = encoding != null ? input.getBytes(encoding) : input.getBytes(); @@ -987,7 +987,7 @@ public class IOUtils { * @param output the <code>OutputStream</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(byte[] data, OutputStream output) throws IOException { @@ -1007,7 +1007,7 @@ public class IOUtils { * @param output the <code>Writer</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(byte[] data, Writer output) throws IOException { if (data != null) { @@ -1030,7 +1030,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(byte[] data, Writer output, String encoding) throws IOException { @@ -1054,7 +1054,7 @@ public class IOUtils { * @param output the <code>Writer</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(char[] data, Writer output) throws IOException { if (data != null) { @@ -1074,7 +1074,7 @@ public class IOUtils { * @param output the <code>OutputStream</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(char[] data, OutputStream output) throws IOException { @@ -1099,7 +1099,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(char[] data, OutputStream output, String encoding) throws IOException { @@ -1181,7 +1181,7 @@ public class IOUtils { * @param output the <code>Writer</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(String data, Writer output) throws IOException { if (data != null) { @@ -1200,7 +1200,7 @@ public class IOUtils { * @param output the <code>OutputStream</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(String data, OutputStream output) throws IOException { @@ -1223,7 +1223,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void write(String data, OutputStream output, String encoding) throws IOException { @@ -1245,7 +1245,7 @@ public class IOUtils { * @param output the <code>Writer</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 * @deprecated replaced by write(CharSequence, Writer) */ @Deprecated @@ -1267,7 +1267,7 @@ public class IOUtils { * @param output the <code>OutputStream</code> to write to * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 * @deprecated replaced by write(CharSequence, OutputStream) */ @Deprecated @@ -1292,7 +1292,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 * @deprecated replaced by write(CharSequence, OutputStream, String) */ @Deprecated @@ -1319,7 +1319,7 @@ public class IOUtils { * @param output the <code>OutputStream</code> to write to, not null, not closed * @throws NullPointerException if the output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void writeLines(Collection<?> lines, String lineEnding, OutputStream output) throws IOException { @@ -1351,7 +1351,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if the output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void writeLines(Collection<?> lines, String lineEnding, OutputStream output, String encoding) throws IOException { @@ -1382,7 +1382,7 @@ public class IOUtils { * @param writer the <code>Writer</code> to write to, not null, not closed * @throws NullPointerException if the input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void writeLines(Collection<?> lines, String lineEnding, Writer writer) throws IOException { @@ -1419,7 +1419,7 @@ public class IOUtils { * @return the number of bytes copied, or -1 if > Integer.MAX_VALUE * @throws NullPointerException if the input or output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static int copy(InputStream input, OutputStream output) throws IOException { long count = copyLarge(input, output); @@ -1515,7 +1515,7 @@ public class IOUtils { * @param output the <code>Writer</code> to write to * @throws NullPointerException if the input or output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void copy(InputStream input, Writer output) throws IOException { @@ -1540,7 +1540,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if the input or output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void copy(InputStream input, Writer output, String encoding) throws IOException { @@ -1570,7 +1570,7 @@ public class IOUtils { * @return the number of characters copied, or -1 if > Integer.MAX_VALUE * @throws NullPointerException if the input or output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static int copy(Reader input, Writer output) throws IOException { long count = copyLarge(input, output); @@ -1668,7 +1668,7 @@ public class IOUtils { * @param output the <code>OutputStream</code> to write to * @throws NullPointerException if the input or output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void copy(Reader input, OutputStream output) throws IOException { @@ -1700,7 +1700,7 @@ public class IOUtils { * @param encoding the encoding to use, null means platform default * @throws NullPointerException if the input or output is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static void copy(Reader input, OutputStream output, String encoding) throws IOException { @@ -1766,7 +1766,7 @@ public class IOUtils { * exist, false otherwise * @throws NullPointerException if either input is null * @throws IOException if an I/O error occurs - * @since Commons IO 1.1 + * @since 1.1 */ public static boolean contentEquals(Reader input1, Reader input2) throws IOException { Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/AndFileFilter.java Thu Mar 22 18:16:04 2012 @@ -44,7 +44,7 @@ public class AndFileFilter /** * Constructs a new instance of <code>AndFileFilter</code>. * - * @since Commons IO 1.1 + * @since 1.1 */ public AndFileFilter() { this.fileFilters = new ArrayList<IOFileFilter>(); @@ -55,7 +55,7 @@ public class AndFileFilter * with the specified list of filters. * * @param fileFilters a List of IOFileFilter instances, copied, null ignored - * @since Commons IO 1.1 + * @since 1.1 */ public AndFileFilter(final List<IOFileFilter> fileFilters) { if (fileFilters == null) { Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java Thu Mar 22 18:16:04 2012 @@ -21,7 +21,7 @@ import java.util.List; /** * Defines operations for conditional file filters. * - * @since Commons IO 1.1 + * @since 1.1 * @version $Id$ */ public interface ConditionalFileFilter { @@ -31,7 +31,7 @@ public interface ConditionalFileFilter { * the list. * * @param ioFileFilter the filter to be added - * @since Commons IO 1.1 + * @since 1.1 */ void addFileFilter(IOFileFilter ioFileFilter); @@ -39,7 +39,7 @@ public interface ConditionalFileFilter { * Returns this conditional file filter's list of file filters. * * @return the file filter list - * @since Commons IO 1.1 + * @since 1.1 */ List<IOFileFilter> getFileFilters(); @@ -49,7 +49,7 @@ public interface ConditionalFileFilter { * @param ioFileFilter filter to be removed * @return <code>true</code> if the filter was found in the list, * <code>false</code> otherwise - * @since Commons IO 1.1 + * @since 1.1 */ boolean removeFileFilter(IOFileFilter ioFileFilter); @@ -58,7 +58,7 @@ public interface ConditionalFileFilter { * file filters on this filter. * * @param fileFilters the list of filters - * @since Commons IO 1.1 + * @since 1.1 */ void setFileFilters(List<IOFileFilter> fileFilters); Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java Thu Mar 22 18:16:04 2012 @@ -735,7 +735,7 @@ public class FileFilterUtils { * * @param filter the filter to decorate, null means an unrestricted filter * @return the decorated filter, never null - * @since Commons IO 1.1 (method existed but had bug in 1.0) + * @since 1.1 (method existed but had bug in 1.0) */ public static IOFileFilter makeCVSAware(IOFileFilter filter) { if (filter == null) { @@ -752,7 +752,7 @@ public class FileFilterUtils { * * @param filter the filter to decorate, null means an unrestricted filter * @return the decorated filter, never null - * @since Commons IO 1.1 + * @since 1.1 */ public static IOFileFilter makeSVNAware(IOFileFilter filter) { if (filter == null) { Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/OrFileFilter.java Thu Mar 22 18:16:04 2012 @@ -43,7 +43,7 @@ public class OrFileFilter /** * Constructs a new instance of <code>OrFileFilter</code>. * - * @since Commons IO 1.1 + * @since 1.1 */ public OrFileFilter() { this.fileFilters = new ArrayList<IOFileFilter>(); @@ -54,7 +54,7 @@ public class OrFileFilter * with the specified filters. * * @param fileFilters the file filters for this filter, copied, null ignored - * @since Commons IO 1.1 + * @since 1.1 */ public OrFileFilter(final List<IOFileFilter> fileFilters) { if (fileFilters == null) { Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFilter.java Thu Mar 22 18:16:04 2012 @@ -45,7 +45,7 @@ import org.apache.commons.io.FilenameUti * </pre> * * @version $Id$ - * @since Commons IO 1.1 + * @since 1.1 * @deprecated Use WilcardFileFilter. Deprecated as this class performs directory * filtering which it shouldn't do, but that can't be removed due to compatability. */ Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java?rev=1303950&r1=1303949&r2=1303950&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java Thu Mar 22 18:16:04 2012 @@ -30,7 +30,7 @@ import java.lang.reflect.Proxy; * This is useful in dynamic container environments. * * @version $Id$ - * @since Commons IO 1.1 + * @since 1.1 */ public class ClassLoaderObjectInputStream extends ObjectInputStream {