diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-30 03:13:38 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-30 03:13:38 +0000 |
commit | 3ec0583fb6724416d5ebda8a927bbdecc23ebef5 (patch) | |
tree | 6ff6cdd93812393dc145bb36b4644775a842fde0 /src/compiler/scala/tools/nsc/io/ZipArchive.scala | |
parent | cf49fb332626621f3443f15cb9e4cc5339a7a748 (diff) | |
download | scala-3ec0583fb6724416d5ebda8a927bbdecc23ebef5.tar.gz scala-3ec0583fb6724416d5ebda8a927bbdecc23ebef5.tar.bz2 scala-3ec0583fb6724416d5ebda8a927bbdecc23ebef5.zip |
It's all partest freeze debugging. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/io/ZipArchive.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/io/ZipArchive.scala | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index 6843c7ec49..5f708b3c82 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -209,7 +209,7 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file) protected lazy val root = new ZipRootCreator(_.parent)() protected def DirEntryConstructor = new DirEntry(_, _, _) protected def FileEntryConstructor = new FileEntry(_, _, _, _) - protected def ZipTravConstructor = zipTraversableFromZipFile _ + protected def ZipTravConstructor = new ZipFileIterable(_) abstract class Entry( override val container: AbstractFile, @@ -247,15 +247,14 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file) override def input = archive getInputStream entry } - private def zipTraversableFromZipFile(z: ZipFile): ZipTrav = - new Iterable[ZipEntry] with ZipTrav { - def zis: () => ZipInputStream = null // not valid for this type - def iterator = new Iterator[ZipEntry] { - val enum = z.entries() - def hasNext = enum.hasMoreElements - def next = enum.nextElement - } + class ZipFileIterable(z: ZipFile) extends Iterable[ZipEntry] with ZipTrav { + def zis: () => ZipInputStream = null // not valid for this type + def iterator = new Iterator[ZipEntry] { + val enum = z.entries() + def hasNext = enum.hasMoreElements + def next = enum.nextElement } + } } /** |