Remove PlainNioFile as it PlainFile is on nio now

Author: nicolasstucki

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

@@ -3,14 +3,14 @@
  */
 package dotty.tools.dotc.classpath
 
-import java.io.File
+import java.io.File // TODO rename to JFile for consistency
 import java.net.{URI, URL}
 import java.nio.file.{FileSystems, Files, SimpleFileVisitor}
 import java.util.function.IntFunction
 import java.util
 import java.util.Comparator
 
-import dotty.tools.io.{AbstractFile, PlainFile, ClassPath, ClassRepresentation, PlainNioFile}
+import dotty.tools.io.{AbstractFile, PlainFile, ClassPath, ClassRepresentation}
 import FileUtils._
 import scala.collection.JavaConverters._
 
@@ -178,7 +178,7 @@ final class JrtClassPath(fs: java.nio.file.FileSystem) extends ClassPath with No
     else {
       packageToModuleBases.getOrElse(inPackage, Nil).flatMap(x =>
         Files.list(x.resolve(inPackage.replace('.', '/'))).iterator().asScala.filter(_.getFileName.toString.endsWith(".class"))).map(x =>
-        ClassFileEntryImpl(new PlainNioFile(x))).toVector
+        ClassFileEntryImpl(new PlainFile(new dotty.tools.io.File(x)))).toVector
     }
   }
 
@@ -197,7 +197,7 @@ final class JrtClassPath(fs: java.nio.file.FileSystem) extends ClassPath with No
       val inPackage = packageOf(className)
       packageToModuleBases.getOrElse(inPackage, Nil).iterator.flatMap{x =>
         val file = x.resolve(className.replace('.', '/') + ".class")
-        if (Files.exists(file)) new PlainNioFile(file) :: Nil else Nil
+        if (Files.exists(file)) new PlainFile(new dotty.tools.io.File(file)) :: Nil else Nil
       }.take(1).toList.headOption
     }
   }

compiler/src/dotty/tools/io/AbstractFile.scala

@@ -245,7 +245,7 @@ abstract class AbstractFile extends Iterable[AbstractFile] {
       val path = jpath.resolve(name)
       if (isDir) Files.createDirectory(path)
       else Files.createFile(path)
-      new PlainNioFile(path)
+      new PlainFile(new File(path))
     }
   }
 

compiler/src/dotty/tools/io/PlainFile.scala

@@ -58,7 +58,7 @@ class PlainFile(val givenPath: Path) extends AbstractFile {
     try {
       import scala.collection.JavaConverters._
       val it = Files.newDirectoryStream(jpath).iterator()
-      it.asScala.map(new PlainNioFile(_))
+      it.asScala.map(p => new PlainFile(Path(p)))
     } catch {
       case _: NotDirectoryException => Iterator.empty
     }
@@ -90,76 +90,3 @@ class PlainFile(val givenPath: Path) extends AbstractFile {
   def lookupNameUnchecked(name: String, directory: Boolean): AbstractFile =
     new PlainFile(givenPath / name)
 }
-
-private[dotty] class PlainNioFile(nioPath: java.nio.file.Path) extends AbstractFile {
-
-  assert(nioPath ne null)
-
-  def jpath = nioPath
-
-  override def underlyingSource  = Some(this)
-
-  private val fpath = nioPath.toAbsolutePath.toString
-
-  /** Returns the name of this abstract file. */
-  def name = nioPath.getFileName.toString
-
-  /** Returns the path of this abstract file. */
-  def path = nioPath.toString
-
-  /** The absolute file. */
-  def absolute = new PlainNioFile(nioPath.toAbsolutePath)
-
-  override def container: AbstractFile = new PlainNioFile(nioPath.getParent)
-  override def input = Files.newInputStream(nioPath)
-  override def output = Files.newOutputStream(nioPath)
-  override def sizeOption = Some(Files.size(nioPath).toInt)
-  override def hashCode(): Int = fpath.hashCode()
-  override def equals(that: Any): Boolean = that match {
-    case x: PlainNioFile => fpath == x.fpath
-    case _               => false
-  }
-
-  /** Is this abstract file a directory? */
-  def isDirectory: Boolean = Files.isDirectory(nioPath)
-
-  /** Returns the time that this abstract file was last modified. */
-  def lastModified: Long = Files.getLastModifiedTime(nioPath).toMillis
-
-  /** Returns all abstract subfiles of this abstract directory. */
-  def iterator: Iterator[AbstractFile] = {
-    try {
-      import scala.collection.JavaConverters._
-      val it = Files.newDirectoryStream(nioPath).iterator()
-      it.asScala.map(new PlainNioFile(_))
-    } catch {
-      case _: NotDirectoryException => Iterator.empty
-    }
-  }
-
-  /**
-    * Returns the abstract file in this abstract directory with the
-    * specified name. If there is no such file, returns null. The
-    * argument "directory" tells whether to look for a directory or
-    * or a regular file.
-    */
-  def lookupName(name: String, directory: Boolean): AbstractFile = {
-    val child = nioPath.resolve(name)
-    if ((Files.isDirectory(child) && directory) || (Files.isRegularFile(child) && !directory)) new PlainNioFile(child)
-    else null
-  }
-
-  /** Does this abstract file denote an existing file? */
-  def create(): Unit = if (!exists)  Files.createFile(nioPath)
-
-  /** Delete the underlying file or directory (recursively). */
-  def delete(): Unit =
-    if (Files.isRegularFile(nioPath)) Files.deleteIfExists(nioPath)
-    else if (Files.isDirectory(nioPath)) new Directory(nioPath).deleteRecursively()
-
-  /** Returns a plain file with the given name. It does not
-    *  check that it exists.
-    */
-  def lookupNameUnchecked(name: String, directory: Boolean): AbstractFile =
-    new PlainNioFile(nioPath.resolve(name))
-}