[prev in list] [next in list] [prev in thread] [next in thread]
List: jakarta-commons-dev
Subject: svn commit: r1415850 [4/15] - in /commons/proper/io/trunk/src: main/java/org/apache/commons/io/ main
From: ggregory () apache ! org
Date: 2012-11-30 20:52:08
Message-ID: 20121130205235.881352388A66 () eris ! apache ! org
[Download RAW message or body]
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/DelegateFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DelegateFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -42,7 +42,7 @@ public class DelegateFileFilter extends
*
* @param filter the filter to decorate
*/
- public DelegateFileFilter(FilenameFilter filter) {
+ public DelegateFileFilter(final FilenameFilter filter) {
if (filter == null) {
throw new IllegalArgumentException("The FilenameFilter must not be \
null"); }
@@ -55,7 +55,7 @@ public class DelegateFileFilter extends
*
* @param filter the filter to decorate
*/
- public DelegateFileFilter(FileFilter filter) {
+ public DelegateFileFilter(final FileFilter filter) {
if (filter == null) {
throw new IllegalArgumentException("The FileFilter must not be null");
}
@@ -70,7 +70,7 @@ public class DelegateFileFilter extends
* @return true if the filter matches
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
if (fileFilter != null) {
return fileFilter.accept(file);
} else {
@@ -86,7 +86,7 @@ public class DelegateFileFilter extends
* @return true if the filter matches
*/
@Override
- public boolean accept(File dir, String name) {
+ public boolean accept(final File dir, final String name) {
if (filenameFilter != null) {
return filenameFilter.accept(dir, name);
} else {
@@ -101,7 +101,7 @@ public class DelegateFileFilter extends
*/
@Override
public String toString() {
- String delegate = fileFilter != null ? fileFilter.toString() : \
filenameFilter.toString(); + final String delegate = fileFilter != null ? \
fileFilter.toString() : filenameFilter.toString(); return super.toString() + "(" + \
delegate + ")"; }
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/DirectoryFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -66,7 +66,7 @@ public class DirectoryFileFilter extends
* @return true if the file is a directory
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return file.isDirectory();
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/EmptyFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/EmptyFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -73,9 +73,9 @@ public class EmptyFileFilter extends Abs
* is <i>empty</i>, otherwise {@code false}.
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
if (file.isDirectory()) {
- File[] files = file.listFiles();
+ final File[] files = file.listFiles();
return files == null || files.length == 0;
} else {
return file.length() == 0;
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/FalseFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FalseFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -54,7 +54,7 @@ public class FalseFileFilter implements
* @param file the file to check (ignored)
* @return false
*/
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return false;
}
@@ -65,7 +65,7 @@ public class FalseFileFilter implements
* @param name the filename (ignored)
* @return false
*/
- public boolean accept(File dir, String name) {
+ public boolean accept(final File dir, final String name) {
return false;
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/FileFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/FileFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -55,7 +55,7 @@ public class FileFileFilter extends Abst
* @return true if the file is a file
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return file.isFile();
}
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/com \
mons/io/filefilter/FileFilterUtils.java?rev=1415850&r1=1415849&r2=1415850&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 \
Fri Nov 30 20:51:39 2012 @@ -73,15 +73,15 @@ public class FileFilterUtils {
*
* @since 2.0
*/
- public static File[] filter(IOFileFilter filter, File... files) {
+ public static File[] filter(final IOFileFilter filter, final File... files) {
if (filter == null) {
throw new IllegalArgumentException("file filter is null");
}
if (files == null) {
return new File[0];
}
- List<File> acceptedFiles = new ArrayList<File>();
- for (File file : files) {
+ final List<File> acceptedFiles = new ArrayList<File>();
+ for (final File file : files) {
if (file == null) {
throw new IllegalArgumentException("file array contains null");
}
@@ -118,8 +118,8 @@ public class FileFilterUtils {
*
* @since 2.0
*/
- public static File[] filter(IOFileFilter filter, Iterable<File> files) {
- List<File> acceptedFiles = filterList(filter, files);
+ public static File[] filter(final IOFileFilter filter, final Iterable<File> \
files) { + final List<File> acceptedFiles = filterList(filter, files);
return acceptedFiles.toArray(new File[acceptedFiles.size()]);
}
@@ -148,7 +148,7 @@ public class FileFilterUtils {
* or <code>files</code> contains a {@code null} value.
* @since 2.0
*/
- public static List<File> filterList(IOFileFilter filter, Iterable<File> files) {
+ public static List<File> filterList(final IOFileFilter filter, final \
Iterable<File> files) { return filter(filter, files, new ArrayList<File>());
}
@@ -177,8 +177,8 @@ public class FileFilterUtils {
* or <code>files</code> contains a {@code null} value.
* @since 2.0
*/
- public static List<File> filterList(IOFileFilter filter, File... files) {
- File[] acceptedFiles = filter(filter, files);
+ public static List<File> filterList(final IOFileFilter filter, final File... \
files) { + final File[] acceptedFiles = filter(filter, files);
return Arrays.asList(acceptedFiles);
}
@@ -208,8 +208,8 @@ public class FileFilterUtils {
*
* @since 2.0
*/
- public static Set<File> filterSet(IOFileFilter filter, File... files) {
- File[] acceptedFiles = filter(filter, files);
+ public static Set<File> filterSet(final IOFileFilter filter, final File... \
files) { + final File[] acceptedFiles = filter(filter, files);
return new HashSet<File>(Arrays.asList(acceptedFiles));
}
@@ -239,7 +239,7 @@ public class FileFilterUtils {
*
* @since 2.0
*/
- public static Set<File> filterSet(IOFileFilter filter, Iterable<File> files) {
+ public static Set<File> filterSet(final IOFileFilter filter, final \
Iterable<File> files) { return filter(filter, files, new HashSet<File>());
}
@@ -265,13 +265,13 @@ public class FileFilterUtils {
* @throws IllegalArgumentException if the filter is {@code null}
* or <code>files</code> contains a {@code null} value.
*/
- private static <T extends Collection<File>> T filter(IOFileFilter filter,
- Iterable<File> files, T acceptedFiles) {
+ private static <T extends Collection<File>> T filter(final IOFileFilter filter,
+ final Iterable<File> files, final T acceptedFiles) {
if (filter == null) {
throw new IllegalArgumentException("file filter is null");
}
if (files != null) {
- for (File file : files) {
+ for (final File file : files) {
if (file == null) {
throw new IllegalArgumentException("file collection contains \
null"); }
@@ -290,7 +290,7 @@ public class FileFilterUtils {
* @return a prefix checking filter
* @see PrefixFileFilter
*/
- public static IOFileFilter prefixFileFilter(String prefix) {
+ public static IOFileFilter prefixFileFilter(final String prefix) {
return new PrefixFileFilter(prefix);
}
@@ -303,7 +303,7 @@ public class FileFilterUtils {
* @see PrefixFileFilter
* @since 2.0
*/
- public static IOFileFilter prefixFileFilter(String prefix, IOCase \
caseSensitivity) { + public static IOFileFilter prefixFileFilter(final String \
prefix, final IOCase caseSensitivity) { return new PrefixFileFilter(prefix, \
caseSensitivity); }
@@ -314,7 +314,7 @@ public class FileFilterUtils {
* @return a suffix checking filter
* @see SuffixFileFilter
*/
- public static IOFileFilter suffixFileFilter(String suffix) {
+ public static IOFileFilter suffixFileFilter(final String suffix) {
return new SuffixFileFilter(suffix);
}
@@ -327,7 +327,7 @@ public class FileFilterUtils {
* @see SuffixFileFilter
* @since 2.0
*/
- public static IOFileFilter suffixFileFilter(String suffix, IOCase \
caseSensitivity) { + public static IOFileFilter suffixFileFilter(final String \
suffix, final IOCase caseSensitivity) { return new SuffixFileFilter(suffix, \
caseSensitivity); }
@@ -338,7 +338,7 @@ public class FileFilterUtils {
* @return a name checking filter
* @see NameFileFilter
*/
- public static IOFileFilter nameFileFilter(String name) {
+ public static IOFileFilter nameFileFilter(final String name) {
return new NameFileFilter(name);
}
@@ -351,7 +351,7 @@ public class FileFilterUtils {
* @see NameFileFilter
* @since 2.0
*/
- public static IOFileFilter nameFileFilter(String name, IOCase caseSensitivity) {
+ public static IOFileFilter nameFileFilter(final String name, final IOCase \
caseSensitivity) { return new NameFileFilter(name, caseSensitivity);
}
@@ -387,7 +387,7 @@ public class FileFilterUtils {
* @deprecated use {@link #and(IOFileFilter...)}
*/
@Deprecated
- public static IOFileFilter andFileFilter(IOFileFilter filter1, IOFileFilter \
filter2) { + public static IOFileFilter andFileFilter(final IOFileFilter filter1, \
final IOFileFilter filter2) { return new AndFileFilter(filter1, filter2);
}
@@ -402,7 +402,7 @@ public class FileFilterUtils {
* @deprecated use {@link #or(IOFileFilter...)}
*/
@Deprecated
- public static IOFileFilter orFileFilter(IOFileFilter filter1, IOFileFilter \
filter2) { + public static IOFileFilter orFileFilter(final IOFileFilter filter1, \
final IOFileFilter filter2) { return new OrFileFilter(filter1, filter2);
}
@@ -417,7 +417,7 @@ public class FileFilterUtils {
* @see AndFileFilter
* @since 2.0
*/
- public static IOFileFilter and(IOFileFilter... filters) {
+ public static IOFileFilter and(final IOFileFilter... filters) {
return new AndFileFilter(toList(filters));
}
@@ -432,7 +432,7 @@ public class FileFilterUtils {
* @see OrFileFilter
* @since 2.0
*/
- public static IOFileFilter or(IOFileFilter... filters) {
+ public static IOFileFilter or(final IOFileFilter... filters) {
return new OrFileFilter(toList(filters));
}
@@ -445,11 +445,11 @@ public class FileFilterUtils {
* null value.
* @since 2.0
*/
- public static List<IOFileFilter> toList(IOFileFilter... filters) {
+ public static List<IOFileFilter> toList(final IOFileFilter... filters) {
if (filters == null) {
throw new IllegalArgumentException("The filters must not be null");
}
- List<IOFileFilter> list = new ArrayList<IOFileFilter>(filters.length);
+ final List<IOFileFilter> list = new ArrayList<IOFileFilter>(filters.length);
for (int i = 0; i < filters.length; i++) {
if (filters[i] == null) {
throw new IllegalArgumentException("The filter[" + i + "] is null");
@@ -466,7 +466,7 @@ public class FileFilterUtils {
* @return a filter that NOTs the specified filter
* @see NotFileFilter
*/
- public static IOFileFilter notFileFilter(IOFileFilter filter) {
+ public static IOFileFilter notFileFilter(final IOFileFilter filter) {
return new NotFileFilter(filter);
}
@@ -500,7 +500,7 @@ public class FileFilterUtils {
* @return a new filter that implements IOFileFilter
* @see DelegateFileFilter
*/
- public static IOFileFilter asFileFilter(FileFilter filter) {
+ public static IOFileFilter asFileFilter(final FileFilter filter) {
return new DelegateFileFilter(filter);
}
@@ -512,7 +512,7 @@ public class FileFilterUtils {
* @return a new filter that implements IOFileFilter
* @see DelegateFileFilter
*/
- public static IOFileFilter asFileFilter(FilenameFilter filter) {
+ public static IOFileFilter asFileFilter(final FilenameFilter filter) {
return new DelegateFileFilter(filter);
}
@@ -526,7 +526,7 @@ public class FileFilterUtils {
* @see AgeFileFilter
* @since 1.2
*/
- public static IOFileFilter ageFileFilter(long cutoff) {
+ public static IOFileFilter ageFileFilter(final long cutoff) {
return new AgeFileFilter(cutoff);
}
@@ -539,7 +539,7 @@ public class FileFilterUtils {
* @see AgeFileFilter
* @since 1.2
*/
- public static IOFileFilter ageFileFilter(long cutoff, boolean acceptOlder) {
+ public static IOFileFilter ageFileFilter(final long cutoff, final boolean \
acceptOlder) { return new AgeFileFilter(cutoff, acceptOlder);
}
@@ -552,7 +552,7 @@ public class FileFilterUtils {
* @see AgeFileFilter
* @since 1.2
*/
- public static IOFileFilter ageFileFilter(Date cutoffDate) {
+ public static IOFileFilter ageFileFilter(final Date cutoffDate) {
return new AgeFileFilter(cutoffDate);
}
@@ -565,7 +565,7 @@ public class FileFilterUtils {
* @see AgeFileFilter
* @since 1.2
*/
- public static IOFileFilter ageFileFilter(Date cutoffDate, boolean acceptOlder) {
+ public static IOFileFilter ageFileFilter(final Date cutoffDate, final boolean \
acceptOlder) { return new AgeFileFilter(cutoffDate, acceptOlder);
}
@@ -579,7 +579,7 @@ public class FileFilterUtils {
* @see AgeFileFilter
* @since 1.2
*/
- public static IOFileFilter ageFileFilter(File cutoffReference) {
+ public static IOFileFilter ageFileFilter(final File cutoffReference) {
return new AgeFileFilter(cutoffReference);
}
@@ -593,7 +593,7 @@ public class FileFilterUtils {
* @see AgeFileFilter
* @since 1.2
*/
- public static IOFileFilter ageFileFilter(File cutoffReference, boolean \
acceptOlder) { + public static IOFileFilter ageFileFilter(final File \
cutoffReference, final boolean acceptOlder) { return new \
AgeFileFilter(cutoffReference, acceptOlder); }
@@ -606,7 +606,7 @@ public class FileFilterUtils {
* @see SizeFileFilter
* @since 1.2
*/
- public static IOFileFilter sizeFileFilter(long threshold) {
+ public static IOFileFilter sizeFileFilter(final long threshold) {
return new SizeFileFilter(threshold);
}
@@ -619,7 +619,7 @@ public class FileFilterUtils {
* @see SizeFileFilter
* @since 1.2
*/
- public static IOFileFilter sizeFileFilter(long threshold, boolean acceptLarger) \
{ + public static IOFileFilter sizeFileFilter(final long threshold, final boolean \
acceptLarger) { return new SizeFileFilter(threshold, acceptLarger);
}
@@ -633,9 +633,9 @@ public class FileFilterUtils {
* @see SizeFileFilter
* @since 1.3
*/
- public static IOFileFilter sizeRangeFileFilter(long minSizeInclusive, long \
maxSizeInclusive ) {
- IOFileFilter minimumFilter = new SizeFileFilter(minSizeInclusive, true);
- IOFileFilter maximumFilter = new SizeFileFilter(maxSizeInclusive + 1L, \
false); + public static IOFileFilter sizeRangeFileFilter(final long \
minSizeInclusive, final long maxSizeInclusive ) { + final IOFileFilter \
minimumFilter = new SizeFileFilter(minSizeInclusive, true); + final \
IOFileFilter maximumFilter = new SizeFileFilter(maxSizeInclusive + 1L, false); \
return new AndFileFilter(minimumFilter, maximumFilter); }
@@ -654,7 +654,7 @@ public class FileFilterUtils {
* @see MagicNumberFileFilter
* @since 2.0
*/
- public static IOFileFilter magicNumberFileFilter(String magicNumber) {
+ public static IOFileFilter magicNumberFileFilter(final String magicNumber) {
return new MagicNumberFileFilter(magicNumber);
}
@@ -675,7 +675,7 @@ public class FileFilterUtils {
* @see MagicNumberFileFilter
* @since 2.0
*/
- public static IOFileFilter magicNumberFileFilter(String magicNumber, long \
offset) { + public static IOFileFilter magicNumberFileFilter(final String \
magicNumber, final long offset) { return new MagicNumberFileFilter(magicNumber, \
offset); }
@@ -694,7 +694,7 @@ public class FileFilterUtils {
* @see MagicNumberFileFilter
* @since 2.0
*/
- public static IOFileFilter magicNumberFileFilter(byte[] magicNumber) {
+ public static IOFileFilter magicNumberFileFilter(final byte[] magicNumber) {
return new MagicNumberFileFilter(magicNumber);
}
@@ -715,7 +715,7 @@ public class FileFilterUtils {
* @see MagicNumberFileFilter
* @since 2.0
*/
- public static IOFileFilter magicNumberFileFilter(byte[] magicNumber, long \
offset) { + public static IOFileFilter magicNumberFileFilter(final byte[] \
magicNumber, final long offset) { return new MagicNumberFileFilter(magicNumber, \
offset); }
@@ -737,7 +737,7 @@ public class FileFilterUtils {
* @return the decorated filter, never null
* @since 1.1 (method existed but had bug in 1.0)
*/
- public static IOFileFilter makeCVSAware(IOFileFilter filter) {
+ public static IOFileFilter makeCVSAware(final IOFileFilter filter) {
if (filter == null) {
return cvsFilter;
} else {
@@ -754,7 +754,7 @@ public class FileFilterUtils {
* @return the decorated filter, never null
* @since 1.1
*/
- public static IOFileFilter makeSVNAware(IOFileFilter filter) {
+ public static IOFileFilter makeSVNAware(final IOFileFilter filter) {
if (filter == null) {
return svnFilter;
} else {
@@ -771,7 +771,7 @@ public class FileFilterUtils {
* @see DirectoryFileFilter#DIRECTORY
* @since 1.3
*/
- public static IOFileFilter makeDirectoryOnly(IOFileFilter filter) {
+ public static IOFileFilter makeDirectoryOnly(final IOFileFilter filter) {
if (filter == null) {
return DirectoryFileFilter.DIRECTORY;
}
@@ -786,7 +786,7 @@ public class FileFilterUtils {
* @see FileFileFilter#FILE
* @since 1.3
*/
- public static IOFileFilter makeFileOnly(IOFileFilter filter) {
+ public static IOFileFilter makeFileOnly(final IOFileFilter filter) {
if (filter == null) {
return FileFileFilter.FILE;
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/HiddenFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/HiddenFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -70,7 +70,7 @@ public class HiddenFileFilter extends Ab
* <i>hidden</i>, otherwise {@code false}.
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return file.isHidden();
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/MagicNumberFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/MagicNumberFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -108,7 +108,7 @@ public class MagicNumberFileFilter exten
* @throws IllegalArgumentException if <code>magicNumber</code> is
* {@code null}, or contains no bytes.
*/
- public MagicNumberFileFilter(byte[] magicNumber) {
+ public MagicNumberFileFilter(final byte[] magicNumber) {
this(magicNumber, 0);
}
@@ -133,7 +133,7 @@ public class MagicNumberFileFilter exten
* @throws IllegalArgumentException if <code>magicNumber</code> is
* {@code null} or the empty String.
*/
- public MagicNumberFileFilter(String magicNumber) {
+ public MagicNumberFileFilter(final String magicNumber) {
this(magicNumber, 0);
}
@@ -157,7 +157,7 @@ public class MagicNumberFileFilter exten
* {@code null} or the empty String, or <code>offset</code> is
* a negative number.
*/
- public MagicNumberFileFilter(String magicNumber, long offset) {
+ public MagicNumberFileFilter(final String magicNumber, final long offset) {
if (magicNumber == null) {
throw new IllegalArgumentException("The magic number cannot be null");
}
@@ -202,7 +202,7 @@ public class MagicNumberFileFilter exten
* {@code null}, or contains no bytes, or <code>offset</code>
* is a negative number.
*/
- public MagicNumberFileFilter(byte[] magicNumber, long offset) {
+ public MagicNumberFileFilter(final byte[] magicNumber, final long offset) {
if (magicNumber == null) {
throw new IllegalArgumentException("The magic number cannot be null");
}
@@ -235,19 +235,19 @@ public class MagicNumberFileFilter exten
* at the specified offset, {@code false} otherwise.
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
if (file != null && file.isFile() && file.canRead()) {
RandomAccessFile randomAccessFile = null;
try {
- byte[] fileBytes = new byte[this.magicNumbers.length];
+ final byte[] fileBytes = new byte[this.magicNumbers.length];
randomAccessFile = new RandomAccessFile(file, "r");
randomAccessFile.seek(byteOffset);
- int read = randomAccessFile.read(fileBytes);
+ final int read = randomAccessFile.read(fileBytes);
if (read != magicNumbers.length) {
return false;
}
return Arrays.equals(this.magicNumbers, fileBytes);
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
// Do nothing, fall through and do not accept file
} finally {
IOUtils.closeQuietly(randomAccessFile);
@@ -265,7 +265,7 @@ public class MagicNumberFileFilter exten
*/
@Override
public String toString() {
- StringBuilder builder = new StringBuilder(super.toString());
+ final StringBuilder builder = new StringBuilder(super.toString());
builder.append("(");
builder.append(new String(magicNumbers));// TODO perhaps use hex if value is \
not printable builder.append(",");
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/NameFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NameFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -54,7 +54,7 @@ public class NameFileFilter extends Abst
* @param name the name to allow, must not be null
* @throws IllegalArgumentException if the name is null
*/
- public NameFileFilter(String name) {
+ public NameFileFilter(final String name) {
this(name, null);
}
@@ -65,7 +65,7 @@ public class NameFileFilter extends Abst
* @param caseSensitivity how to handle case sensitivity, null means \
case-sensitive
* @throws IllegalArgumentException if the name is null
*/
- public NameFileFilter(String name, IOCase caseSensitivity) {
+ public NameFileFilter(final String name, final IOCase caseSensitivity) {
if (name == null) {
throw new IllegalArgumentException("The wildcard must not be null");
}
@@ -82,7 +82,7 @@ public class NameFileFilter extends Abst
* @param names the names to allow, must not be null
* @throws IllegalArgumentException if the names array is null
*/
- public NameFileFilter(String[] names) {
+ public NameFileFilter(final String[] names) {
this(names, null);
}
@@ -96,7 +96,7 @@ public class NameFileFilter extends Abst
* @param caseSensitivity how to handle case sensitivity, null means \
case-sensitive
* @throws IllegalArgumentException if the names array is null
*/
- public NameFileFilter(String[] names, IOCase caseSensitivity) {
+ public NameFileFilter(final String[] names, final IOCase caseSensitivity) {
if (names == null) {
throw new IllegalArgumentException("The array of names must not be \
null"); }
@@ -112,7 +112,7 @@ public class NameFileFilter extends Abst
* @throws IllegalArgumentException if the name list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public NameFileFilter(List<String> names) {
+ public NameFileFilter(final List<String> names) {
this(names, null);
}
@@ -124,7 +124,7 @@ public class NameFileFilter extends Abst
* @throws IllegalArgumentException if the name list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public NameFileFilter(List<String> names, IOCase caseSensitivity) {
+ public NameFileFilter(final List<String> names, final IOCase caseSensitivity) {
if (names == null) {
throw new IllegalArgumentException("The list of names must not be \
null"); }
@@ -140,9 +140,9 @@ public class NameFileFilter extends Abst
* @return true if the filename matches
*/
@Override
- public boolean accept(File file) {
- String name = file.getName();
- for (String name2 : this.names) {
+ public boolean accept(final File file) {
+ final String name = file.getName();
+ for (final String name2 : this.names) {
if (caseSensitivity.checkEquals(name, name2)) {
return true;
}
@@ -158,8 +158,8 @@ public class NameFileFilter extends Abst
* @return true if the filename matches
*/
@Override
- public boolean accept(File dir, String name) {
- for (String name2 : names) {
+ public boolean accept(final File dir, final String name) {
+ for (final String name2 : names) {
if (caseSensitivity.checkEquals(name, name2)) {
return true;
}
@@ -174,7 +174,7 @@ public class NameFileFilter extends Abst
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
if (names != null) {
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/NotFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/NotFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -37,7 +37,7 @@ public class NotFileFilter extends Abstr
* @param filter the filter, must not be null
* @throws IllegalArgumentException if the filter is null
*/
- public NotFileFilter(IOFileFilter filter) {
+ public NotFileFilter(final IOFileFilter filter) {
if (filter == null) {
throw new IllegalArgumentException("The filter must not be null");
}
@@ -51,7 +51,7 @@ public class NotFileFilter extends Abstr
* @return true if the filter returns false
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return ! filter.accept(file);
}
@@ -63,7 +63,7 @@ public class NotFileFilter extends Abstr
* @return true if the filter returns false
*/
@Override
- public boolean accept(File file, String name) {
+ public boolean accept(final File file, final String name) {
return ! filter.accept(file, name);
}
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=1415850&r1=1415849&r2=1415850&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 \
Fri Nov 30 20:51:39 2012 @@ -71,7 +71,7 @@ public class OrFileFilter
* @param filter2 the second filter, must not be null
* @throws IllegalArgumentException if either filter is null
*/
- public OrFileFilter(IOFileFilter filter1, IOFileFilter filter2) {
+ public OrFileFilter(final IOFileFilter filter1, final IOFileFilter filter2) {
if (filter1 == null || filter2 == null) {
throw new IllegalArgumentException("The filters must not be null");
}
@@ -97,7 +97,7 @@ public class OrFileFilter
/**
* {@inheritDoc}
*/
- public boolean removeFileFilter(IOFileFilter ioFileFilter) {
+ public boolean removeFileFilter(final IOFileFilter ioFileFilter) {
return this.fileFilters.remove(ioFileFilter);
}
@@ -114,7 +114,7 @@ public class OrFileFilter
*/
@Override
public boolean accept(final File file) {
- for (IOFileFilter fileFilter : fileFilters) {
+ for (final IOFileFilter fileFilter : fileFilters) {
if (fileFilter.accept(file)) {
return true;
}
@@ -127,7 +127,7 @@ public class OrFileFilter
*/
@Override
public boolean accept(final File file, final String name) {
- for (IOFileFilter fileFilter : fileFilters) {
+ for (final IOFileFilter fileFilter : fileFilters) {
if (fileFilter.accept(file, name)) {
return true;
}
@@ -142,7 +142,7 @@ public class OrFileFilter
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
if (fileFilters != null) {
@@ -150,7 +150,7 @@ public class OrFileFilter
if (i > 0) {
buffer.append(",");
}
- Object filter = fileFilters.get(i);
+ final Object filter = fileFilters.get(i);
buffer.append(filter == null ? "null" : filter.toString());
}
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/PrefixFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/PrefixFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -55,7 +55,7 @@ public class PrefixFileFilter extends Ab
* @param prefix the prefix to allow, must not be null
* @throws IllegalArgumentException if the prefix is null
*/
- public PrefixFileFilter(String prefix) {
+ public PrefixFileFilter(final String prefix) {
this(prefix, IOCase.SENSITIVE);
}
@@ -68,7 +68,7 @@ public class PrefixFileFilter extends Ab
* @throws IllegalArgumentException if the prefix is null
* @since 1.4
*/
- public PrefixFileFilter(String prefix, IOCase caseSensitivity) {
+ public PrefixFileFilter(final String prefix, final IOCase caseSensitivity) {
if (prefix == null) {
throw new IllegalArgumentException("The prefix must not be null");
}
@@ -85,7 +85,7 @@ public class PrefixFileFilter extends Ab
* @param prefixes the prefixes to allow, must not be null
* @throws IllegalArgumentException if the prefix array is null
*/
- public PrefixFileFilter(String[] prefixes) {
+ public PrefixFileFilter(final String[] prefixes) {
this(prefixes, IOCase.SENSITIVE);
}
@@ -101,7 +101,7 @@ public class PrefixFileFilter extends Ab
* @throws IllegalArgumentException if the prefix is null
* @since 1.4
*/
- public PrefixFileFilter(String[] prefixes, IOCase caseSensitivity) {
+ public PrefixFileFilter(final String[] prefixes, final IOCase caseSensitivity) {
if (prefixes == null) {
throw new IllegalArgumentException("The array of prefixes must not be \
null"); }
@@ -117,7 +117,7 @@ public class PrefixFileFilter extends Ab
* @throws IllegalArgumentException if the prefix list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public PrefixFileFilter(List<String> prefixes) {
+ public PrefixFileFilter(final List<String> prefixes) {
this(prefixes, IOCase.SENSITIVE);
}
@@ -131,7 +131,7 @@ public class PrefixFileFilter extends Ab
* @throws ClassCastException if the list does not contain Strings
* @since 1.4
*/
- public PrefixFileFilter(List<String> prefixes, IOCase caseSensitivity) {
+ public PrefixFileFilter(final List<String> prefixes, final IOCase \
caseSensitivity) { if (prefixes == null) {
throw new IllegalArgumentException("The list of prefixes must not be \
null"); }
@@ -146,9 +146,9 @@ public class PrefixFileFilter extends Ab
* @return true if the filename starts with one of our prefixes
*/
@Override
- public boolean accept(File file) {
- String name = file.getName();
- for (String prefix : this.prefixes) {
+ public boolean accept(final File file) {
+ final String name = file.getName();
+ for (final String prefix : this.prefixes) {
if (caseSensitivity.checkStartsWith(name, prefix)) {
return true;
}
@@ -164,8 +164,8 @@ public class PrefixFileFilter extends Ab
* @return true if the filename starts with one of our prefixes
*/
@Override
- public boolean accept(File file, String name) {
- for (String prefix : prefixes) {
+ public boolean accept(final File file, final String name) {
+ for (final String prefix : prefixes) {
if (caseSensitivity.checkStartsWith(name, prefix)) {
return true;
}
@@ -180,7 +180,7 @@ public class PrefixFileFilter extends Ab
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
if (prefixes != null) {
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/RegexFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/RegexFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -53,7 +53,7 @@ public class RegexFileFilter extends Abs
* @param pattern regular string expression to match
* @throws IllegalArgumentException if the pattern is null
*/
- public RegexFileFilter(String pattern) {
+ public RegexFileFilter(final String pattern) {
if (pattern == null) {
throw new IllegalArgumentException("Pattern is missing");
}
@@ -68,7 +68,7 @@ public class RegexFileFilter extends Abs
* @param caseSensitivity how to handle case sensitivity, null means \
case-sensitive
* @throws IllegalArgumentException if the pattern is null
*/
- public RegexFileFilter(String pattern, IOCase caseSensitivity) {
+ public RegexFileFilter(final String pattern, final IOCase caseSensitivity) {
if (pattern == null) {
throw new IllegalArgumentException("Pattern is missing");
}
@@ -86,7 +86,7 @@ public class RegexFileFilter extends Abs
* @param flags pattern flags - e.g. {@link Pattern#CASE_INSENSITIVE}
* @throws IllegalArgumentException if the pattern is null
*/
- public RegexFileFilter(String pattern, int flags) {
+ public RegexFileFilter(final String pattern, final int flags) {
if (pattern == null) {
throw new IllegalArgumentException("Pattern is missing");
}
@@ -99,7 +99,7 @@ public class RegexFileFilter extends Abs
* @param pattern regular expression to match
* @throws IllegalArgumentException if the pattern is null
*/
- public RegexFileFilter(Pattern pattern) {
+ public RegexFileFilter(final Pattern pattern) {
if (pattern == null) {
throw new IllegalArgumentException("Pattern is missing");
}
@@ -115,7 +115,7 @@ public class RegexFileFilter extends Abs
* @return true if the filename matches one of the regular expressions
*/
@Override
- public boolean accept(File dir, String name) {
+ public boolean accept(final File dir, final String name) {
return pattern.matcher(name).matches();
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/SizeFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SizeFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -54,7 +54,7 @@ public class SizeFileFilter extends Abst
* @param size the threshold size of the files
* @throws IllegalArgumentException if the size is negative
*/
- public SizeFileFilter(long size) {
+ public SizeFileFilter(final long size) {
this(size, true);
}
@@ -67,7 +67,7 @@ public class SizeFileFilter extends Abst
* otherwise smaller ones (but not equal to)
* @throws IllegalArgumentException if the size is negative
*/
- public SizeFileFilter(long size, boolean acceptLarger) {
+ public SizeFileFilter(final long size, final boolean acceptLarger) {
if (size < 0) {
throw new IllegalArgumentException("The size must be non-negative");
}
@@ -88,8 +88,8 @@ public class SizeFileFilter extends Abst
* @return true if the filename matches
*/
@Override
- public boolean accept(File file) {
- boolean smaller = file.length() < size;
+ public boolean accept(final File file) {
+ final boolean smaller = file.length() < size;
return acceptLarger ? !smaller : smaller;
}
@@ -100,7 +100,7 @@ public class SizeFileFilter extends Abst
*/
@Override
public String toString() {
- String condition = acceptLarger ? ">=" : "<";
+ final String condition = acceptLarger ? ">=" : "<";
return super.toString() + "(" + condition + size + ")";
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/SuffixFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/SuffixFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -56,7 +56,7 @@ public class SuffixFileFilter extends Ab
* @param suffix the suffix to allow, must not be null
* @throws IllegalArgumentException if the suffix is null
*/
- public SuffixFileFilter(String suffix) {
+ public SuffixFileFilter(final String suffix) {
this(suffix, IOCase.SENSITIVE);
}
@@ -69,7 +69,7 @@ public class SuffixFileFilter extends Ab
* @throws IllegalArgumentException if the suffix is null
* @since 1.4
*/
- public SuffixFileFilter(String suffix, IOCase caseSensitivity) {
+ public SuffixFileFilter(final String suffix, final IOCase caseSensitivity) {
if (suffix == null) {
throw new IllegalArgumentException("The suffix must not be null");
}
@@ -86,7 +86,7 @@ public class SuffixFileFilter extends Ab
* @param suffixes the suffixes to allow, must not be null
* @throws IllegalArgumentException if the suffix array is null
*/
- public SuffixFileFilter(String[] suffixes) {
+ public SuffixFileFilter(final String[] suffixes) {
this(suffixes, IOCase.SENSITIVE);
}
@@ -102,7 +102,7 @@ public class SuffixFileFilter extends Ab
* @throws IllegalArgumentException if the suffix array is null
* @since 1.4
*/
- public SuffixFileFilter(String[] suffixes, IOCase caseSensitivity) {
+ public SuffixFileFilter(final String[] suffixes, final IOCase caseSensitivity) {
if (suffixes == null) {
throw new IllegalArgumentException("The array of suffixes must not be \
null"); }
@@ -118,7 +118,7 @@ public class SuffixFileFilter extends Ab
* @throws IllegalArgumentException if the suffix list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public SuffixFileFilter(List<String> suffixes) {
+ public SuffixFileFilter(final List<String> suffixes) {
this(suffixes, IOCase.SENSITIVE);
}
@@ -132,7 +132,7 @@ public class SuffixFileFilter extends Ab
* @throws ClassCastException if the list does not contain Strings
* @since 1.4
*/
- public SuffixFileFilter(List<String> suffixes, IOCase caseSensitivity) {
+ public SuffixFileFilter(final List<String> suffixes, final IOCase \
caseSensitivity) { if (suffixes == null) {
throw new IllegalArgumentException("The list of suffixes must not be \
null"); }
@@ -147,9 +147,9 @@ public class SuffixFileFilter extends Ab
* @return true if the filename ends with one of our suffixes
*/
@Override
- public boolean accept(File file) {
- String name = file.getName();
- for (String suffix : this.suffixes) {
+ public boolean accept(final File file) {
+ final String name = file.getName();
+ for (final String suffix : this.suffixes) {
if (caseSensitivity.checkEndsWith(name, suffix)) {
return true;
}
@@ -165,8 +165,8 @@ public class SuffixFileFilter extends Ab
* @return true if the filename ends with one of our suffixes
*/
@Override
- public boolean accept(File file, String name) {
- for (String suffix : this.suffixes) {
+ public boolean accept(final File file, final String name) {
+ for (final String suffix : this.suffixes) {
if (caseSensitivity.checkEndsWith(name, suffix)) {
return true;
}
@@ -181,7 +181,7 @@ public class SuffixFileFilter extends Ab
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
if (suffixes != null) {
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/TrueFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/TrueFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -53,7 +53,7 @@ public class TrueFileFilter implements I
* @param file the file to check (ignored)
* @return true
*/
- public boolean accept(File file) {
+ public boolean accept(final File file) {
return true;
}
@@ -64,7 +64,7 @@ public class TrueFileFilter implements I
* @param name the filename (ignored)
* @return true
*/
- public boolean accept(File dir, String name) {
+ public boolean accept(final File dir, final String name) {
return true;
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/filefilter/WildcardFileFilter.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/filefilter/WildcardFileFilter.java \
Fri Nov 30 20:51:39 2012 @@ -61,7 +61,7 @@ public class WildcardFileFilter extends
* @param wildcard the wildcard to match
* @throws IllegalArgumentException if the pattern is null
*/
- public WildcardFileFilter(String wildcard) {
+ public WildcardFileFilter(final String wildcard) {
this(wildcard, null);
}
@@ -72,7 +72,7 @@ public class WildcardFileFilter extends
* @param caseSensitivity how to handle case sensitivity, null means \
case-sensitive
* @throws IllegalArgumentException if the pattern is null
*/
- public WildcardFileFilter(String wildcard, IOCase caseSensitivity) {
+ public WildcardFileFilter(final String wildcard, final IOCase caseSensitivity) {
if (wildcard == null) {
throw new IllegalArgumentException("The wildcard must not be null");
}
@@ -89,7 +89,7 @@ public class WildcardFileFilter extends
* @param wildcards the array of wildcards to match
* @throws IllegalArgumentException if the pattern array is null
*/
- public WildcardFileFilter(String[] wildcards) {
+ public WildcardFileFilter(final String[] wildcards) {
this(wildcards, null);
}
@@ -103,7 +103,7 @@ public class WildcardFileFilter extends
* @param caseSensitivity how to handle case sensitivity, null means \
case-sensitive
* @throws IllegalArgumentException if the pattern array is null
*/
- public WildcardFileFilter(String[] wildcards, IOCase caseSensitivity) {
+ public WildcardFileFilter(final String[] wildcards, final IOCase \
caseSensitivity) { if (wildcards == null) {
throw new IllegalArgumentException("The wildcard array must not be \
null"); }
@@ -119,7 +119,7 @@ public class WildcardFileFilter extends
* @throws IllegalArgumentException if the pattern list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public WildcardFileFilter(List<String> wildcards) {
+ public WildcardFileFilter(final List<String> wildcards) {
this(wildcards, null);
}
@@ -131,7 +131,7 @@ public class WildcardFileFilter extends
* @throws IllegalArgumentException if the pattern list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public WildcardFileFilter(List<String> wildcards, IOCase caseSensitivity) {
+ public WildcardFileFilter(final List<String> wildcards, final IOCase \
caseSensitivity) { if (wildcards == null) {
throw new IllegalArgumentException("The wildcard list must not be \
null"); }
@@ -148,8 +148,8 @@ public class WildcardFileFilter extends
* @return true if the filename matches one of the wildcards
*/
@Override
- public boolean accept(File dir, String name) {
- for (String wildcard : wildcards) {
+ public boolean accept(final File dir, final String name) {
+ for (final String wildcard : wildcards) {
if (FilenameUtils.wildcardMatch(name, wildcard, caseSensitivity)) {
return true;
}
@@ -164,9 +164,9 @@ public class WildcardFileFilter extends
* @return true if the filename matches one of the wildcards
*/
@Override
- public boolean accept(File file) {
- String name = file.getName();
- for (String wildcard : wildcards) {
+ public boolean accept(final File file) {
+ final String name = file.getName();
+ for (final String wildcard : wildcards) {
if (FilenameUtils.wildcardMatch(name, wildcard, caseSensitivity)) {
return true;
}
@@ -181,7 +181,7 @@ public class WildcardFileFilter extends
*/
@Override
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ final StringBuilder buffer = new StringBuilder();
buffer.append(super.toString());
buffer.append("(");
if (wildcards != 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/com \
mons/io/filefilter/WildcardFilter.java?rev=1415850&r1=1415849&r2=1415850&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 \
Fri Nov 30 20:51:39 2012 @@ -61,7 +61,7 @@ public class WildcardFilter extends Abst
* @param wildcard the wildcard to match
* @throws IllegalArgumentException if the pattern is null
*/
- public WildcardFilter(String wildcard) {
+ public WildcardFilter(final String wildcard) {
if (wildcard == null) {
throw new IllegalArgumentException("The wildcard must not be null");
}
@@ -74,7 +74,7 @@ public class WildcardFilter extends Abst
* @param wildcards the array of wildcards to match
* @throws IllegalArgumentException if the pattern array is null
*/
- public WildcardFilter(String[] wildcards) {
+ public WildcardFilter(final String[] wildcards) {
if (wildcards == null) {
throw new IllegalArgumentException("The wildcard array must not be \
null"); }
@@ -89,7 +89,7 @@ public class WildcardFilter extends Abst
* @throws IllegalArgumentException if the pattern list is null
* @throws ClassCastException if the list does not contain Strings
*/
- public WildcardFilter(List<String> wildcards) {
+ public WildcardFilter(final List<String> wildcards) {
if (wildcards == null) {
throw new IllegalArgumentException("The wildcard list must not be \
null"); }
@@ -105,12 +105,12 @@ public class WildcardFilter extends Abst
* @return true if the filename matches one of the wildcards
*/
@Override
- public boolean accept(File dir, String name) {
+ public boolean accept(final File dir, final String name) {
if (dir != null && new File(dir, name).isDirectory()) {
return false;
}
- for (String wildcard : wildcards) {
+ for (final String wildcard : wildcards) {
if (FilenameUtils.wildcardMatch(name, wildcard)) {
return true;
}
@@ -126,12 +126,12 @@ public class WildcardFilter extends Abst
* @return true if the filename matches one of the wildcards
*/
@Override
- public boolean accept(File file) {
+ public boolean accept(final File file) {
if (file.isDirectory()) {
return false;
}
- for (String wildcard : wildcards) {
+ for (final String wildcard : wildcards) {
if (FilenameUtils.wildcardMatch(file.getName(), wildcard)) {
return true;
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/input/AutoCloseInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/AutoCloseInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -41,7 +41,7 @@ public class AutoCloseInputStream extend
*
* @param in underlying input stream
*/
- public AutoCloseInputStream(InputStream in) {
+ public AutoCloseInputStream(final InputStream in) {
super(in);
}
@@ -72,7 +72,7 @@ public class AutoCloseInputStream extend
* @since 2.0
*/
@Override
- protected void afterRead(int n) throws IOException {
+ protected void afterRead(final int n) throws IOException {
if (n == -1) {
close();
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BOMInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BOMInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BOMInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BOMInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -103,7 +103,7 @@ public class BOMInputStream extends Prox
* @param delegate
* the InputStream to delegate to
*/
- public BOMInputStream(InputStream delegate) {
+ public BOMInputStream(final InputStream delegate) {
this(delegate, false, ByteOrderMark.UTF_8);
}
@@ -115,7 +115,7 @@ public class BOMInputStream extends Prox
* @param include
* true to include the UTF-8 BOM or false to exclude it
*/
- public BOMInputStream(InputStream delegate, boolean include) {
+ public BOMInputStream(final InputStream delegate, final boolean include) {
this(delegate, include, ByteOrderMark.UTF_8);
}
@@ -127,7 +127,7 @@ public class BOMInputStream extends Prox
* @param boms
* The BOMs to detect and exclude
*/
- public BOMInputStream(InputStream delegate, ByteOrderMark... boms) {
+ public BOMInputStream(final InputStream delegate, final ByteOrderMark... boms) {
this(delegate, false, boms);
}
@@ -136,9 +136,9 @@ public class BOMInputStream extends Prox
*/
private static final Comparator<ByteOrderMark> ByteOrderMarkLengthComparator = \
new Comparator<ByteOrderMark>() {
- public int compare(ByteOrderMark bom1, ByteOrderMark bom2) {
- int len1 = bom1.length();
- int len2 = bom2.length();
+ public int compare(final ByteOrderMark bom1, final ByteOrderMark bom2) {
+ final int len1 = bom1.length();
+ final int len2 = bom2.length();
if (len1 > len2) {
return -1;
}
@@ -159,7 +159,7 @@ public class BOMInputStream extends Prox
* @param boms
* The BOMs to detect and optionally exclude
*/
- public BOMInputStream(InputStream delegate, boolean include, ByteOrderMark... \
boms) { + public BOMInputStream(final InputStream delegate, final boolean include, \
final ByteOrderMark... boms) { super(delegate);
if (boms == null || boms.length == 0) {
throw new IllegalArgumentException("No BOMs specified");
@@ -193,7 +193,7 @@ public class BOMInputStream extends Prox
* @throws IOException
* if an error reading the first bytes of the stream occurs
*/
- public boolean hasBOM(ByteOrderMark bom) throws IOException {
+ public boolean hasBOM(final ByteOrderMark bom) throws IOException {
if (!boms.contains(bom)) {
throw new IllegalArgumentException("Stream not configure to detect " + \
bom); }
@@ -269,7 +269,7 @@ public class BOMInputStream extends Prox
* @return The matched BOM or null if none matched
*/
private ByteOrderMark find() {
- for (ByteOrderMark bom : boms) {
+ for (final ByteOrderMark bom : boms) {
if (matches(bom)) {
return bom;
}
@@ -284,7 +284,7 @@ public class BOMInputStream extends Prox
* The BOM
* @return true if the bytes match the bom, otherwise false
*/
- private boolean matches(ByteOrderMark bom) {
+ private boolean matches(final ByteOrderMark bom) {
// if (bom.length() != fbLength) {
// return false;
// }
@@ -310,7 +310,7 @@ public class BOMInputStream extends Prox
*/
@Override
public int read() throws IOException {
- int b = readFirstBytes();
+ final int b = readFirstBytes();
return b >= 0 ? b : in.read();
}
@@ -328,7 +328,7 @@ public class BOMInputStream extends Prox
* if an I/O error occurs
*/
@Override
- public int read(byte[] buf, int off, int len) throws IOException {
+ public int read(final byte[] buf, int off, int len) throws IOException {
int firstCount = 0;
int b = 0;
while (len > 0 && b >= 0) {
@@ -339,7 +339,7 @@ public class BOMInputStream extends Prox
firstCount++;
}
}
- int secondCount = in.read(buf, off, len);
+ final int secondCount = in.read(buf, off, len);
return secondCount < 0 ? firstCount > 0 ? firstCount : -1 : firstCount + \
secondCount; }
@@ -353,7 +353,7 @@ public class BOMInputStream extends Prox
* if an I/O error occurs
*/
@Override
- public int read(byte[] buf) throws IOException {
+ public int read(final byte[] buf) throws IOException {
return read(buf, 0, buf.length);
}
@@ -364,7 +364,7 @@ public class BOMInputStream extends Prox
* read ahead limit
*/
@Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(final int readlimit) {
markFbIndex = fbIndex;
markedAtStart = firstBytes == null;
in.mark(readlimit);
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/input/BoundedInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -57,7 +57,7 @@ public class BoundedInputStream extends
* @param in The wrapped input stream
* @param size The maximum number of bytes to return
*/
- public BoundedInputStream(InputStream in, long size) {
+ public BoundedInputStream(final InputStream in, final long size) {
// Some badly designed methods - eg the servlet API - overload length
// such that "-1" means stream finished
this.max = size;
@@ -70,7 +70,7 @@ public class BoundedInputStream extends
*
* @param in The wrapped input stream
*/
- public BoundedInputStream(InputStream in) {
+ public BoundedInputStream(final InputStream in) {
this(in, -1);
}
@@ -86,7 +86,7 @@ public class BoundedInputStream extends
if (max >= 0 && pos >= max) {
return -1;
}
- int result = in.read();
+ final int result = in.read();
pos++;
return result;
}
@@ -99,7 +99,7 @@ public class BoundedInputStream extends
* @throws IOException if an I/O error occurs
*/
@Override
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
return this.read(b, 0, b.length);
}
@@ -113,12 +113,12 @@ public class BoundedInputStream extends
* @throws IOException if an I/O error occurs
*/
@Override
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException \
{ if (max>=0 && pos>=max) {
return -1;
}
- long maxRead = max>=0 ? Math.min(len, max-pos) : len;
- int bytesRead = in.read(b, off, (int)maxRead);
+ final long maxRead = max>=0 ? Math.min(len, max-pos) : len;
+ final int bytesRead = in.read(b, off, (int)maxRead);
if (bytesRead==-1) {
return -1;
@@ -135,9 +135,9 @@ public class BoundedInputStream extends
* @throws IOException if an I/O error occurs
*/
@Override
- public long skip(long n) throws IOException {
- long toSkip = max>=0 ? Math.min(n, max-pos) : n;
- long skippedBytes = in.skip(toSkip);
+ public long skip(final long n) throws IOException {
+ final long toSkip = max>=0 ? Math.min(n, max-pos) : n;
+ final long skippedBytes = in.skip(toSkip);
pos+=skippedBytes;
return skippedBytes;
}
@@ -189,7 +189,7 @@ public class BoundedInputStream extends
* @param readlimit read ahead limit
*/
@Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(final int readlimit) {
in.mark(readlimit);
mark = pos;
}
@@ -224,7 +224,7 @@ public class BoundedInputStream extends
* method of the underlying stream or
* {@code false} if it does not.
*/
- public void setPropagateClose(boolean propagateClose) {
+ public void setPropagateClose(final boolean propagateClose) {
this.propagateClose = propagateClose;
}
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BrokenInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BrokenInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BrokenInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BrokenInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -40,7 +40,7 @@ public class BrokenInputStream extends I
*
* @param exception the exception to be thrown
*/
- public BrokenInputStream(IOException exception) {
+ public BrokenInputStream(final IOException exception) {
this.exception = exception;
}
@@ -81,7 +81,7 @@ public class BrokenInputStream extends I
* @throws IOException always thrown
*/
@Override
- public long skip(long n) throws IOException {
+ public long skip(final long n) throws IOException {
throw exception;
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/input/CharSequenceInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -56,7 +56,7 @@ public class CharSequenceInputStream ext
* @param charset the character set name to use
* @param bufferSize the buffer size to use.
*/
- public CharSequenceInputStream(final CharSequence cs, final Charset charset, int \
bufferSize) { + public CharSequenceInputStream(final CharSequence cs, final \
Charset charset, final int bufferSize) { super();
this.encoder = charset.newEncoder()
.onMalformedInput(CodingErrorAction.REPLACE)
@@ -74,7 +74,7 @@ public class CharSequenceInputStream ext
* @param charset the character set name to use
* @param bufferSize the buffer size to use.
*/
- public CharSequenceInputStream(final CharSequence cs, final String charset, int \
bufferSize) { + public CharSequenceInputStream(final CharSequence cs, final String \
charset, final int bufferSize) { this(cs, Charset.forName(charset), bufferSize);
}
@@ -108,7 +108,7 @@ public class CharSequenceInputStream ext
*/
private void fillBuffer() throws CharacterCodingException {
this.bbuf.compact();
- CoderResult result = this.encoder.encode(this.cbuf, this.bbuf, true);
+ final CoderResult result = this.encoder.encode(this.cbuf, this.bbuf, true);
if (result.isError()) {
result.throwException();
}
@@ -116,7 +116,7 @@ public class CharSequenceInputStream ext
}
@Override
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, int off, int len) throws IOException {
if (b == null) {
throw new NullPointerException("Byte array is null");
}
@@ -133,7 +133,7 @@ public class CharSequenceInputStream ext
int bytesRead = 0;
while (len > 0) {
if (this.bbuf.hasRemaining()) {
- int chunk = Math.min(this.bbuf.remaining(), len);
+ final int chunk = Math.min(this.bbuf.remaining(), len);
this.bbuf.get(b, off, chunk);
off += chunk;
len -= chunk;
@@ -163,7 +163,7 @@ public class CharSequenceInputStream ext
}
@Override
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
return read(b, 0, b.length);
}
@@ -192,7 +192,7 @@ public class CharSequenceInputStream ext
* @param readlimit max read limit (ignored)
*/
@Override
- public synchronized void mark(@SuppressWarnings("unused") int readlimit) {
+ public synchronized void mark(@SuppressWarnings("unused") final int readlimit) {
this.mark = this.cbuf.position();
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceReader.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/input/CharSequenceReader.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceReader.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceReader.java \
Fri Nov 30 20:51:39 2012 @@ -39,7 +39,7 @@ public class CharSequenceReader extends
*
* @param charSequence The character sequence, may be {@code null}
*/
- public CharSequenceReader(CharSequence charSequence) {
+ public CharSequenceReader(final CharSequence charSequence) {
this.charSequence = charSequence != null ? charSequence : "";
}
@@ -58,7 +58,7 @@ public class CharSequenceReader extends
* @param readAheadLimit ignored
*/
@Override
- public void mark(int readAheadLimit) {
+ public void mark(final int readAheadLimit) {
mark = idx;
}
@@ -97,7 +97,7 @@ public class CharSequenceReader extends
* no more
*/
@Override
- public int read(char[] array, int offset, int length) {
+ public int read(final char[] array, final int offset, final int length) {
if (idx >= charSequence.length()) {
return -1;
}
@@ -110,7 +110,7 @@ public class CharSequenceReader extends
}
int count = 0;
for (int i = 0; i < length; i++) {
- int c = read();
+ final int c = read();
if (c == -1) {
return count;
}
@@ -136,7 +136,7 @@ public class CharSequenceReader extends
* @return The actual number of characters skipped
*/
@Override
- public long skip(long n) {
+ public long skip(final long n) {
if (n < 0) {
throw new IllegalArgumentException(
"Number of characters to skip is less than zero: " + n);
@@ -144,8 +144,8 @@ public class CharSequenceReader extends
if (idx >= charSequence.length()) {
return -1;
}
- int dest = (int)Math.min(charSequence.length(), idx + n);
- int count = dest - idx;
+ final int dest = (int)Math.min(charSequence.length(), idx + n);
+ final int count = dest - idx;
idx = dest;
return count;
}
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/com \
mons/io/input/ClassLoaderObjectInputStream.java?rev=1415850&r1=1415849&r2=1415850&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 \
Fri Nov 30 20:51:39 2012 @@ -46,7 +46,7 @@ public class ClassLoaderObjectInputStrea
* @throws StreamCorruptedException if the stream is corrupted
*/
public ClassLoaderObjectInputStream(
- ClassLoader classLoader, InputStream inputStream)
+ final ClassLoader classLoader, final InputStream inputStream)
throws IOException, StreamCorruptedException {
super(inputStream);
this.classLoader = classLoader;
@@ -62,10 +62,10 @@ public class ClassLoaderObjectInputStrea
* @throws ClassNotFoundException if the Class cannot be found
*/
@Override
- protected Class<?> resolveClass(ObjectStreamClass objectStreamClass)
+ protected Class<?> resolveClass(final ObjectStreamClass objectStreamClass)
throws IOException, ClassNotFoundException {
- Class<?> clazz = Class.forName(objectStreamClass.getName(), false, \
classLoader); + final Class<?> clazz = \
Class.forName(objectStreamClass.getName(), false, classLoader);
if (clazz != null) {
// the classloader knows of the class
@@ -88,15 +88,15 @@ public class ClassLoaderObjectInputStrea
* @since 2.1
*/
@Override
- protected Class<?> resolveProxyClass(String[] interfaces) throws IOException,
+ protected Class<?> resolveProxyClass(final String[] interfaces) throws \
IOException, ClassNotFoundException {
- Class<?>[] interfaceClasses = new Class[interfaces.length];
+ final Class<?>[] interfaceClasses = new Class[interfaces.length];
for (int i = 0; i < interfaces.length; i++) {
interfaceClasses[i] = Class.forName(interfaces[i], false, classLoader);
}
try {
return Proxy.getProxyClass(classLoader, interfaceClasses);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
return super.resolveProxyClass(interfaces);
}
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CloseShieldInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/input/CloseShieldInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CloseShieldInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CloseShieldInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -36,7 +36,7 @@ public class CloseShieldInputStream exte
*
* @param in underlying input stream
*/
- public CloseShieldInputStream(InputStream in) {
+ public CloseShieldInputStream(final InputStream in) {
super(in);
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CountingInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/com \
mons/io/input/CountingInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff \
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CountingInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CountingInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -38,7 +38,7 @@ public class CountingInputStream extends
*
* @param in the InputStream to delegate to
*/
- public CountingInputStream(InputStream in) {
+ public CountingInputStream(final InputStream in) {
super(in);
}
@@ -67,7 +67,7 @@ public class CountingInputStream extends
* @since 2.0
*/
@Override
- protected synchronized void afterRead(int n) {
+ protected synchronized void afterRead(final int n) {
if (n != -1) {
this.count += n;
}
@@ -85,7 +85,7 @@ public class CountingInputStream extends
* @throws ArithmeticException if the byte count is too large
*/
public int getCount() {
- long result = getByteCount();
+ final long result = getByteCount();
if (result > Integer.MAX_VALUE) {
throw new ArithmeticException("The byte count " + result + " is too \
large to be converted to an int"); }
@@ -103,7 +103,7 @@ public class CountingInputStream extends
* @throws ArithmeticException if the byte count is too large
*/
public int resetCount() {
- long result = resetByteCount();
+ final long result = resetByteCount();
if (result > Integer.MAX_VALUE) {
throw new ArithmeticException("The byte count " + result + " is too \
large to be converted to an int"); }
@@ -135,7 +135,7 @@ public class CountingInputStream extends
* @since 1.3
*/
public synchronized long resetByteCount() {
- long tmp = this.count;
+ final long tmp = this.count;
this.count = 0;
return tmp;
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/DemuxInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/DemuxInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/DemuxInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/DemuxInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -36,9 +36,9 @@ public class DemuxInputStream
* @param input the stream to bind
* @return the InputStream that was previously active
*/
- public InputStream bindStream( InputStream input )
+ public InputStream bindStream( final InputStream input )
{
- InputStream oldValue = m_streams.get();
+ final InputStream oldValue = m_streams.get();
m_streams.set( input );
return oldValue;
}
@@ -52,7 +52,7 @@ public class DemuxInputStream
public void close()
throws IOException
{
- InputStream input = m_streams.get();
+ final InputStream input = m_streams.get();
if( null != input )
{
input.close();
@@ -69,7 +69,7 @@ public class DemuxInputStream
public int read()
throws IOException
{
- InputStream input = m_streams.get();
+ final InputStream input = m_streams.get();
if( null != input )
{
return input.read();
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullInputStream.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullInputStream.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullInputStream.java \
Fri Nov 30 20:51:39 2012 @@ -76,7 +76,7 @@ public class NullInputStream extends Inp
*
* @param size The size of the input stream to emulate.
*/
- public NullInputStream(long size) {
+ public NullInputStream(final long size) {
this(size, true, false);
}
@@ -91,7 +91,7 @@ public class NullInputStream extends Inp
* will throw an {@link EOFException} or return -1 when the
* end of file is reached.
*/
- public NullInputStream(long size, boolean markSupported, boolean \
throwEofException) { + public NullInputStream(final long size, final boolean \
markSupported, final boolean throwEofException) { this.size = size;
this.markSupported = markSupported;
this.throwEofException = throwEofException;
@@ -122,7 +122,7 @@ public class NullInputStream extends Inp
*/
@Override
public int available() {
- long avail = size - position;
+ final long avail = size - position;
if (avail <= 0) {
return 0;
} else if (avail > Integer.MAX_VALUE) {
@@ -153,7 +153,7 @@ public class NullInputStream extends Inp
* @throws UnsupportedOperationException if mark is not supported.
*/
@Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(final int readlimit) {
if (!markSupported) {
throw new UnsupportedOperationException("Mark not supported");
}
@@ -205,7 +205,7 @@ public class NullInputStream extends Inp
* @throws IOException if trying to read past the end of file.
*/
@Override
- public int read(byte[] bytes) throws IOException {
+ public int read(final byte[] bytes) throws IOException {
return read(bytes, 0, bytes.length);
}
@@ -223,7 +223,7 @@ public class NullInputStream extends Inp
* @throws IOException if trying to read past the end of file.
*/
@Override
- public int read(byte[] bytes, int offset, int length) throws IOException {
+ public int read(final byte[] bytes, final int offset, final int length) throws \
IOException { if (eof) {
throw new IOException("Read after end of file");
}
@@ -277,7 +277,7 @@ public class NullInputStream extends Inp
* @throws IOException if trying to read past the end of file.
*/
@Override
- public long skip(long numberOfBytes) throws IOException {
+ public long skip(final long numberOfBytes) throws IOException {
if (eof) {
throw new IOException("Skip after end of file");
}
@@ -315,7 +315,7 @@ public class NullInputStream extends Inp
* @param offset The offset to start at.
* @param length The number of bytes.
*/
- protected void processBytes(byte[] bytes, int offset, int length) {
+ protected void processBytes(final byte[] bytes, final int offset, final int \
length) { // do nothing - overridable by subclass
}
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullReader.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullReader.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullReader.java \
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/NullReader.java \
Fri Nov 30 20:51:39 2012 @@ -76,7 +76,7 @@ public class NullReader extends Reader {
*
* @param size The size of the reader to emulate.
*/
- public NullReader(long size) {
+ public NullReader(final long size) {
this(size, true, false);
}
@@ -91,7 +91,7 @@ public class NullReader extends Reader {
* will throw an {@link EOFException} or return -1 when the
* end of file is reached.
*/
- public NullReader(long size, boolean markSupported, boolean throwEofException) {
+ public NullReader(final long size, final boolean markSupported, final boolean \
throwEofException) { this.size = size;
this.markSupported = markSupported;
this.throwEofException = throwEofException;
@@ -136,7 +136,7 @@ public class NullReader extends Reader {
* @throws UnsupportedOperationException if mark is not supported.
*/
@Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(final int readlimit) {
if (!markSupported) {
throw new UnsupportedOperationException("Mark not supported");
}
@@ -188,7 +188,7 @@ public class NullReader extends Reader {
* @throws IOException if trying to read past the end of file.
*/
@Override
- public int read(char[] chars) throws IOException {
+ public int read(final char[] chars) throws IOException {
return read(chars, 0, chars.length);
}
@@ -206,7 +206,7 @@ public class NullReader extends Reader {
* @throws IOException if trying to read past the end of file.
*/
@Override
- public int read(char[] chars, int offset, int length) throws IOException {
+ public int read(final char[] chars, final int offset, final int length) throws \
IOException { if (eof) {
throw new IOException("Read after end of file");
}
@@ -260,7 +260,7 @@ public class NullReader extends Reader {
* @throws IOException if trying to read past the end of file.
*/
@Override
- public long skip(long numberOfChars) throws IOException {
+ public long skip(final long numberOfChars) throws IOException {
if (eof) {
throw new IOException("Skip after end of file");
}
@@ -298,7 +298,7 @@ public class NullReader extends Reader {
* @param offset The offset to start at.
* @param length The number of characters.
*/
- protected void processChars(char[] chars, int offset, int length) {
+ protected void processChars(final char[] chars, final int offset, final int \
length) { // do nothing - overridable by subclass
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic