summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/io/ZipArchive.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2016-03-25 23:53:00 -0700
committerLukas Rytz <lukas.rytz@gmail.com>2016-04-22 09:56:30 +0200
commit0c5b42d974fbd3703f29f0232e2c9215e41fb379 (patch)
tree0d2b5a511344ac305064f7c29e21c7378e35ebe4 /src/reflect/scala/reflect/io/ZipArchive.scala
parentf55dd2084eca97c576a982473ab6701f98fb79a7 (diff)
downloadscala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.gz
scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.bz2
scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.zip
SI-9684 Deprecate JavaConversions
Implicit conversions are now in package convert as ImplicitConversions, ImplicitConversionsToScala and ImplicitConversionsToJava. Deprecated WrapAsJava, WrapAsScala and the values in package object. Improve documentation.
Diffstat (limited to 'src/reflect/scala/reflect/io/ZipArchive.scala')
-rw-r--r--src/reflect/scala/reflect/io/ZipArchive.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/io/ZipArchive.scala b/src/reflect/scala/reflect/io/ZipArchive.scala
index 42e22fda6f..262ab22ce9 100644
--- a/src/reflect/scala/reflect/io/ZipArchive.scala
+++ b/src/reflect/scala/reflect/io/ZipArchive.scala
@@ -13,7 +13,7 @@ import java.io.{ File => JFile }
import java.util.zip.{ ZipEntry, ZipFile, ZipInputStream }
import java.util.jar.Manifest
import scala.collection.mutable
-import scala.collection.convert.WrapAsScala.asScalaIterator
+import scala.collection.JavaConverters._
import scala.annotation.tailrec
/** An abstraction for zip files and streams. Everything is written the way
@@ -238,7 +238,7 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) {
val root = new DirEntry("/")
val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
val manifest = new Manifest(input)
- val iter = manifest.getEntries().keySet().iterator().filter(_.endsWith(".class")).map(new ZipEntry(_))
+ val iter = manifest.getEntries().keySet().iterator().asScala.filter(_.endsWith(".class")).map(new ZipEntry(_))
for (zipEntry <- iter) {
val dir = getDir(dirs, zipEntry)