diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:14:36 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-11-02 00:14:36 +0000 |
| commit | 278ec47fb14f58b82e78f4c77b49d35eec122b92 (patch) | |
| tree | e5a11c64e823fbacad8d6b65a7419b57e43b1b16 /src | |
| parent | 3f26904e68a2693b57f5b08eac1847676ff748d2 (diff) | |
| download | scala-278ec47fb14f58b82e78f4c77b49d35eec122b92.tar.gz scala-278ec47fb14f58b82e78f4c77b49d35eec122b92.tar.bz2 scala-278ec47fb14f58b82e78f4c77b49d35eec122b92.zip | |
some cleanup. no review
Diffstat (limited to 'src')
| -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 /** |