Moved some files from scala/tools/util/ to scala/tools/nsc/io/

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@7121 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

src/compiler/scala/tools/nsc/CompilationUnits.scala

@@ -3,11 +3,12 @@
  * @author  Martin Odersky
  */
 // $Id$
+
 package scala.tools.nsc;
 
 import scala.tools.nsc.util.{SourceFile, Position};
 import scala.tools.nsc.util.FreshNameCreator;
-import scala.tools.util.AbstractFile;
+import scala.tools.nsc.io.AbstractFile;
 import scala.collection.mutable.HashSet;
 
 trait CompilationUnits requires Global {

src/compiler/scala/tools/nsc/Global.scala

@@ -7,7 +7,7 @@ package scala.tools.nsc;
 
 import java.io._;
 import java.nio.charset._;
-import scala.tools.util.{SourceReader,AbstractFile};
+import scala.tools.nsc.io.{SourceReader,AbstractFile};
 import scala.tools.nsc.util.ClassPath;
 import scala.tools.nsc.util.{Position,SourceFile};
 import scala.tools.nsc.reporters._;

src/compiler/scala/tools/nsc/Interpreter.scala

@@ -8,7 +8,7 @@ package scala.tools.nsc
 
 import reporters._
 import nsc.util.SourceFile
-import scala.tools.util.PlainFile
+import scala.tools.nsc.io.PlainFile
 import java.io._
 import nsc.ast.parser.SyntaxAnalyzer
 import scala.collection.mutable.{ListBuffer, HashSet, ArrayBuffer}

src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala

@@ -98,7 +98,7 @@ abstract class GenJVM extends SubComponent {
         addScalaAttr(if (isTopLevelModule(sym)) sym.sourceModule else sym);
       val outfile = getFile(jclass, ".class");
       jclass.writeTo(outfile);
-      val file = scala.tools.util.AbstractFile.getFile(outfile);
+      val file = scala.tools.nsc.io.AbstractFile.getFile(outfile);
       informProgress("wrote " + outfile + " " +
                      (if (file != null) "" + file.file + " " + file.file.exists()
                       else "no file"));

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

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 import java.io.File;

src/compiler/scala/tools/nsc/io/AbstractFileReader.scala

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 class AbstractFileReader(val file: AbstractFile) {

src/compiler/scala/tools/nsc/io/CharArrayFile.scala

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 /**

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

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 import java.io.{File, FileInputStream, IOException};

src/compiler/scala/tools/nsc/io/SourceReader.scala

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 import java.io.{File, FileInputStream, IOException};

src/compiler/scala/tools/nsc/io/VirtualFile.scala

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 import java.io.{File,IOException};

src/compiler/scala/tools/nsc/io/ZipArchive.scala

@@ -7,7 +7,7 @@
 // $Id$
 
 
-package scala.tools.util;
+package scala.tools.nsc.io;
 
 
 import java.io.{File, IOException, InputStream};

src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala

@@ -3,13 +3,12 @@
  * @author  Martin Odersky
  */
 // $Id$
+
 package scala.tools.nsc.symtab;
 
-import java.io.IOException;
-import java.io.File;
-import scala.tools.nsc.util.Position;
-import scala.tools.nsc.util.ClassPath;
-import scala.tools.util.{AbstractFile};
+import java.io.{File, IOException};
+import scala.tools.nsc.util.{Position, ClassPath};
+import scala.tools.nsc.io.AbstractFile;
 import scala.tools.nsc.util.NameTransformer;
 import scala.collection.mutable.HashMap;
 import classfile.{ClassfileParser, SymblfileParser};

src/compiler/scala/tools/nsc/symtab/Symbols.scala

@@ -6,7 +6,7 @@
 
 package scala.tools.nsc.symtab;
 
-import scala.tools.util.AbstractFile;
+import scala.tools.nsc.io.AbstractFile;
 import scala.tools.nsc.util.{Position, SourceFile};
 import Flags._;
 

src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala

@@ -2,7 +2,9 @@
  * Copyright 2005 LAMP/EPFL
  * @author  Martin Odersky
  */
+
 // $Id$
+
 /* Ideas to extend this to an icode reader:
 
   1. Parse classfile a second time, creating a hashmap `code' that associates method symbols with code.
@@ -11,13 +13,12 @@
     new = oldclass.info.decl(meth.name).suchThat(old => old.tpe =:= meth.tpe)
 
     code(new) = code(meth)
-*/ 
+*/
+
 package scala.tools.nsc.symtab.classfile;
 
 import scala.tools.nsc.util.Position;
-import scala.tools.util.AbstractFile;
-import scala.tools.util.AbstractFileReader;
-
+import scala.tools.nsc.io.{AbstractFile, AbstractFileReader};
 import scala.collection.mutable.ListBuffer;
 import scala.collection.immutable.{Map, ListMap};
 

src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala

@@ -3,11 +3,10 @@
  * @author  Martin Odersky
  */
 // $Id$
+
 package scala.tools.nsc.symtab.classfile;
 
-import scala.tools.util.{AbstractFile, AbstractFileReader};
-
-import java.io.IOException;
+import scala.tools.nsc.io.{AbstractFile, AbstractFileReader};
 
 abstract class SymblfileParser {
 

src/compiler/scala/tools/nsc/util/ClassPath.scala

@@ -11,10 +11,9 @@
 package scala.tools.nsc.util
 
 import scala.collection.mutable.ArrayBuffer
-import scala.tools.util.AbstractFile
+import scala.tools.nsc.io.AbstractFile
 
 import java.io.File
-import java.io.FileNotFoundException
 import java.util.StringTokenizer
 
 /** Richer classpath abstraction than files.

src/compiler/scala/tools/nsc/util/SourceFile.scala

@@ -7,10 +7,11 @@
 ** $Id$
 \*                                                                      */
 
-  
+
 package scala.tools.nsc.util;
-import scala.tools.util.AbstractFile;
-import scala.tools.util.CharArrayFile;
+
+
+import scala.tools.nsc.io.{AbstractFile, CharArrayFile};
 
 /** Uses positions that are offsets rather than line/column pairs.
  *

test/files/neg/bug558.scala

@@ -1,5 +1,5 @@
 package scala.tools.nsc.models;
-import scala.tools.util._;
+import scala.tools.nsc.io.AbstractFile;
 
 abstract class NewModel {
   abstract class SymbolURL {