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 E7FA81080E for ; Sat, 26 Oct 2013 14:25:56 +0000 (UTC) Received: (qmail 32247 invoked by uid 500); 26 Oct 2013 14:25:13 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 31934 invoked by uid 500); 26 Oct 2013 14:25:08 -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 31442 invoked by uid 99); 26 Oct 2013 14:24:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Oct 2013 14:24:55 +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; Sat, 26 Oct 2013 14:24:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2B9A12388CBA for ; Sat, 26 Oct 2013 14:22:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r884228 [32/50] - in /websites/production/commons/content/proper/commons-compress: ./ cobertura/ Date: Sat, 26 Oct 2013 14:22:17 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131026142229.2B9A12388CBA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64ExtendedInformationExtraField.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64ExtendedInformationExtraField.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64ExtendedInformationExtraField.html Sat Oct 26 14:22:15 2013 @@ -105,7 +105,7 @@ 
 public class Zip64ExtendedInformationExtraField implements ZipExtraField {
 44   
 
-  45  1 
     static final ZipShort HEADER_ID = new ZipShort(0x0001);
+  45  2 
     static final ZipShort HEADER_ID = new ZipShort(0x0001);
 46   
 
 47   @@ -114,7 +114,7 @@ 
         "Zip64 extended information must contain"
 49   
         + " both size values in the local file header.";
-  50  1 
     private static final byte[] EMPTY = new byte[0];
+  50  2 
     private static final byte[] EMPTY = new byte[0];
 51   
 
 52   @@ -155,7 +155,7 @@ 
      * archives inside of Commons Compress.
 70   
      */
-  71  121 
     public Zip64ExtendedInformationExtraField() { }
+  71  242 
     public Zip64ExtendedInformationExtraField() { }
 72   
 
 73   @@ -178,8 +178,8 @@ 
     public Zip64ExtendedInformationExtraField(ZipEightByteInteger size,
 82   
                                               ZipEightByteInteger compressedSize) {
-  83  1 
         this(size, compressedSize, null, null);
-  84  1 
     }
+  83  2 
         this(size, compressedSize, null, null);
+  84  2 
     }
 85   
 
 86   @@ -204,31 +204,31 @@ 
                                               ZipEightByteInteger compressedSize,
 96   
                                               ZipEightByteInteger relativeHeaderOffset,
-  97  4 
                                               ZipLong diskStart) {
-  98  4 
         this.size = size;
-  99  4 
         this.compressedSize = compressedSize;
-  100  4 
         this.relativeHeaderOffset = relativeHeaderOffset;
-  101  4 
         this.diskStart = diskStart;
-  102  4 
     }
