Fix Checkstyle line length > 120 and organize imports.

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

Author: garydgregory

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

@@ -22,8 +22,8 @@
 /**
  * Charsets required of every implementation of the Java platform.
  * 
- * From the Java documentation <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard
- * charsets</a>:
+ * From the Java documentation <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">
+ * Standard charsets</a>:
  * <p>
  * <cite>Every implementation of the Java platform is required to support the following character encodings. Consult the
  * release documentation for your implementation to see if any other encodings are supported. Consult the release
@@ -52,12 +52,12 @@
  */
 public class Charsets {
     //
-    // This class should only contain Charset instances for required encodings. This guarantees that it will load correctly and
-    // without delay on all Java platforms.
+    // This class should only contain Charset instances for required encodings. This guarantees that it will load
+    // correctly and without delay on all Java platforms.
     //
 
     /**
-     * Returns the given Charset or the default Charset if the given Charset is null. 
+     * Returns the given Charset or the default Charset if the given Charset is null.
      * 
      * @param charset
      *            A charset or null.

src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java

@@ -34,8 +34,6 @@
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.filefilter.NameFileFilter;
 import org.apache.commons.io.filefilter.OrFileFilter;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 /**