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 CD5451057A for ; Sat, 12 Apr 2014 16:56:49 +0000 (UTC) Received: (qmail 21253 invoked by uid 500); 12 Apr 2014 16:54:51 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 20637 invoked by uid 500); 12 Apr 2014 16:54:34 -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 20253 invoked by uid 99); 12 Apr 2014 16:54:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Apr 2014 16:54:24 +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, 12 Apr 2014 16:54:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD7382388C63 for ; Sat, 12 Apr 2014 16:52:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r905942 [25/38] - in /websites/production/commons/content/proper/commons-compress: ./ apidocs/ apidocs/org/apache/commons/compress/archivers/ apidocs/org/apache/commons/compress/archivers/ar/ apidocs/org/apache/commons/compress/archivers/ar... Date: Sat, 12 Apr 2014 16:52:11 -0000 To: commits@commons.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140412165259.CD7382388C63@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.compressors.z._internal_.InternalLZWInputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.compressors.z._internal_.InternalLZWInputStream.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.compressors.z._internal_.InternalLZWInputStream.html Sat Apr 12 16:51:56 2014 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
InternalLZWInputStream
92%
72/78
85%
24/28
2,615
InternalLZWInputStream
92%
72/78
85%
24/28
2.615
 
@@ -91,17 +91,17 @@
  */
 37  
 public abstract class InternalLZWInputStream extends CompressorInputStream {
-  38  6
     private final byte[] oneByte = new byte[1];
+  38  7
     private final byte[] oneByte = new byte[1];
 39  
 
 40  
     protected final InputStream in;
-  41  6
     protected int clearCode = -1;
-  42  6
     protected int codeSize = 9;
-  43  6
     protected int bitsCached = 0;
-  44  6
     protected int bitsCachedSize = 0;
-  45  6
     protected int previousCode = -1;
-  46  6
     protected int tableSize = 0;
+  41  7
     protected int clearCode = -1;
+  42  7
     protected int codeSize = 9;
+  43  7
     protected int bitsCached = 0;
+  44  7
     protected int bitsCachedSize = 0;
+  45  7
     protected int previousCode = -1;
+  46  7
     protected int tableSize = 0;
 47  
     protected int[] prefixes;
 48   @@ -112,17 +112,17 @@
     private int outputStackLocation;
 51  
 
-  52  6
     protected InternalLZWInputStream(InputStream inputStream) {
-  53  6
         this.in = inputStream;
-  54  6
     }
+  52  7
     protected InternalLZWInputStream(InputStream inputStream) {
+  53  7
         this.in = inputStream;
+  54  7
     }
 55  
 
 56  
     @Override
 57  
     public void close() throws IOException {
-  58  2
         in.close();
-  59  2
     }
+  58  3
         in.close();
+  59  3
     }
 60  
     
 61   @@ -143,22 +143,22 @@
     @Override
 71  
     public int read(byte[] b, int off, int len) throws IOException {
-  72  14
         int bytesRead = readFromStack(b, off, len);
-  73  1552
         while (len - bytesRead > 0) {
-  74  1550
             int result = decompressNextSymbol();
-  75  1550
             if (result < 0) {
-  76  12
                 if (bytesRead > 0) {
-  77  6
                     count(bytesRead);
-  78  6
                     return bytesRead;
+  72  17
         int bytesRead = readFromStack(b, off, len);
+  73  2199
         while (len - bytesRead > 0) {
+  74  2196
             int result = decompressNextSymbol();
+  75  2196
             if (result < 0) {
+  76  14
                 if (bytesRead > 0) {
+  77  7
                     count(bytesRead);
+  78  7
                     return bytesRead;
 79  
                 }
-  80  6
                 return result;
+  80  7
                 return result;
 81  
             }
-  82  1538
             bytesRead += readFromStack(b, off + bytesRead, len - bytesRead);
-  83  1538
         }
-  84  2
         count(bytesRead);
-  85  2
         return bytesRead;
+  82  2182
             bytesRead += readFromStack(b, off + bytesRead, len - bytesRead);
+  83  2182
         }
+  84  3
         count(bytesRead);
+  85  3
         return bytesRead;
 86  
     }
 87   @@ -193,8 +193,8 @@
      */
 102  
     protected void setClearCode(int codeSize) {
-  103  6
         clearCode = (1 << (codeSize - 1));
-  104  6
     }
+  103  7
         clearCode = (1 << (codeSize - 1));
+  104  7
     }
 105  
 
 106   @@ -205,18 +205,18 @@
      */
 109  
     protected void initializeTables(int maxCodeSize) {
-  110  6
         final int maxTableSize = 1 << maxCodeSize;
-  111  6
         prefixes = new int[maxTableSize];
-  112  6
         characters = new byte[maxTableSize];
-  113  6
         outputStack = new byte[maxTableSize];
-  114  6
         outputStackLocation = maxTableSize;
-  115  6
         final int max = 1 << 8;
-  116  1542
         for (int i = 0; i < max; i++) {
-  117  1536
             prefixes[i] = -1;
-  118  1536
             characters[i] = (byte) i;
+  110  7
         final int maxTableSize = 1 << maxCodeSize;
+  111  7
         prefixes = new int[maxTableSize];
+  112  7
         characters = new byte[maxTableSize];
+  113  7
         outputStack = new byte[maxTableSize];
+  114  7
         outputStackLocation = maxTableSize;
+  115  7
         final int max = 1 << 8;
+  116  1799
         for (int i = 0; i < max; i++) {
+  117  1792
             prefixes[i] = -1;
+  118  1792
             characters[i] = (byte) i;
 119  
         }
-  120  6
     }
+  120  7
     }
 121  
 
 122   @@ -227,20 +227,20 @@
      */
 125  
     protected int readNextCode() throws IOException {
-  126  3380
         while (bitsCachedSize < codeSize) {
-  127  1842
             final int nextByte = in.read();
-  128  1842
             if (nextByte < 0) {
-  129  12
                 return nextByte;
+  126  4799
         while (bitsCachedSize < codeSize) {
+  127  2617
             final int nextByte = in.read();
+  128  2617
             if (nextByte < 0) {
+  129  14
                 return nextByte;
 130  
             }
-  131  1830
             bitsCached |= (nextByte << bitsCachedSize);
-  132  1830
             bitsCachedSize += 8;
-  133  1830
         }
-  134  1538
         final int mask = (1 << codeSize) - 1;
-  135  1538
         final int code = (bitsCached & mask);
-  136  1538
         bitsCached >>>= codeSize;
-  137  1538
         bitsCachedSize -= codeSize;
-  138  1538
         return code;
+  131  2603
             bitsCached |= (nextByte << bitsCachedSize);
+  132  2603
             bitsCachedSize += 8;
+  133  2603
         }
+  134  2182
         final int mask = (1 << codeSize) - 1;
+  135  2182
         final int code = (bitsCached & mask);
+  136  2182
         bitsCached >>>= codeSize;
+  137  2182
         bitsCachedSize -= codeSize;
+  138  2182
         return code;
 139  
     }
 140   @@ -255,12 +255,12 @@
      */
 145  
     protected int addEntry(int previousCode, byte character, int maxTableSize) {
-  146  1532
         if (tableSize < maxTableSize) {
-  147  1532
             final int index = tableSize;
-  148  1532
             prefixes[tableSize] = previousCode;
-  149  1532
             characters[tableSize] = character;
-  150  1532
             tableSize++;
-  151  1532
             return index;
+  146  2175
         if (tableSize < maxTableSize) {
+  147  2175
             final int index = tableSize;
+  148  2175
             prefixes[tableSize] = previousCode;
+  149  2175
             characters[tableSize] = character;
+  150  2175
             tableSize++;
+  151  2175
             return index;
 152  
         }
 153  0
         return -1;
@@ -276,18 +276,18 @@
      */
 159  
     protected int addRepeatOfPreviousCode() throws IOException {
-  160  270
         if (previousCode == -1) {
+  160  404
         if (previousCode == -1) {
 161  
             // can't have a repeat for the very first code
 162  0
             throw new IOException("The first code can't be a reference to its preceding code");
 163  
         }
-  164  270
         byte firstCharacter = 0;
-  165  17914
         for (int last = previousCode; last >= 0; last = prefixes[last]) {
-  166  17644
             firstCharacter = characters[last];
+  164  404
         byte firstCharacter = 0;
+  165  26869
         for (int last = previousCode; last >= 0; last = prefixes[last]) {
+  166  26465
             firstCharacter = characters[last];
 167  
         }
-  168  270
         return addEntry(previousCode, firstCharacter);
+  168  404
         return addEntry(previousCode, firstCharacter);
 169  
     }
 170   @@ -304,37 +304,37 @@
     protected int expandCodeToOutputStack(int code, boolean addedUnfinishedEntry)
 176  
         throws IOException {
-  177  22332
         for (int entry = code; entry >= 0; entry = prefixes[entry]) {
-  178  20794
             outputStack[--outputStackLocation] = characters[entry];
+  177  33216
         for (int entry = code; entry >= 0; entry = prefixes[entry]) {
+  178  31034
             outputStack[--outputStackLocation] = characters[entry];
 179  
         }
-  180  1538
         if (previousCode != -1 && !addedUnfinishedEntry) {
-  181  1262
             addEntry(previousCode, outputStack[outputStackLocation]);
+  180  2182
         if (previousCode != -1 && !addedUnfinishedEntry) {
+  181  1771
             addEntry(previousCode, outputStack[outputStackLocation]);
 182  
         }
-  183  1538
         previousCode = code;
-  184  1538
         return outputStackLocation;
+  183  2182
         previousCode = code;
+  184  2182
         return outputStackLocation;
 185  
     }
 186  
 
 187  
     private int readFromStack(byte[] b, int off, int len) {
-  188  1552
         int remainingInStack = outputStack.length - outputStackLocation;
-  189  1552
         if (remainingInStack > 0) {
-  190  1538
             int maxLength = Math.min(remainingInStack, len);
-  191  1538
             System.arraycopy(outputStack, outputStackLocation, b, off, maxLength);
-  192  1538
             outputStackLocation += maxLength;
-  193  1538
             return maxLength;
+  188  2199
         int remainingInStack = outputStack.length - outputStackLocation;
+  189  2199
         if (remainingInStack > 0) {
+  190  2182
             int maxLength = Math.min(remainingInStack, len);
+  191  2182
             System.arraycopy(outputStack, outputStackLocation, b, off, maxLength);
+  192  2182
             outputStackLocation += maxLength;
+  193  2182
             return maxLength;
 194  
         }
-  195  14
         return 0;
+  195  17
         return 0;
 196  
     }
 197  
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.ArchiveUtils.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.ArchiveUtils.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.ArchiveUtils.html Sat Apr 12 16:51:56 2014 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
ArchiveUtils
54%
27/50
78%
22/28
3,385
ArchiveUtils
54%
27/50
78%
22/28
3.385
 
@@ -475,6 +475,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.BoundedInputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.BoundedInputStream.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.BoundedInputStream.html Sat Apr 12 16:51:56 2014 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
BoundedInputStream
100%
18/18
87%
7/8
2,5
BoundedInputStream
100%
18/18
87%
7/8
2.5
 
@@ -149,6 +149,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CRC32VerifyingInputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CRC32VerifyingInputStream.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CRC32VerifyingInputStream.html Sat Apr 12 16:51:56 2014 @@ -99,6 +99,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CharsetNames.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CharsetNames.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CharsetNames.html Sat Apr 12 16:51:56 2014 @@ -270,6 +270,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.Charsets.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.Charsets.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.Charsets.html Sat Apr 12 16:51:56 2014 @@ -330,6 +330,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.ChecksumVerifyingInputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.ChecksumVerifyingInputStream.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.ChecksumVerifyingInputStream.html Sat Apr 12 16:51:56 2014 @@ -211,6 +211,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CountingInputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CountingInputStream.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CountingInputStream.html Sat Apr 12 16:51:56 2014 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
CountingInputStream
100%
15/15
66%
4/6
1,5
CountingInputStream
100%
15/15
66%
4/6
1.5
 
@@ -156,6 +156,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CountingOutputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CountingOutputStream.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.CountingOutputStream.html Sat Apr 12 16:51:56 2014 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
CountingOutputStream
100%
15/15
100%
2/2
1,167
CountingOutputStream
100%
15/15
100%
2/2
1.167
 
@@ -146,6 +146,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.IOUtils.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.IOUtils.html (original) +++ websites/production/commons/content/proper/commons-compress/cobertura/org.apache.commons.compress.utils.IOUtils.html Sat Apr 12 16:51:56 2014 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
IOUtils
88%
32/36
77%
14/18
2,375
IOUtils
88%
32/36
77%
14/18
2.375
 
@@ -111,7 +111,7 @@
      */
 48  
     public static long copy(final InputStream input, final OutputStream output) throws IOException {
-  49  743
         return copy(input, output, 8024);
+  49  744
         return copy(input, output, 8024);
 50  
     }
 51   @@ -142,15 +142,15 @@
      */
 64  
     public static long copy(final InputStream input, final OutputStream output, int buffersize) throws IOException {
-  65  743
         final byte[] buffer = new byte[buffersize];
-  66  743
         int n = 0;
-  67  743
         long count=0;
-  68  1391
         while (-1 != (n = input.read(buffer))) {
-  69  648
             output.write(buffer, 0, n);
-  70  648
             count += n;
+  65  744
         final byte[] buffer = new byte[buffersize];
+  66  744
         int n = 0;
+  67  744
         long count=0;
+  68  1394
         while (-1 != (n = input.read(buffer))) {
+  69  650
             output.write(buffer, 0, n);
+  70  650
             count += n;
 71  
         }
-  72  742
         return count;
+  72  743
         return count;
 73  
     }
 74   @@ -221,7 +221,7 @@
      */
 111  
     public static int readFully(InputStream input, byte[] b) throws IOException {
-  112  2502
         return readFully(input, b, 0, b.length);
+  112  2981
         return readFully(input, b, 0, b.length);
 113  
     }
 114   @@ -262,21 +262,21 @@
     public static int readFully(InputStream input, byte[] b, int offset, int len)
 132  
         throws IOException {
-  133  6454
         if (len < 0 || offset < 0 || len + offset > b.length) {
+  133  9617
         if (len < 0 || offset < 0 || len + offset > b.length) {
 134  0
             throw new IndexOutOfBoundsException();
 135  
         }
-  136  6454
         int count = 0, x = 0;
-  137  12690
         while (count != len) {
-  138  6241
             x = input.read(b, offset + count, len - count);
-  139  6241
             if (x == -1) {
+  136  9617
         int count = 0, x = 0;
+  137  19016
         while (count != len) {
+  138  9404
             x = input.read(b, offset + count, len - count);
+  139  9404
             if (x == -1) {
 140  5
                 break;
 141  
             }
-  142  6236
             count += x;
+  142  9399
             count += x;
 143  
         }
-  144  6454
         return count;
+  144  9617
         return count;
 145  
     }
 146   @@ -351,6 +351,6 @@
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-compress/conventions.html ============================================================================== --- websites/production/commons/content/proper/commons-compress/conventions.html (original) +++ websites/production/commons/content/proper/commons-compress/conventions.html Sat Apr 12 16:51:56 2014 @@ -1,13 +1,13 @@ - + Commons Compress - Conventions @@ -44,8 +44,8 @@ Apache Commons Compress ™