Large Path/File/Directory checkin.

of the functionality that one can straightforwardly obtain from the
capabilities of java.io.File in java 5, but written with an eye on the
significantly more capable (if not significantly more appealing) nio2
API in openjdk.

2 files changed, 6 insertions, 13 deletions

diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index 3cc84b8d89..160fee3d5a 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -11,6 +11,7 @@ package nest
 import java.io.{File, PrintStream, FileOutputStream, BufferedReader,
                 InputStreamReader, StringWriter, PrintWriter}
 import java.util.StringTokenizer
+import scala.io.Directory
 
 import scala.actors.Actor._
 import scala.actors.TIMEOUT
@@ -66,13 +67,9 @@ trait DirectRunner {
           fails += 1
       }
     }
-    logsToDelete.foreach { log =>
-      NestUI.verbose("deleting "+log)
-      fileManager.deleteRecursive(log)
-    }
-    outdirsToDelete.foreach { outdir =>
-      NestUI.verbose("deleting "+outdir)
-      fileManager.deleteRecursive(outdir)
+    for (x <- logsToDelete ::: outdirsToDelete) {
+      NestUI.verbose("deleting "+x)
+      Directory(x).deleteRecursively()
     }
 
     (succs, fails)
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index bdce6c8439..f5cc52c555 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -10,6 +10,7 @@ package nest
 
 import java.io.{File, FilenameFilter, IOException, StringWriter}
 import java.net.URI
+import scala.io.Directory
 
 trait FileManager {
 
@@ -18,12 +19,7 @@ trait FileManager {
     if (inx < 0) name else name.substring(0, inx)
   }
 
-  def deleteRecursive(dir: File) {
-    if (dir.isDirectory) {
-      for (file <- dir.list) deleteRecursive(new File(dir, file))
-    }
-    dir.delete
-  }
+  def deleteRecursive(dir: File) { Directory(dir).deleteRecursively() }
 
   /**
    * Compares two files using a Java implementation of the GNU diff