Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B0F43C562 for ; Tue, 4 Jun 2013 04:22:33 +0000 (UTC) Received: (qmail 54820 invoked by uid 500); 4 Jun 2013 04:22:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 54710 invoked by uid 500); 4 Jun 2013 04:22:30 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 54702 invoked by uid 99); 4 Jun 2013 04:22:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 04:22:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 04:22:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A2ED52388980; Tue, 4 Jun 2013 04:22:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489284 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/zip/ZipFile.java test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java Date: Tue, 04 Jun 2013 04:22:05 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604042205.A2ED52388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Tue Jun 4 04:22:05 2013 New Revision: 1489284 URL: http://svn.apache.org/r1489284 Log: COMPRESS-227 return Iterable rather than Iterator in new methods Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=1489284&r1=1489283&r2=1489284&view=diff ============================================================================== --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java (original) +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java Tue Jun 4 04:22:05 2013 @@ -316,14 +316,14 @@ public class ZipFile { * the archive's central directory. * * @param name name of the entry. - * @return the Iterator corresponding to the + * @return the Iterable corresponding to the * given name * @since 1.6 */ - public Iterator getEntries(String name) { + public Iterable getEntries(String name) { List entriesOfThatName = nameMap.get(name); - return entriesOfThatName != null ? entriesOfThatName.iterator() - : Collections.emptyList().iterator(); + return entriesOfThatName != null ? entriesOfThatName + : Collections.emptyList(); } /** @@ -331,17 +331,17 @@ public class ZipFile { * appear within the archive. * * @param name name of the entry. - * @return the Iterator corresponding to the + * @return the Iterable corresponding to the * given name * @since 1.6 */ - public Iterator getEntriesInPhysicalOrder(String name) { + public Iterable getEntriesInPhysicalOrder(String name) { ZipArchiveEntry[] entriesOfThatName = new ZipArchiveEntry[0]; if (nameMap.containsKey(name)) { entriesOfThatName = nameMap.get(name).toArray(entriesOfThatName); Arrays.sort(entriesOfThatName, OFFSET_COMPARATOR); } - return Arrays.asList(entriesOfThatName).iterator(); + return Arrays.asList(entriesOfThatName); } /** Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java?rev=1489284&r1=1489283&r2=1489284&view=diff ============================================================================== --- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java (original) +++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java Tue Jun 4 04:22:05 2013 @@ -217,11 +217,9 @@ public class ZipFileTest extends TestCas assertNotNull(zf.getInputStream(ze)); int numberOfEntries = 0; - for (Iterator it = zf.getEntries("test1.txt"); - it.hasNext(); ) { + for (ZipArchiveEntry entry : zf.getEntries("test1.txt")) { numberOfEntries++; - ze = it.next(); - assertNotNull(zf.getInputStream(ze)); + assertNotNull(zf.getInputStream(entry)); } assertEquals(2, numberOfEntries); }