Author: sebb
Date: Tue Mar 13 20:33:18 2012
New Revision: 1300341
URL: http://svn.apache.org/viewvc?rev=1300341&view=rev
Log:
@since 2.2 markers
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
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=1300341&r1=1300340&r2=1300341&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
Tue Mar 13 20:33:18 2012
@@ -576,6 +576,7 @@ public class FileUtils {
* @return an iterator of java.io.File for the matching files
* @see org.apache.commons.io.filefilter.FileFilterUtils
* @see org.apache.commons.io.filefilter.NameFileFilter
+ * @since 2.2
*/
public static Iterator<File> iterateFilesAndDirs(File directory,
IOFileFilter fileFilter, IOFileFilter dirFilter) {
return listFilesAndDirs(directory, fileFilter, dirFilter).iterator();
@@ -709,7 +710,7 @@ public class FileUtils {
* @return true if the content of the files are equal or neither exists,
* false otherwise
* @throws IOException in case of an I/O error
- * @since 2.1.1
+ * @since 2.2
* @see IOUtils#contentEqualsIgnoreEOL(Reader, Reader)
*/
public static boolean contentEqualsIgnoreEOL(File file1, File file2,
String charsetName) throws IOException {
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=1300341&r1=1300340&r2=1300341&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
Tue Mar 13 20:33:18 2012
@@ -1708,7 +1708,7 @@ public class IOUtils {
* @return true if the content of the readers are equal (ignoring EOL
differences), false otherwise
* @throws NullPointerException if either input is null
* @throws IOException if an I/O error occurs
- * @since Commons IO 2.1.1
+ * @since Commons IO 2.2
*/
public static boolean contentEqualsIgnoreEOL(Reader input1, Reader input2)
throws IOException {
@@ -1876,6 +1876,7 @@ public class IOUtils {
* @param length length to read, must be >= 0
* @return actual length read; may be less than requested if EOF was
reached
* @throws IOException if a read error occurs
+ * @since 2.2
*/
public static int read(Reader input, char[] buffer, int offset, int
length) throws IOException {
if (length < 0){
@@ -1903,6 +1904,7 @@ public class IOUtils {
* @param buffer destination
* @return actual length read; may be less than requested if EOF was
reached
* @throws IOException if a read error occurs
+ * @since 2.2
*/
public static int read(Reader input, char[] buffer) throws IOException {
return read(input, buffer, 0, buffer.length);
@@ -1966,6 +1968,7 @@ public class IOUtils {
* @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
* @throws EOFException if the number of characters read was incorrect
+ * @since 2.2
*/
public static void readFully(Reader input, char[] buffer, int offset, int
length) throws IOException {
int actual = read(input, buffer, offset, length);
@@ -1986,6 +1989,7 @@ public class IOUtils {
* @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
* @throws EOFException if the number of characters read was incorrect
+ * @since 2.2
*/
public static void readFully(Reader input, char[] buffer) throws
IOException {
readFully(input, buffer, 0, buffer.length);
@@ -2005,6 +2009,7 @@ public class IOUtils {
* @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
* @throws EOFException if the number of bytes read was incorrect
+ * @since 2.2
*/
public static void readFully(InputStream input, byte[] buffer, int offset,
int length) throws IOException {
int actual = read(input, buffer, offset, length);
@@ -2025,6 +2030,7 @@ public class IOUtils {
* @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
* @throws EOFException if the number of bytes read was incorrect
+ * @since 2.2
*/
public static void readFully(InputStream input, byte[] buffer) throws
IOException {
readFully(input, buffer, 0, buffer.length);
