diff options
| author | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2009-07-24 15:28:37 +0000 |
| commit | 40707e0f49eb991ba1cbc07bdb1bcf65a640006b (patch) | |
| tree | 00b6b70e32b941f9aa4502a91ad07fd0fc807e3d /src/compiler/scala/tools/nsc/io | |
| parent | 8a78d3748319811d7b0adc80d4ee8926dc8d90bf (diff) | |
| download | scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.gz scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.tar.bz2 scala-40707e0f49eb991ba1cbc07bdb1bcf65a640006b.zip | |
switch to unnested packages.
Diffstat (limited to 'src/compiler/scala/tools/nsc/io')
6 files changed, 13 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala index 70121aefb9..eaa3091eee 100644 --- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala +++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, FileOutputStream, IOException, InputStream, OutputStream} import java.net.URL diff --git a/src/compiler/scala/tools/nsc/io/PlainFile.scala b/src/compiler/scala/tools/nsc/io/PlainFile.scala index aa839d5892..a52ec203dc 100644 --- a/src/compiler/scala/tools/nsc/io/PlainFile.scala +++ b/src/compiler/scala/tools/nsc/io/PlainFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, FileInputStream, FileOutputStream, IOException} diff --git a/src/compiler/scala/tools/nsc/io/SourceReader.scala b/src/compiler/scala/tools/nsc/io/SourceReader.scala index 15ccee983f..21b4305b6b 100644 --- a/src/compiler/scala/tools/nsc/io/SourceReader.scala +++ b/src/compiler/scala/tools/nsc/io/SourceReader.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, FileInputStream, InputStream, IOException} import java.nio.{ByteBuffer, CharBuffer} @@ -28,7 +29,7 @@ class SourceReader(decoder: CharsetDecoder, reporter: Reporter) { private var chars: CharBuffer = CharBuffer.allocate(0x4000) private def reportEncodingError(filename:String) = { - reporter.error(nsc.util.NoPosition, + reporter.error(util.NoPosition, "IO error while decoding "+filename+" with "+decoder.charset()+"\n"+ "Please try specifying another one using the -encoding option") } diff --git a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala b/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala index 53346df53c..ff4768c6f8 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala +++ b/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala @@ -2,7 +2,8 @@ * Copyright 2005-2009 LAMP/EPFL */ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import scala.collection.{mutable=>mut} /** diff --git a/src/compiler/scala/tools/nsc/io/VirtualFile.scala b/src/compiler/scala/tools/nsc/io/VirtualFile.scala index ba86a165f7..14d081991e 100644 --- a/src/compiler/scala/tools/nsc/io/VirtualFile.scala +++ b/src/compiler/scala/tools/nsc/io/VirtualFile.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{ByteArrayInputStream, ByteArrayOutputStream, File, InputStream, OutputStream} diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index c380acd9a3..9d322af889 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -5,7 +5,8 @@ // $Id$ -package scala.tools.nsc.io +package scala.tools.nsc +package io import java.io.{File, IOException, InputStream} import java.net.URL |