diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/History.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/ZipArchive.scala | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/History.scala b/src/compiler/scala/tools/nsc/interpreter/History.scala index 7bd4e89095..1dd85cda4d 100644 --- a/src/compiler/scala/tools/nsc/interpreter/History.scala +++ b/src/compiler/scala/tools/nsc/interpreter/History.scala @@ -8,14 +8,14 @@ package interpreter import java.io.File import jline.{ ConsoleReader, History => JHistory } -import scala.collection.JavaConversions.asBuffer +import scala.collection.JavaConversions.asScalaBuffer import Properties.userHome /** Primarily, a wrapper for JLine's History. */ class History(val jhistory: JHistory) { def asJavaList = jhistory.getHistoryList - def asList: List[String] = asBuffer(asJavaList).toList + def asList: List[String] = asScalaBuffer(asJavaList).toList def index = jhistory.getCurrentIndex def grep(s: String) = asList filter (_ contains s) diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index 4a1ed2e67b..6843c7ec49 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -14,7 +14,6 @@ import java.util.zip.{ ZipEntry, ZipFile, ZipInputStream } import PartialFunction._ import scala.collection.mutable.{ Map, HashMap } -import scala.collection.JavaConversions.asIterator import annotation.tailrec /** |