diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
| commit | cc5e79c9ec9cea8d0f22020b528877d8f6e00153 (patch) | |
| tree | 94e43f77c7b7271b3d0b6f9fb7372ae83b39360d /src/compiler/scala/tools/nsc/io/ZipArchive.scala | |
| parent | 4b8be5d8bec86358276407d6521c41702ccda835 (diff) | |
| download | scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.gz scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.bz2 scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.zip | |
In "Iterable" and in all its subclasses, "itera...
In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).
Diffstat (limited to 'src/compiler/scala/tools/nsc/io/ZipArchive.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/ZipArchive.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index af595720c5..ab730128bd 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -85,9 +85,9 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file) override def isDirectory = true /** Returns all abstract subfiles of this abstract directory. */ - override def elements: Iterator[AbstractFile] = { + override def iterator: Iterator[AbstractFile] = { if (root eq null) load() - root.elements + root.iterator } /** @@ -189,7 +189,7 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file) override def lastModified: Long = if (entry ne null) entry.getTime() else super.lastModified - override def elements: Iterator[AbstractFile] = entries.values + override def iterator: Iterator[AbstractFile] = entries.valuesIterator override def lookupName(name: String, directory: Boolean): AbstractFile = entries.get(if (directory) name + "/" else name) match { @@ -241,9 +241,9 @@ final class URLZipArchive(url: URL) extends AbstractFile { def output = throw new Error("unsupported") - override def elements: Iterator[AbstractFile] = { + override def iterator: Iterator[AbstractFile] = { if (root eq null) load() - root.elements + root.iterator } override def lookupName(name: String, directory: Boolean): AbstractFile = { @@ -324,7 +324,7 @@ final class URLZipArchive(url: URL) extends AbstractFile { override def lastModified: Long = if (entry ne null) entry.getTime() else super.lastModified - override def elements: Iterator[AbstractFile] = entries.values + override def iterator: Iterator[AbstractFile] = entries.valuesIterator override def lookupName(name: String, directory: Boolean): AbstractFile = entries.get(if (directory) name + "/" else name) match { |