summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-05-16 23:46:07 +0300
committerJason Zaugg <jzaugg@gmail.com>2014-09-06 09:23:04 +1000
commitf3d97117bbd2cca9d0cb7d58eb5a62429cfe5147 (patch)
tree4000415a7f6816d7906ea4a980ffa555b18306e1 /src
parent21644611b3c676210d312eca1e0169d21070b50e (diff)
downloadscala-f3d97117bbd2cca9d0cb7d58eb5a62429cfe5147.tar.gz
scala-f3d97117bbd2cca9d0cb7d58eb5a62429cfe5147.tar.bz2
scala-f3d97117bbd2cca9d0cb7d58eb5a62429cfe5147.zip
Prefer scala.Serializable to j.io.Serializable
The former extends the latter, and exists as a platorm agnostic serialization marker trait. It is of less value now that we have jettisoned the MSIL backend, but while it still exists we ought ought to use it. I achieved this by replacing wildcard import of `java.io._` with selective imports, leaving `Serializable` to bind to `scala.Serializable`.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/immutable/List.scala4
-rw-r--r--src/library/scala/collection/immutable/PagedSeq.scala2
-rw-r--r--src/library/scala/collection/mutable/ListBuffer.scala2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index aa9dec2761..a8f1149615 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -13,7 +13,7 @@ package immutable
import generic._
import mutable.{Builder, ListBuffer}
import scala.annotation.tailrec
-import java.io._
+import java.io.{ObjectOutputStream, ObjectInputStream}
/** A class for immutable linked lists representing ordered collections
* of elements of type.
@@ -85,7 +85,7 @@ sealed abstract class List[+A] extends AbstractSeq[A]
with Product
with GenericTraversableTemplate[A, List]
with LinearSeqOptimized[A, List[A]]
- with Serializable {
+ with scala.Serializable {
override def companion: GenericCompanion[List] = List
import scala.collection.{Iterable, Traversable, Seq, IndexedSeq}
diff --git a/src/library/scala/collection/immutable/PagedSeq.scala b/src/library/scala/collection/immutable/PagedSeq.scala
index 3a64820be6..fb9f6703a9 100644
--- a/src/library/scala/collection/immutable/PagedSeq.scala
+++ b/src/library/scala/collection/immutable/PagedSeq.scala
@@ -12,7 +12,7 @@ package scala
package collection
package immutable
-import java.io._
+import java.io.{File, FileReader, Reader}
import scala.util.matching.Regex
import scala.reflect.ClassTag
diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala
index 5e838d0d88..d6a4d92139 100644
--- a/src/library/scala/collection/mutable/ListBuffer.scala
+++ b/src/library/scala/collection/mutable/ListBuffer.scala
@@ -12,7 +12,7 @@ package mutable
import generic._
import immutable.{List, Nil, ::}
-import java.io._
+import java.io.{ObjectOutputStream, ObjectInputStream}
import scala.annotation.migration
/** A `Buffer` implementation back up by a list. It provides constant time