+  97  8 
                                               ZipLong diskStart) {
+  98  8 
         this.size = size;
+  99  8 
         this.compressedSize = compressedSize;
+  100  8 
         this.relativeHeaderOffset = relativeHeaderOffset;
+  101  8 
         this.diskStart = diskStart;
+  102  8 
     }
 103   
 
 104   
     public ZipShort getHeaderId() {
-  105  338 
         return HEADER_ID;
+  105  676 
         return HEADER_ID;
 106   
     }
 107   
 
 108   
     public ZipShort getLocalFileDataLength() {
-  109  374 
         return new ZipShort(size != null ? 2 * DWORD : 0);
+  109  748 
         return new ZipShort(size != null ? 2 * DWORD : 0);
 110   
     }
 111   
 
 112   
     public ZipShort getCentralDirectoryLength() {
-  113  8 
         return new ZipShort((size != null ? DWORD : 0)
+  113  16 
         return new ZipShort((size != null ? DWORD : 0)
 114   
                             + (compressedSize != null ? DWORD : 0)
 115   @@ -241,36 +241,36 @@ 
 
 119   
     public byte[] getLocalFileDataData() {
-  120  210 
         if (size != null || compressedSize != null) {
-  121  178 
             if (size == null || compressedSize == null) {
+  120  420 
         if (size != null || compressedSize != null) {
+  121  356 
             if (size == null || compressedSize == null) {
 122  0 
                 throw new IllegalArgumentException(LFH_MUST_HAVE_BOTH_SIZES_MSG);
 123   
             }
-  124  178 
             byte[] data = new byte[2 * DWORD];
-  125  178 
             addSizes(data);
-  126  178 
             return data;
+  124  356 
             byte[] data = new byte[2 * DWORD];
+  125  356 
             addSizes(data);
+  126  356 
             return data;
 127   
         }
-  128  32 
         return EMPTY;
+  128  64 
         return EMPTY;
 129   
     }
 130   
 
 131   
     public byte[] getCentralDirectoryData() {
-  132  4 
         byte[] data = new byte[getCentralDirectoryLength().getValue()];
-  133  4 
         int off = addSizes(data);
-  134  4 
         if (relativeHeaderOffset != null) {
-  135  2 
             System.arraycopy(relativeHeaderOffset.getBytes(), 0, data, off, DWORD);
-  136  2 
             off += DWORD;
+  132  8 
         byte[] data = new byte[getCentralDirectoryLength().getValue()];
+  133  8 
         int off = addSizes(data);
+  134  8 
         if (relativeHeaderOffset != null) {
+  135  4 
             System.arraycopy(relativeHeaderOffset.getBytes(), 0, data, off, DWORD);
+  136  4 
             off += DWORD;
 137   
         }
-  138  4 
         if (diskStart != null) {
-  139  2 
             System.arraycopy(diskStart.getBytes(), 0, data, off, WORD);
-  140  2 
             off += WORD;
+  138  8 
         if (diskStart != null) {
+  139  4 
             System.arraycopy(diskStart.getBytes(), 0, data, off, WORD);
+  140  4 
             off += WORD;
 141   
         }
-  142  4 
         return data;
+  142  8 
         return data;
 143   
     }
 144   @@ -279,7 +279,7 @@ 
     public void parseFromLocalFileData(byte[] buffer, int offset, int length)
 146   
         throws ZipException {
-  147  108 
         if (length == 0) {
+  147  216 
         if (length == 0) {
 148   
             // no local file data at all, may happen if an archive
 149   @@ -291,28 +291,28 @@  152  0 
             return;
 153   
         }
-  154  108 
         if (length < 2 * DWORD) {
+  154  216 
         if (length < 2 * DWORD) {
 155  0 
             throw new ZipException(LFH_MUST_HAVE_BOTH_SIZES_MSG);
 156   
         }
-  157  108 
         size = new ZipEightByteInteger(buffer, offset);
-  158  108 
         offset += DWORD;
-  159  108 
         compressedSize = new ZipEightByteInteger(buffer, offset);
-  160  108 
         offset += DWORD;
-  161  108 
         int remaining = length - 2 * DWORD;
-  162  108 
         if (remaining >= DWORD) {
-  163  26 
             relativeHeaderOffset = new ZipEightByteInteger(buffer, offset);
-  164  26 
             offset += DWORD;
-  165  26 
             remaining -= DWORD;
+  157  216 
         size = new ZipEightByteInteger(buffer, offset);
+  158  216 
         offset += DWORD;
+  159  216 
         compressedSize = new ZipEightByteInteger(buffer, offset);
+  160  216 
         offset += DWORD;
+  161  216 
         int remaining = length - 2 * DWORD;
+  162  216 
         if (remaining >= DWORD) {
+  163  52 
             relativeHeaderOffset = new ZipEightByteInteger(buffer, offset);
+  164  52 
             offset += DWORD;
+  165  52 
             remaining -= DWORD;
 166   
         }
-  167  108 
         if (remaining >= WORD) {
-  168  26 
             diskStart = new ZipLong(buffer, offset);
-  169  26 
             offset += WORD;
-  170  26 
             remaining -= WORD;
+  167  216 
         if (remaining >= WORD) {
+  168  52 
             diskStart = new ZipLong(buffer, offset);
+  169  52 
             offset += WORD;
+  170  52 
             remaining -= WORD;
 171   
         }
-  172  108 
     }
+  172  216 
     }
 173   
 
 174   @@ -323,8 +323,8 @@ 
         throws ZipException {
 177   
         // store for processing in reparseCentralDirectoryData
-  178  27 
         rawCentralDirectoryData = new byte[length];
-  179  27 
         System.arraycopy(buffer, offset, rawCentralDirectoryData, 0, length);
+  178  54 
         rawCentralDirectoryData = new byte[length];
+  179  54 
         System.arraycopy(buffer, offset, rawCentralDirectoryData, 0, length);
 180   
 
 181   @@ -339,19 +339,19 @@ 
         // * length == 24 -> both sizes and offset
 186   
         // * length % 8 == 4 -> at least we can identify the diskStart field
-  187  27 
         if (length >= 3 * DWORD + WORD) {
-  188  24 
             parseFromLocalFileData(buffer, offset, length);
-  189  3 
         } else if (length == 3 * DWORD) {
-  190  1 
             size = new ZipEightByteInteger(buffer, offset);
-  191  1 
             offset += DWORD;
-  192  1 
             compressedSize = new ZipEightByteInteger(buffer, offset);
-  193  1 
             offset += DWORD;
-  194  1 
             relativeHeaderOffset = new ZipEightByteInteger(buffer, offset);
-  195  2 
         } else if (length % DWORD == WORD) {
-  196  1 
             diskStart = new ZipLong(buffer, offset + length - WORD);
+  187  54 
         if (length >= 3 * DWORD + WORD) {
+  188  48 
             parseFromLocalFileData(buffer, offset, length);
+  189  6 
         } else if (length == 3 * DWORD) {
+  190  2 
             size = new ZipEightByteInteger(buffer, offset);
+  191  2 
             offset += DWORD;
+  192  2 
             compressedSize = new ZipEightByteInteger(buffer, offset);
+  193  2 
             offset += DWORD;
+  194  2 
             relativeHeaderOffset = new ZipEightByteInteger(buffer, offset);
+  195  4 
         } else if (length % DWORD == WORD) {
+  196  2 
             diskStart = new ZipLong(buffer, offset + length - WORD);
 197   
         }
-  198  27 
     }
+  198  54 
     }
 199   
 
 200   @@ -382,15 +382,15 @@ 
                                             boolean hasDiskStart)
 213   
         throws ZipException {
-  214  26 
         if (rawCentralDirectoryData != null) {
-  215  26 
             int expectedLength = (hasUncompressedSize ? DWORD : 0)
+  214  52 
         if (rawCentralDirectoryData != null) {
+  215  52 
             int expectedLength = (hasUncompressedSize ? DWORD : 0)
 216   
                 + (hasCompressedSize ? DWORD : 0)
 217   
                 + (hasRelativeHeaderOffset ? DWORD : 0)
 218   
                 + (hasDiskStart ? WORD : 0);
-  219  26 
             if (rawCentralDirectoryData.length < expectedLength) {
+  219  52 
             if (rawCentralDirectoryData.length < expectedLength) {
 220  0 
                 throw new ZipException("central directory zip64 extended"
 221   
                                        + " information extra field's length"
@@ -404,34 +404,34 @@ 
                                        + rawCentralDirectoryData.length);
 226   
             }
-  227  26 
             int offset = 0;
-  228  26 
             if (hasUncompressedSize) {
-  229  24 
                 size = new ZipEightByteInteger(rawCentralDirectoryData, offset);
-  230  24 
                 offset += DWORD;
+  227  52 
             int offset = 0;
+  228  52 
             if (hasUncompressedSize) {
+  229  48 
                 size = new ZipEightByteInteger(rawCentralDirectoryData, offset);
+  230  48 
                 offset += DWORD;
 231   
             }
-  232  26 
             if (hasCompressedSize) {
-  233  24 
                 compressedSize = new ZipEightByteInteger(rawCentralDirectoryData,
+  232  52 
             if (hasCompressedSize) {
+  233  48 
                 compressedSize = new ZipEightByteInteger(rawCentralDirectoryData,
 234   
                                                          offset);
-  235  24 
                 offset += DWORD;
+  235  48 
                 offset += DWORD;
 236   
             }
-  237  26 
             if (hasRelativeHeaderOffset) {
-  238  1 
                 relativeHeaderOffset =
+  237  52 
             if (hasRelativeHeaderOffset) {
+  238  2 
                 relativeHeaderOffset =
 239   
                     new ZipEightByteInteger(rawCentralDirectoryData, offset);
-  240  1 
                 offset += DWORD;
+  240  2 
                 offset += DWORD;
 241   
             }
-  242  26 
             if (hasDiskStart) {
+  242  52 
             if (hasDiskStart) {
 243  0 
                 diskStart = new ZipLong(rawCentralDirectoryData, offset);
 244  0 
                 offset += WORD;
 245   
             }
 246   
         }
-  247  26 
     }
+  247  52 
     }
 248   
 
 249   @@ -442,7 +442,7 @@ 
      */
 252   
     public ZipEightByteInteger getSize() {
-  253  33 
         return size;
+  253  66 
         return size;
 254   
     }
 255   @@ -455,8 +455,8 @@ 
      */
 259   
     public void setSize(ZipEightByteInteger size) {
-  260  33 
         this.size = size;
-  261  33 
     }
+  260  66 
         this.size = size;
+  261  66 
     }
 262   
 
 263   @@ -467,7 +467,7 @@ 
      */
 266   
     public ZipEightByteInteger getCompressedSize() {
-  267  33 
         return compressedSize;
+  267  66 
         return compressedSize;
 268   
     }
 269   @@ -480,8 +480,8 @@ 
      */
 273   
     public void setCompressedSize(ZipEightByteInteger compressedSize) {
-  274  33 
         this.compressedSize = compressedSize;
-  275  33 
     }
+  274  66 
         this.compressedSize = compressedSize;
+  275  66 
     }
 276   
 
 277   @@ -492,7 +492,7 @@ 
      */
 280   
     public ZipEightByteInteger getRelativeHeaderOffset() {
-  281  10 
         return relativeHeaderOffset;
+  281  20 
         return relativeHeaderOffset;
 282   
     }
 283   @@ -517,7 +517,7 @@ 
      */
 294   
     public ZipLong getDiskStartNumber() {
-  295  10 
         return diskStart;
+  295  20 
         return diskStart;
 296   
     }
 297   @@ -536,24 +536,24 @@ 
 
 305   
     private int addSizes(byte[] data) {
-  306  182 
         int off = 0;
-  307  182 
         if (size != null) {
-  308  182 
             System.arraycopy(size.getBytes(), 0, data, 0, DWORD);
-  309  182 
             off += DWORD;
+  306  364 
         int off = 0;
+  307  364 
         if (size != null) {
+  308  364 
             System.arraycopy(size.getBytes(), 0, data, 0, DWORD);
+  309  364 
             off += DWORD;
 310   
         }
-  311  182 
         if (compressedSize != null) {
-  312  182 
             System.arraycopy(compressedSize.getBytes(), 0, data, off, DWORD);
-  313  182 
             off += DWORD;
+  311  364 
         if (compressedSize != null) {
+  312  364 
             System.arraycopy(compressedSize.getBytes(), 0, data, off, DWORD);
+  313  364 
             off += DWORD;
 314   
         }
-  315  182 
         return off;
+  315  364 
         return off;
 316   
     }
 317   
 }
-
Report generated by Cobertura 1.9.4.1 on 26.10.13 07:27.
+
Report generated by Cobertura 1.9.4.1 on 26.10.13 16:15.
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64Mode.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64Mode.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64Mode.html Sat Oct 26 14:22:15 2013 @@ -71,7 +71,7 @@ 
  * @since 1.3
 27   
  */
-  28  4 
 public enum Zip64Mode {
+  28  8 
 public enum Zip64Mode {
 29   
     /**
 30   @@ -80,7 +80,7 @@ 
      * not required.
 32   
      */
-  33  1 
     Always,
+  33  2 
     Always,
 34   
     /**
 35   @@ -95,7 +95,7 @@ 
      * support.</p>
 40   
      */
-  41  1 
     Never,
+  41  2 
     Never,
 42   
     /**
 43   @@ -104,11 +104,11 @@ 
      * don't use them for entries that clearly don't require them.
 45   
      */
-  46  1 
     AsNeeded
+  46  2 
     AsNeeded
 47   
 }
-
Report generated by Cobertura 1.9.4.1 on 26.10.13 07:27.
+
Report generated by Cobertura 1.9.4.1 on 26.10.13 16:15.
\ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64RequiredException.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64RequiredException.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.archivers.zip.Zip64RequiredException.html Sat Oct 26 14:22:15 2013 @@ -114,6 +114,6 @@ 
 }
-
Report generated by Cobertura 1.9.4.1 on 26.10.13 07:27.
+
Report generated by Cobertura 1.9.4.1 on 26.10.13 16:15.
\ No newline at end of file