Replaced java.io._ with specific imports

7 files changed, 19 insertions, 10 deletions

diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index baeae2cc93..082f5cc910 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -6,7 +6,8 @@
 
 package scala.tools.nsc
 
-import java.io._
+import java.io.{File, FileOutputStream, PrintWriter}
+import java.io.{IOException, FileNotFoundException}
 import java.nio.charset._
 import compat.Platform.currentTime
 import scala.tools.nsc.io.{SourceReader, AbstractFile}
diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
index c3024d93f3..be37fd9735 100644
--- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala
+++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
@@ -8,7 +8,8 @@ package scala.tools.nsc
 
 import java.lang.System
 import java.lang.ClassLoader
-import java.io._
+import java.io.{BufferedReader, InputStreamReader, File, FileReader, PrintWriter}
+import java.io.IOException
 
 import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
 import scala.tools.nsc.util.{Position}
diff --git a/src/compiler/scala/tools/util/SocketConnection.scala b/src/compiler/scala/tools/util/SocketConnection.scala
index df6302ab1e..c1a9fb2a20 100644
--- a/src/compiler/scala/tools/util/SocketConnection.scala
+++ b/src/compiler/scala/tools/util/SocketConnection.scala
@@ -10,8 +10,10 @@
 
 package scala.tools.util
 
-import java.io._
-import java.net._
+import java.io.{PrintWriter, InputStreamReader, BufferedReader}
+import java.io.IOException
+import java.net.{Socket, InetAddress}
+import java.net.UnknownHostException
 
 /** This class implements the connection to the server.
  *
diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala
index e6fcd2130b..8fa4285ab6 100644
--- a/src/library/scala/Console.scala
+++ b/src/library/scala/Console.scala
@@ -11,6 +11,10 @@
 
 package scala
 
+import java.io.{InputStream, Reader, InputStreamReader, BufferedReader}
+import java.io.{OutputStream, PrintStream}
+import java.text.MessageFormat
+
 import scala.util.Fluid
 
 
@@ -23,8 +27,6 @@ import scala.util.Fluid
  *  @version 1.0, 03/09/2003
  */
 object Console {
-  import java.io._
-  import java.text._
 
   // ANSI colors foreground
   final val BLACK      = "\033[30m"
diff --git a/src/library/scala/util/parsing/CharInputStreamIterator.scala b/src/library/scala/util/parsing/CharInputStreamIterator.scala
index c7702e8cb9..d08fa20b6d 100644
--- a/src/library/scala/util/parsing/CharInputStreamIterator.scala
+++ b/src/library/scala/util/parsing/CharInputStreamIterator.scala
@@ -11,7 +11,9 @@
 
 package scala.util.parsing
 
-import java.io._
+
+import java.io.InputStream
+import java.io.{IOException, EOFException}
 
 /** This class ...
  *
diff --git a/src/library/scala/xml/XML.scala b/src/library/scala/xml/XML.scala
index 35a384e892..673c44d333 100644
--- a/src/library/scala/xml/XML.scala
+++ b/src/library/scala/xml/XML.scala
@@ -11,9 +11,12 @@
 
 package scala.xml
 
+
 import Predef._
 import scala.xml.parsing.NoBindingFactoryAdapter
 import org.xml.sax.InputSource
+import java.io.{File, FileDescriptor, FileInputStream, FileOutputStream}
+import java.io.{InputStream, Reader, StringReader, Writer}
 
 /** The object <code>XML</code> provides constants, and functions to load
  *  and save XML elements. Use this when data binding is not desired, i.e.
@@ -31,8 +34,6 @@ object XML  {
   val space     = "space"
   val lang      = "lang"
 
-  import java.io._
-
   // functions for generic xml loading, saving
 
   /** loads XML from given file, using XML parser in JDK. */
diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala
index b8eff87251..99d81aef72 100644
--- a/src/library/scala/xml/parsing/FactoryAdapter.scala
+++ b/src/library/scala/xml/parsing/FactoryAdapter.scala
@@ -11,7 +11,7 @@
 
 package scala.xml.parsing
 
-import java.io._
+import java.io.{InputStream, Reader, File, FileDescriptor, FileInputStream}
 import scala.collection.mutable.{HashMap,Stack}
 import compat.StringBuilder