@@ -153,11 +153,11 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
153
153
val root = new DirEntry (" /" )
154
154
val dirs = mutable.HashMap [String , DirEntry ](" /" -> root)
155
155
val zipFile = openZipFile()
156
- val enum = zipFile.entries()
156
+ val entries = zipFile.entries()
157
157
158
158
try {
159
- while (enum .hasMoreElements) {
160
- val zipEntry = enum .nextElement
159
+ while (entries .hasMoreElements) {
160
+ val zipEntry = entries .nextElement
161
161
val dir = getDir(dirs, zipEntry)
162
162
if (zipEntry.isDirectory) dir
163
163
else {
@@ -195,74 +195,6 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
195
195
case _ => false
196
196
}
197
197
}
198
- // /** ''Note: This library is considered experimental and should not be used unless you know what you are doing.'' */
199
- // final class URLZipArchive(val url: URL) extends ZipArchive(null) {
200
- // def iterator: Iterator[Entry] = {
201
- // val root = new DirEntry("/")
202
- // val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
203
- // val in = new ZipInputStream(new ByteArrayInputStream(Streamable.bytes(input)))
204
- //
205
- // @tailrec def loop() {
206
- // val zipEntry = in.getNextEntry()
207
- // class EmptyFileEntry() extends Entry(zipEntry.getName) {
208
- // override def toByteArray: Array[Byte] = null
209
- // override def sizeOption = Some(0)
210
- // }
211
- // class FileEntry() extends Entry(zipEntry.getName) {
212
- // override val toByteArray: Array[Byte] = {
213
- // val len = zipEntry.getSize().toInt
214
- // val arr = if (len == 0) Array.emptyByteArray else new Array[Byte](len)
215
- // var offset = 0
216
- //
217
- // def loop() {
218
- // if (offset < len) {
219
- // val read = in.read(arr, offset, len - offset)
220
- // if (read >= 0) {
221
- // offset += read
222
- // loop()
223
- // }
224
- // }
225
- // }
226
- // loop()
227
- //
228
- // if (offset == arr.length) arr
229
- // else throw new IOException("Input stream truncated: read %d of %d bytes".format(offset, len))
230
- // }
231
- // override def sizeOption = Some(zipEntry.getSize().toInt)
232
- // }
233
- //
234
- // if (zipEntry != null) {
235
- // val dir = getDir(dirs, zipEntry)
236
- // if (zipEntry.isDirectory)
237
- // dir
238
- // else {
239
- // val f = if (zipEntry.getSize() == 0) new EmptyFileEntry() else new FileEntry()
240
- // dir.entries(f.name) = f
241
- // }
242
- // in.closeEntry()
243
- // loop()
244
- // }
245
- // }
246
- //
247
- // loop()
248
- // try root.iterator
249
- // finally dirs.clear()
250
- // }
251
- //
252
- // def name = url.getFile()
253
- // def path = url.getPath()
254
- // def input = url.openStream()
255
- // def lastModified =
256
- // try url.openConnection().getLastModified()
257
- // catch { case _: IOException => 0 }
258
- //
259
- // override def canEqual(other: Any) = other.isInstanceOf[URLZipArchive]
260
- // override def hashCode() = url.hashCode
261
- // override def equals(that: Any) = that match {
262
- // case x: URLZipArchive => url == x.url
263
- // case _ => false
264
- // }
265
- // }
266
198
267
199
final class ManifestResources (val url : URL ) extends ZipArchive (null ) {
268
200
def iterator = {
@@ -274,12 +206,11 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) {
274
206
for (zipEntry <- iter) {
275
207
val dir = getDir(dirs, zipEntry)
276
208
if (! zipEntry.isDirectory) {
277
- class FileEntry () extends Entry (zipEntry.getName) {
209
+ val f = new Entry (zipEntry.getName) {
278
210
override def lastModified = zipEntry.getTime()
279
211
override def input = resourceInputStream(path)
280
212
override def sizeOption = None
281
213
}
282
- val f = new FileEntry ()
283
214
dir.entries(f.name) = f
284
215
}
285
216
}
0 commit comments