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 DC81EF170 for ; Sat, 30 Mar 2013 06:42:53 +0000 (UTC) Received: (qmail 61419 invoked by uid 500); 30 Mar 2013 06:42:52 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 61269 invoked by uid 500); 30 Mar 2013 06:42:52 -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 61150 invoked by uid 99); 30 Mar 2013 06:42:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Mar 2013 06:42:49 +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, 30 Mar 2013 06:42:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A10072388B56 for ; Sat, 30 Mar 2013 06:41:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r856582 [8/34] - in /websites/production/commons/content/proper/commons-codec: ./ apidocs/ apidocs/org/apache/commons/codec/digest/ apidocs/src-html/org/apache/commons/codec/digest/ cobertura/ xref/org/apache/commons/codec/digest/ Date: Sat, 30 Mar 2013 06:41:32 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130330064136.A10072388B56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.Base64InputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.Base64InputStream.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.Base64InputStream.html Sat Mar 30 06:41:30 2013 @@ -119,8 +119,8 @@
      */
 51  
     public Base64InputStream(final InputStream in) {
-  52  648
         this(in, false);
-  53  648
     }
+  52  1296
         this(in, false);
+  53  1296
     }
 54  
 
 55   @@ -143,8 +143,8 @@
      */
 64  
     public Base64InputStream(final InputStream in, final boolean doEncode) {
-  65  6928
         super(in, new Base64(false), doEncode);
-  66  6928
     }
+  65  13856
         super(in, new Base64(false), doEncode);
+  66  13856
     }
 67  
 
 68   @@ -183,12 +183,12 @@
     public Base64InputStream(final InputStream in, final boolean doEncode,
 85  
                              final int lineLength, final byte[] lineSeparator) {
-  86  6918
         super(in, new Base64(lineLength, lineSeparator), doEncode);
-  87  6918
     }
+  86  13836
         super(in, new Base64(lineLength, lineSeparator), doEncode);
+  87  13836
     }
 88  
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.Base64OutputStream.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.Base64OutputStream.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.Base64OutputStream.html Sat Mar 30 06:41:30 2013 @@ -119,8 +119,8 @@
      */
 51  
     public Base64OutputStream(final OutputStream out) {
-  52  6
         this(out, true);
-  53  6
     }
+  52  12
         this(out, true);
+  53  12
     }
 54  
 
 55   @@ -143,8 +143,8 @@
      */
 64  
     public Base64OutputStream(final OutputStream out, final boolean doEncode) {
-  65  7230
         super(out,new Base64(false), doEncode);
-  66  7230
     }
+  65  14460
         super(out,new Base64(false), doEncode);
+  66  14460
     }
 67  
 
 68   @@ -183,12 +183,12 @@
     public Base64OutputStream(final OutputStream out, final boolean doEncode,
 85  
                               final int lineLength, final byte[] lineSeparator) {
-  86  6908
         super(out, new Base64(lineLength, lineSeparator), doEncode);
-  87  6908
     }
+  86  13816
         super(out, new Base64(lineLength, lineSeparator), doEncode);
+  87  13816
     }
 88  
 }
- + \ No newline at end of file Modified: websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.BaseNCodec.html ============================================================================== --- websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.BaseNCodec.html (original) +++ websites/production/commons/content/proper/commons-codec/cobertura/org.apache.commons.codec.binary.BaseNCodec.html Sat Mar 30 06:41:30 2013 @@ -196,8 +196,8 @@
         int modulus;
 89  
 
-  90  63350
         Context() {
-  91  63350
         }
+  90  126700
         Context() {
+  91  126700
         }
 92  
 
 93   @@ -321,7 +321,7 @@
     protected static final byte PAD_DEFAULT = '='; // Allow static access to default
 153  
 
-  154  61440
     protected final byte PAD = PAD_DEFAULT; // instance variable just in case it needs to vary later
