You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/12/20 17:52:17 UTC
svn commit: r1552735 - in
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers:
tar/TarUtils.java zip/Simple8BitZipEncoding.java zip/ZipFile.java
Author: ggregory
Date: Fri Dec 20 16:52:16 2013
New Revision: 1552735
URL: http://svn.apache.org/r1552735
Log:
Convert 'for' loops to enhanced 'for' loops.
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java?rev=1552735&r1=1552734&r2=1552735&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java Fri Dec 20 16:52:16 2013
@@ -563,8 +563,8 @@ public class TarUtils {
public static long computeCheckSum(final byte[] buf) {
long sum = 0;
- for (int i = 0; i < buf.length; ++i) {
- sum += BYTE_MASK & buf[i];
+ for (byte element : buf) {
+ sum += BYTE_MASK & element;
}
return sum;
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java?rev=1552735&r1=1552734&r2=1552735&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java Fri Dec 20 16:52:16 2013
@@ -108,8 +108,8 @@ class Simple8BitZipEncoding implements Z
byte code = 127;
- for (int i = 0; i < this.highChars.length; ++i) {
- temp.add(new Simple8BitChar(++code, this.highChars[i]));
+ for (char highChar : this.highChars) {
+ temp.add(new Simple8BitChar(++code, highChar));
}
Collections.sort(temp);
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=1552735&r1=1552734&r2=1552735&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 Fri Dec 20 16:52:16 2013
@@ -29,7 +29,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -898,10 +897,10 @@ public class ZipFile implements Closeabl
private void resolveLocalFileHeaderData(Map<ZipArchiveEntry, NameAndComment>
entriesWithoutUTF8Flag)
throws IOException {
- for (Iterator<ZipArchiveEntry> it = entries.iterator(); it.hasNext(); ) {
+ for (ZipArchiveEntry zipArchiveEntry : entries) {
// entries is filled in populateFromCentralDirectory and
// never modified
- Entry ze = (Entry) it.next();
+ Entry ze = (Entry) zipArchiveEntry;
OffsetEntry offsetEntry = ze.getOffsetEntry();
long offset = offsetEntry.headerOffset;
archive.seek(offset + LFH_OFFSET_FOR_FILENAME_LENGTH);