Fixed all checkstyle errors and a findbugs error

Findbugs error was:
org.apache.commons.io.output.DeferredFileOutputStream#thresholdReached
possible file handle leak upon exception

Also contains fix for IO-446, submitted by Jeffrey Barrus

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1686747 13f79535-47bb-0310-9956-ffa450edef68

Author: krosenvold

src/main/java/org/apache/commons/io/Charsets.java

@@ -17,7 +17,6 @@
 package org.apache.commons.io;
 
 import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
 import java.util.Collections;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -101,7 +100,7 @@ public static Charset toCharset(final Charset charset) {
      * @param charset
      *            The name of the requested charset, may be null.
      * @return a Charset for the named charset
-     * @throws UnsupportedCharsetException
+     * @throws java.nio.charset.UnsupportedCharsetException
      *             If the named charset is unavailable
      */
     public static Charset toCharset(final String charset) {

src/main/java/org/apache/commons/io/DirectoryWalker.java

@@ -390,7 +390,8 @@ private void walk(final File directory, final int depth, final Collection<T> res
      * @param results  the collection of result objects, may be updated
      * @throws IOException if an I/O Error occurs
      */
-    protected final void checkIfCancelled(final File file, final int depth, final Collection<T> results) throws IOException {
+    protected final void checkIfCancelled(final File file, final int depth, final Collection<T> results) throws
+            IOException {
         if (handleIsCancelled(file, depth, results)) {
             throw new CancelException(file, depth);
         }
@@ -485,7 +486,8 @@ protected void handleStart(final File startDirectory, final Collection<T> result
      * @return true to process this directory, false to skip this directory
      * @throws IOException if an I/O Error occurs
      */
-    protected boolean handleDirectory(final File directory, final int depth, final Collection<T> results) throws IOException {
+    protected boolean handleDirectory(final File directory, final int depth, final Collection<T> results) throws
+            IOException {
         // do nothing - overridable by subclass
         return true;  // process directory
     }
@@ -500,7 +502,8 @@ protected boolean handleDirectory(final File directory, final int depth, final C
      * @param results  the collection of result objects, may be updated
      * @throws IOException if an I/O Error occurs
      */
-    protected void handleDirectoryStart(final File directory, final int depth, final Collection<T> results) throws IOException {
+    protected void handleDirectoryStart(final File directory, final int depth, final Collection<T> results) throws
+            IOException {
         // do nothing - overridable by subclass
     }
 
@@ -516,7 +519,8 @@ protected void handleDirectoryStart(final File directory, final int depth, final
      * @throws IOException if an I/O Error occurs
      * @since 2.0
      */
-    protected File[] filterDirectoryContents(final File directory, final int depth, final File[] files) throws IOException {
+    protected File[] filterDirectoryContents(final File directory, final int depth, final File[] files) throws
+            IOException {
         return files;
     }
 
@@ -544,7 +548,8 @@ protected void handleFile(final File file, final int depth, final Collection<T>
      * @param results  the collection of result objects, may be updated
      * @throws IOException if an I/O Error occurs
      */
-    protected void handleRestricted(final File directory, final int depth, final Collection<T> results) throws IOException  {
+    protected void handleRestricted(final File directory, final int depth, final Collection<T> results) throws
+            IOException {
         // do nothing - overridable by subclass
     }
 
@@ -558,7 +563,8 @@ protected void handleRestricted(final File directory, final int depth, final Col
      * @param results  the collection of result objects, may be updated
      * @throws IOException if an I/O Error occurs
      */
-    protected void handleDirectoryEnd(final File directory, final int depth, final Collection<T> results) throws IOException {
+    protected void handleDirectoryEnd(final File directory, final int depth, final Collection<T> results) throws
+            IOException {
         // do nothing - overridable by subclass
     }
 

src/main/java/org/apache/commons/io/FileCleaningTracker.java

@@ -42,7 +42,7 @@
  * @version $Id$
  */
 public class FileCleaningTracker {
-    
+
     // Note: fields are package protected to allow use by test cases
 
     /**
@@ -129,12 +129,13 @@ public void track(final String path, final Object marker, final FileDeleteStrate
 
     /**
      * Adds a tracker to the list of trackers.
-     * 
+     *
      * @param path  the full path to the file to be tracked, not null
      * @param marker  the marker object used to track the file, not null
      * @param deleteStrategy  the strategy to delete the file, null means normal
      */
-    private synchronized void addTracker(final String path, final Object marker, final FileDeleteStrategy deleteStrategy) {
+    private synchronized void addTracker(final String path, final Object marker, final FileDeleteStrategy
+            deleteStrategy) {
         // synchronized block protects reaper
         if (exitWhenFinished) {
             throw new IllegalStateException("No new trackers can be added once exitWhenFinished() is called");
@@ -185,7 +186,7 @@ public List<String> getDeleteFailures() {
      * posing a memory leak.
      * <p>
      * This method allows the thread to be terminated. Simply call this method
-     * in the resource cleanup code, such as 
+     * in the resource cleanup code, such as
      * {@code javax.servlet.ServletContextListener.contextDestroyed(javax.servlet.ServletContextEvent)}.
      * Once called, no new objects can be tracked by the file cleaner.
      */
@@ -257,7 +258,8 @@ private static final class Tracker extends PhantomReference<Object> {
          * @param marker  the marker object used to track the file, not null
          * @param queue  the queue on to which the tracker will be pushed, not null
          */
-        Tracker(final String path, final FileDeleteStrategy deleteStrategy, final Object marker, final ReferenceQueue<? super Object> queue) {
+        Tracker(final String path, final FileDeleteStrategy deleteStrategy, final Object marker,
+                final ReferenceQueue<? super Object> queue) {
             super(marker, queue);
             this.path = path;
             this.deleteStrategy = deleteStrategy == null ? FileDeleteStrategy.NORMAL : deleteStrategy;

src/main/java/org/apache/commons/io/FileSystemUtils.java

@@ -377,7 +377,8 @@ long parseDir(final String line, final String path) throws IOException {
      * @return the amount of free drive space on the volume
      * @throws IOException if an error occurs
      */
-    long freeSpaceUnix(final String path, final boolean kb, final boolean posix, final long timeout) throws IOException {
+    long freeSpaceUnix(final String path, final boolean kb, final boolean posix, final long timeout)
+            throws IOException {
         if (path.isEmpty()) {
             throw new IllegalArgumentException("Path must not be empty");
         }