+  154  122880
     protected final byte PAD = PAD_DEFAULT; // instance variable just in case it needs to vary later
 155  
 
 156   @@ -378,13 +378,13 @@
      */
 182  
     protected BaseNCodec(final int unencodedBlockSize, final int encodedBlockSize,
-  183  61440
                          final int lineLength, final int chunkSeparatorLength) {
-  184  61440
         this.unencodedBlockSize = unencodedBlockSize;
-  185  61440
         this.encodedBlockSize = encodedBlockSize;
-  186  61440
         final boolean useChunking = lineLength > 0 && chunkSeparatorLength > 0;
-  187  61440
         this.lineLength = useChunking ? (lineLength / encodedBlockSize) * encodedBlockSize : 0;
-  188  61440
         this.chunkSeparatorLength = chunkSeparatorLength;
-  189  61440
     }
+  183  122880
                          final int lineLength, final int chunkSeparatorLength) {
+  184  122880
         this.unencodedBlockSize = unencodedBlockSize;
+  185  122880
         this.encodedBlockSize = encodedBlockSize;
+  186  122880
         final boolean useChunking = lineLength > 0 && chunkSeparatorLength > 0;
+  187  122880
         this.lineLength = useChunking ? (lineLength / encodedBlockSize) * encodedBlockSize : 0;
+  188  122880
         this.chunkSeparatorLength = chunkSeparatorLength;
+  189  122880
     }
 190  
 
 191   @@ -401,7 +401,7 @@
      */
 197  
     boolean hasData(final Context context) {  // package protected for access from I/O streams
-  198  381602
         return context.buffer != null;
+  198  763204
         return context.buffer != null;
 199  
     }
 200   @@ -420,7 +420,7 @@
      */
 207  
     int available(final Context context) {  // package protected for access from I/O streams
-  208  1440466
         return context.buffer != null ? context.pos - context.readPos : 0;
+  208  2880932
         return context.buffer != null ? context.pos - context.readPos : 0;
 209  
     }
 210   @@ -437,7 +437,7 @@
      */
 216  
     protected int getDefaultBufferSize() {
-  217  399000
         return DEFAULT_BUFFER_SIZE;
+  217  798000
         return DEFAULT_BUFFER_SIZE;
 218  
     }
 219   @@ -452,18 +452,18 @@
      */
 224  
     private byte[] resizeBuffer(final Context context) {
-  225  399004
         if (context.buffer == null) {
-  226  399000
             context.buffer = new byte[getDefaultBufferSize()];
-  227  399000
             context.pos = 0;
-  228  399000
             context.readPos = 0;
+  225  798006
         if (context.buffer == null) {
+  226  798000
             context.buffer = new byte[getDefaultBufferSize()];
+  227  798000
             context.pos = 0;
+  228  798000
             context.readPos = 0;
 229  
         } else {
-  230  4
             final byte[] b = new byte[context.buffer.length * DEFAULT_BUFFER_RESIZE_FACTOR];
-  231  4
             System.arraycopy(context.buffer, 0, b, 0, context.buffer.length);
-  232  4
             context.buffer = b;
+  230  6
             final byte[] b = new byte[context.buffer.length * DEFAULT_BUFFER_RESIZE_FACTOR];
+  231  6
             System.arraycopy(context.buffer, 0, b, 0, context.buffer.length);
+  232  6
             context.buffer = b;
 233  
         }
-  234  399004
         return context.buffer;
+  234  798006
         return context.buffer;
 235  
     }
 236   @@ -482,11 +482,11 @@
      */
 243  
     protected byte[] ensureBufferSize(final int size, final Context context){
-  244  6032536
         if ((context.buffer == null) || (context.buffer.length < context.pos + size)){
-  245  399004
             return resizeBuffer(context);
+  244  12046562
         if ((context.buffer == null) || (context.buffer.length < context.pos + size)){
+  245  798006
             return resizeBuffer(context);
 246  
         }
-  247  5633532
         return context.buffer;
+  247  11248556
         return context.buffer;
 248  
     }
 249   @@ -525,18 +525,18 @@
      */
 266  
     int readResults(final byte[] b, final int bPos, final int bAvail, final Context context) {
-  267  726758
         if (context.buffer != null) {
-  268  575256
             final int len = Math.min(available(context), bAvail);
-  269  575256
             System.arraycopy(context.buffer, context.readPos, b, bPos, len);
-  270  575256
             context.readPos += len;
-  271  575256
             if (context.readPos >= context.pos) {
-  272  398818
                 context.buffer = null; // so hasData() will return false, and this method can return -1
+  267  1453516
         if (context.buffer != null) {
+  268  1150512
             final int len = Math.min(available(context), bAvail);
+  269  1150512
             System.arraycopy(context.buffer, context.readPos, b, bPos, len);
+  270  1150512
             context.readPos += len;
+  271  1150512
             if (context.readPos >= context.pos) {
+  272  797636
                 context.buffer = null; // so hasData() will return false, and this method can return -1
 273  
             }
-  274  575256
             return len;
+  274  1150512
             return len;
 275  
         }
-  276  151502
         return context.eof ? EOF : 0;
+  276  303004
         return context.eof ? EOF : 0;
 277  
     }
 278   @@ -557,7 +557,7 @@
      */
 286  
     protected static boolean isWhiteSpace(final byte byteToCheck) {
-  287  84
         switch (byteToCheck) {
+  287  168
         switch (byteToCheck) {
 288  
             case ' ' :
 289   @@ -566,10 +566,10 @@
             case '\r' :
 291  
             case '\t' :
-  292  64
                 return true;
+  292  128
                 return true;
 293  
             default :
-  294  20
                 return false;
+  294  40
                 return false;
 295  
         }
 296   @@ -600,11 +600,11 @@
     @Override
 309  
     public Object encode(final Object obj) throws EncoderException {
-  310  198
         if (!(obj instanceof byte[])) {
-  311  2
             throw new EncoderException("Parameter supplied to Base-N encode is not a byte[]");
+  310  396
         if (!(obj instanceof byte[])) {
+  311  4
             throw new EncoderException("Parameter supplied to Base-N encode is not a byte[]");
 312  
         }
-  313  196
         return encode((byte[]) obj);
+  313  392
         return encode((byte[]) obj);
 314  
     }
 315   @@ -627,7 +627,7 @@
      */
 324  
     public String encodeToString(final byte[] pArray) {
-  325  8
         return StringUtils.newStringUtf8(encode(pArray));
+  325  16
         return StringUtils.newStringUtf8(encode(pArray));
 326  
     }
 327   @@ -648,7 +648,7 @@
     */
 335  
     public String encodeAsString(final byte[] pArray){
-  336  42
         return StringUtils.newStringUtf8(encode(pArray));
+  336  84
         return StringUtils.newStringUtf8(encode(pArray));
 337  
     }
 338   @@ -679,13 +679,13 @@
     @Override
 351  
     public Object decode(final Object obj) throws DecoderException {
-  352  200
         if (obj instanceof byte[]) {
-  353  196
             return decode((byte[]) obj);
-  354  4
         } else if (obj instanceof String) {
-  355  2
             return decode((String) obj);
+  352  400
         if (obj instanceof byte[]) {
+  353  392
             return decode((byte[]) obj);
+  354  8
         } else if (obj instanceof String) {
+  355  4
             return decode((String) obj);
 356  
         } else {
-  357  2
             throw new DecoderException("Parameter supplied to Base-N decode is not a byte[] or a String");
+  357  4
             throw new DecoderException("Parameter supplied to Base-N decode is not a byte[] or a String");
 358  
         }
 359   @@ -708,7 +708,7 @@
      */
 368  
     public byte[] decode(final String pArray) {
-  369  80
         return decode(StringUtils.getBytesUtf8(pArray));
+  369  160
         return decode(StringUtils.getBytesUtf8(pArray));
 370  
     }
 371   @@ -731,16 +731,16 @@
     @Override
 380  
     public byte[] decode(final byte[] pArray) {
-  381  2320
         if (pArray == null || pArray.length == 0) {
-  382  32
             return pArray;
+  381  4640
         if (pArray == null || pArray.length == 0) {
+  382  64
             return pArray;
 383  
         }
-  384  2288
         final Context context = new Context();
-  385  2288
         decode(pArray, 0, pArray.length, context);
-  386  2288
         decode(pArray, 0, EOF, context); // Notify decoder of EOF.
-  387  2288
         final byte[] result = new byte[context.pos];
-  388  2288
         readResults(result, 0, result.length, context);
-  389  2288
         return result;
+  384  4576
         final Context context = new Context();
+  385  4576
         decode(pArray, 0, pArray.length, context);
+  386  4576
         decode(pArray, 0, EOF, context); // Notify decoder of EOF.
+  387  4576
         final byte[] result = new byte[context.pos];
+  388  4576
         readResults(result, 0, result.length, context);
+  389  4576
         return result;
 390  
     }
 391   @@ -763,16 +763,16 @@
     @Override
 400  
     public byte[] encode(final byte[] pArray) {
-  401  5538
         if (pArray == null || pArray.length == 0) {
-  402  30
             return pArray;
+  401  11076
         if (pArray == null || pArray.length == 0) {
+  402  60
             return pArray;
 403  
         }
-  404  5508
         final Context context = new Context();
-  405  5508
         encode(pArray, 0, pArray.length, context);
-  406  5508
         encode(pArray, 0, EOF, context); // Notify encoder of EOF.
-  407  5508
         final byte[] buf = new byte[context.pos - context.readPos];
-  408  5508
         readResults(buf, 0, buf.length, context);
-  409  5508
         return buf;
+  404  11016
         final Context context = new Context();
+  405  11016
         encode(pArray, 0, pArray.length, context);
+  406  11016
         encode(pArray, 0, EOF, context); // Notify encoder of EOF.
+  407  11016
         final byte[] buf = new byte[context.pos - context.readPos];
+  408  11016
         readResults(buf, 0, buf.length, context);
+  409  11016
         return buf;
 410  
     }
 411   @@ -831,16 +831,16 @@
      */
 438  
     public boolean isInAlphabet(final byte[] arrayOctet, final boolean allowWSPad) {
-  439  52
         for (int i = 0; i < arrayOctet.length; i++) {
-  440  36
             if (!isInAlphabet(arrayOctet[i]) &&
+  439  104
         for (int i = 0; i < arrayOctet.length; i++) {
+  440  72
             if (!isInAlphabet(arrayOctet[i]) &&
 441  
                     (!allowWSPad || (arrayOctet[i] != PAD) && !isWhiteSpace(arrayOctet[i]))) {
-  442  4
                 return false;
+  442  8
                 return false;
 443  
             }
 444  
         }
-  445  16
         return true;
+  445  32
         return true;
 446  
     }
 447   @@ -865,7 +865,7 @@
      */
 457  
     public boolean isInAlphabet(final String basen) {
-  458  4
         return isInAlphabet(StringUtils.getBytesUtf8(basen), true);
+  458  8
         return isInAlphabet(StringUtils.getBytesUtf8(basen), true);
 459  
     }
 460   @@ -890,18 +890,18 @@
      */
 470  
     protected boolean containsAlphabetOrPad(final byte[] arrayOctet) {
-  471  34048
         if (arrayOctet == null) {
-  472  2
             return false;
+  471  68096
         if (arrayOctet == null) {
+  472  4
             return false;
 473  
         }
-  474  88652
         for (final byte element : arrayOctet) {
-  475  54620
             if (PAD == element || isInAlphabet(element)) {
-  476  14
                 return true;
+  474  177304
         for (final byte element : arrayOctet) {
+  475  109240
             if (PAD == element || isInAlphabet(element)) {
+  476  28
                 return true;
 477  
             }
 478  
         }
-  479  34032
         return false;
+  479  68064
         return false;
 480  
     }
 481   @@ -928,20 +928,20 @@
         // Calculate non-chunked size - rounded up to allow for padding
 492  
         // cast to long is needed to avoid possibility of overflow
-  493  3848
         long len = ((pArray.length + unencodedBlockSize-1)  / unencodedBlockSize) * (long) encodedBlockSize;
-  494  3848
         if (lineLength > 0) { // We're using chunking
+  493  7696
         long len = ((pArray.length + unencodedBlockSize-1)  / unencodedBlockSize) * (long) encodedBlockSize;
+  494  7696
         if (lineLength > 0) { // We're using chunking
 495  
             // Round up to nearest multiple
-  496  582
             len += ((len + lineLength-1) / lineLength) * chunkSeparatorLength;
+  496  1164
             len += ((len + lineLength-1) / lineLength) * chunkSeparatorLength;
 497  
         }
-  498  3848
         return len;
+  498  7696
         return len;
 499  
     }
 500  
 }
- + \ No newline at end of file