Revert "AccumulatorPathVisitor does not track directories properly."

This reverts commit b970553.

Author: Gary Gregory

src/changes/changes.xml

@@ -63,9 +63,6 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="Michiel Kalkman">
         FileUtils#copyDirectory(File, File, FileFilter, preserveFileDate) clean up #163.
       </action>
-      <action dev="ggregory" type="fix" due-to="Michiel Kalkman">
-        AccumulatorPathVisitor does not track directories properly.
-      </action>
       <!-- ADD -->
       <action dev="ggregory" type="add" due-to="Gary Gregory">
         Add FileSystemProviders class.

src/main/java/org/apache/commons/io/file/AccumulatorPathVisitor.java

@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
@@ -69,10 +70,6 @@ public AccumulatorPathVisitor(final PathCounters pathCounter) {
         super(pathCounter);
     }
 
-    private void add(final List<Path> list, final Path dir) {
-        list.add(dir.normalize());
-    }
-
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -114,12 +111,6 @@ public int hashCode() {
         return result;
     }
 
-    @Override
-    public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) throws IOException {
-        add(dirList, dir);
-        return super.postVisitDirectory(dir, exc);
-    }
-
     /**
      * Relativizes each directory path with {@link Path#relativize(Path)} against the given {@code parent}, optionally
      * sorting the result.
@@ -129,8 +120,7 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc)
      * @param comparator How to sort, null uses default sorting.
      * @return A new list
      */
-    public List<Path> relativizeDirectories(final Path parent, final boolean sort,
-        final Comparator<? super Path> comparator) {
+    public List<Path> relativizeDirectories(final Path parent, final boolean sort, final Comparator<? super Path> comparator) {
         return PathUtils.relativize(getDirList(), parent, sort, comparator);
     }
 
@@ -143,14 +133,13 @@ public List<Path> relativizeDirectories(final Path parent, final boolean sort,
      * @param comparator How to sort, null uses default sorting.
      * @return A new list
      */
-    public List<Path> relativizeFiles(final Path parent, final boolean sort,
-        final Comparator<? super Path> comparator) {
+    public List<Path> relativizeFiles(final Path parent, final boolean sort, final Comparator<? super Path> comparator) {
         return PathUtils.relativize(getFileList(), parent, sort, comparator);
     }
 
     @Override
     public FileVisitResult visitFile(final Path file, final BasicFileAttributes attributes) throws IOException {
-        add(fileList, file);
+        ((Files.isDirectory(file)) ? dirList : fileList).add(file.normalize());
         return super.visitFile(file, attributes);
     }