sanders 02/01/27 21:00:18
Modified: codec/src/java/org/apache/commons/codec/base64 Base64.java
codec/src/test/org/apache/commons/codec/base64
Base64TestCase.java
Log:
Code formatting
Revision Changes Path
1.2 +114 -108
jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/base64/Base64.java
Index: Base64.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/base64/Base64.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Base64.java 24 Jan 2002 05:10:58 -0000 1.1
+++ Base64.java 28 Jan 2002 05:00:16 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/base64/Base64.java,v
1.1 2002/01/24 05:10:58 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/24 05:10:58 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/codec/src/java/org/apache/commons/codec/base64/Base64.java,v
1.2 2002/01/28 05:00:16 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/28 05:00:16 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -56,8 +56,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * [Additional notices, if required by prior licensing conditions]
- *
*/
package org.apache.commons.codec.base64;
@@ -73,71 +71,72 @@
* 1996. Available at: http://www.ietf.org/rfc/rfc2045.txt
* </p>
* @author Jeffrey Rodriguez
- * @version $Revision: 1.1 $ $Date: 2002/01/24 05:10:58 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/28 05:00:16 $
*/
final class Base64 {
- static private final int BASELENGTH = 255;
- static private final int LOOKUPLENGTH = 64;
- static private final int TWENTYFOURBITGROUP = 24;
- static private final int EIGHTBIT = 8;
- static private final int SIXTEENBIT = 16;
- static private final int SIXBIT = 6;
- static private final int FOURBYTE = 4;
- static private final int SIGN = -128;
- static private final byte PAD = ( byte ) '=';
- static private byte [] base64Alphabet = new byte[BASELENGTH];
- static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
+
+ static private final int BASELENGTH = 255;
+ static private final int LOOKUPLENGTH = 64;
+ static private final int TWENTYFOURBITGROUP = 24;
+ static private final int EIGHTBIT = 8;
+ static private final int SIXTEENBIT = 16;
+ static private final int SIXBIT = 6;
+ static private final int FOURBYTE = 4;
+ static private final int SIGN = -128;
+ static private final byte PAD = (byte) '=';
+ static private byte[] base64Alphabet = new byte[BASELENGTH];
+ static private byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
static {
- for (int i = 0; i<BASELENGTH; i++ ) {
+ for (int i = 0; i < BASELENGTH; i++) {
base64Alphabet[i] = -1;
}
- for ( int i = 'Z'; i >= 'A'; i-- ) {
- base64Alphabet[i] = (byte) (i-'A');
+ for (int i = 'Z'; i >= 'A'; i--) {
+ base64Alphabet[i] = (byte) (i - 'A');
}
- for ( int i = 'z'; i>= 'a'; i--) {
- base64Alphabet[i] = (byte) ( i-'a' + 26);
+ for (int i = 'z'; i >= 'a'; i--) {
+ base64Alphabet[i] = (byte) (i - 'a' + 26);
}
- for ( int i = '9'; i >= '0'; i--) {
- base64Alphabet[i] = (byte) (i-'0' + 52);
+ for (int i = '9'; i >= '0'; i--) {
+ base64Alphabet[i] = (byte) (i - '0' + 52);
}
- base64Alphabet['+'] = 62;
- base64Alphabet['/'] = 63;
+ base64Alphabet['+'] = 62;
+ base64Alphabet['/'] = 63;
- for (int i = 0; i<=25; i++ )
- lookUpBase64Alphabet[i] = (byte) ('A'+i );
+ for (int i = 0; i <= 25; i++)
+ lookUpBase64Alphabet[i] = (byte) ('A' + i);
- for (int i = 26, j = 0; i<=51; i++, j++ )
- lookUpBase64Alphabet[i] = (byte) ('a'+ j );
+ for (int i = 26, j = 0; i <= 51; i++, j++)
+ lookUpBase64Alphabet[i] = (byte) ('a' + j);
- for (int i = 52, j = 0; i<=61; i++, j++ )
- lookUpBase64Alphabet[i] = (byte) ('0' + j );
+ for (int i = 52, j = 0; i <= 61; i++, j++)
+ lookUpBase64Alphabet[i] = (byte) ('0' + j);
lookUpBase64Alphabet[62] = (byte) '+';
lookUpBase64Alphabet[63] = (byte) '/';
}
- static boolean isBase64( String isValidString ){
- return( isArrayByteBase64( isValidString.getBytes()));
+ static boolean isBase64(String isValidString) {
+ return (isArrayByteBase64(isValidString.getBytes()));
}
- static boolean isBase64( byte octect ) {
+ static boolean isBase64(byte octect) {
// Should we ignore white space?
- return(octect == PAD || base64Alphabet[octect] != -1 );
+ return (octect == PAD || base64Alphabet[octect] != -1);
}
- static boolean isArrayByteBase64( byte[] arrayOctect ) {
+ static boolean isArrayByteBase64(byte[] arrayOctect) {
int length = arrayOctect.length;
- if ( length == 0 ) {
+ if (length == 0) {
return true;
}
- for ( int i=0; i < length; i++ ) {
- if ( Base64.isBase64( arrayOctect[i] ) == false)
+ for (int i = 0; i < length; i++) {
+ if (Base64.isBase64(arrayOctect[i]) == false)
return false;
}
return true;
@@ -149,69 +148,69 @@
* @param binaryData Array containing binaryData
* @return Base64-encoded array
*/
- static byte[] encode( byte[] binaryData ) {
+ static byte[] encode(byte[] binaryData) {
- int lengthDataBits = binaryData.length*EIGHTBIT;
- int fewerThan24bits = lengthDataBits%TWENTYFOURBITGROUP;
- int numberTriplets = lengthDataBits/TWENTYFOURBITGROUP;
- byte encodedData[] = null;
+ int lengthDataBits = binaryData.length * EIGHTBIT;
+ int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
+ int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
+ byte encodedData[] = null;
- if ( fewerThan24bits != 0 ) //data not divisible by 24 bit
- encodedData = new byte[ (numberTriplets + 1 )*4 ];
+ if (fewerThan24bits != 0) //data not divisible by 24 bit
+ encodedData = new byte[(numberTriplets + 1) * 4];
else // 16 or 8 bit
- encodedData = new byte[ numberTriplets*4 ];
+ encodedData = new byte[numberTriplets * 4];
- byte k=0, l=0, b1=0,b2=0,b3=0;
+ byte k = 0, l = 0, b1 = 0,b2 = 0,b3 = 0;
int encodedIndex = 0;
- int dataIndex = 0;
- int i = 0;
- for ( i = 0; i<numberTriplets; i++ ) {
+ int dataIndex = 0;
+ int i = 0;
+ for (i = 0; i < numberTriplets; i++) {
- dataIndex = i*3;
+ dataIndex = i * 3;
b1 = binaryData[dataIndex];
b2 = binaryData[dataIndex + 1];
b3 = binaryData[dataIndex + 2];
- l = (byte)(b2 & 0x0f);
- k = (byte)(b1 & 0x03);
+ l = (byte) (b2 & 0x0f);
+ k = (byte) (b1 & 0x03);
- encodedIndex = i*4;
- byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
+ encodedIndex = i * 4;
+ byte val1 = ((b1 & SIGN) == 0)?(byte) (b1 >> 2):(byte) ((b1) >> 2 ^
0xc0);
- byte val2 = ((b2 & SIGN)==0)?(byte)(b2>>4):(byte)((b2)>>4^0xf0);
- byte val3 = ((b3 & SIGN)==0)?(byte)(b3>>6):(byte)((b3)>>6^0xfc);
+ byte val2 = ((b2 & SIGN) == 0)?(byte) (b2 >> 4):(byte) ((b2) >> 4 ^
0xf0);
+ byte val3 = ((b3 & SIGN) == 0)?(byte) (b3 >> 6):(byte) ((b3) >> 6 ^
0xfc);
- encodedData[encodedIndex] = lookUpBase64Alphabet[ val1 ];
- encodedData[encodedIndex+1] = lookUpBase64Alphabet[ val2 | ( k<<4 )];
- encodedData[encodedIndex+2] = lookUpBase64Alphabet[ (l <<2 ) | val3 ];
- encodedData[encodedIndex+3] = lookUpBase64Alphabet[ b3 & 0x3f ];
+ encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2 | (k << 4)];
+ encodedData[encodedIndex + 2] = lookUpBase64Alphabet[(l << 2) | val3];
+ encodedData[encodedIndex + 3] = lookUpBase64Alphabet[b3 & 0x3f];
}
// form integral number of 6-bit groups
- dataIndex = i*3;
- encodedIndex = i*4;
- if (fewerThan24bits == EIGHTBIT ) {
+ dataIndex = i * 3;
+ encodedIndex = i * 4;
+ if (fewerThan24bits == EIGHTBIT) {
b1 = binaryData[dataIndex];
- k = (byte) ( b1 &0x03 );
- byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
- encodedData[encodedIndex] = lookUpBase64Alphabet[ val1 ];
- encodedData[encodedIndex + 1] = lookUpBase64Alphabet[ k<<4 ];
+ k = (byte) (b1 & 0x03);
+ byte val1 = ((b1 & SIGN) == 0)?(byte) (b1 >> 2):(byte) ((b1) >> 2 ^
0xc0);
+ encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[k << 4];
encodedData[encodedIndex + 2] = PAD;
encodedData[encodedIndex + 3] = PAD;
- } else if ( fewerThan24bits == SIXTEENBIT ) {
+ } else if (fewerThan24bits == SIXTEENBIT) {
b1 = binaryData[dataIndex];
- b2 = binaryData[dataIndex +1 ];
- l = ( byte ) ( b2 &0x0f );
- k = ( byte ) ( b1 &0x03 );
-
- byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
- byte val2 = ((b2 & SIGN)==0)?(byte)(b2>>4):(byte)((b2)>>4^0xf0);
-
- encodedData[encodedIndex] = lookUpBase64Alphabet[ val1 ];
- encodedData[encodedIndex + 1] = lookUpBase64Alphabet[ val2 | ( k<<4 )];
- encodedData[encodedIndex + 2] = lookUpBase64Alphabet[ l<<2 ];
+ b2 = binaryData[dataIndex + 1];
+ l = (byte) (b2 & 0x0f);
+ k = (byte) (b1 & 0x03);
+
+ byte val1 = ((b1 & SIGN) == 0)?(byte) (b1 >> 2):(byte) ((b1) >> 2 ^
0xc0);
+ byte val2 = ((b2 & SIGN) == 0)?(byte) (b2 >> 4):(byte) ((b2) >> 4 ^
0xf0);
+
+ encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2 | (k << 4)];
+ encodedData[encodedIndex + 2] = lookUpBase64Alphabet[l << 2];
encodedData[encodedIndex + 3] = PAD;
}
return encodedData;
@@ -224,50 +223,57 @@
* @param binaryData Byte array containing Base64 data
* @return Array containing decoded data.
*/
- static byte[] decode( byte[] base64Data ) {
+ static byte[] decode(byte[] base64Data) {
// Should we throw away anything not in base64Data ?
// handle the edge case, so we don't have to worry about it later
- if(base64Data.length == 0) { return new byte[0]; }
+ if (base64Data.length == 0) {
+ return new byte[0];
+ }
- int numberQuadruple = base64Data.length/FOURBYTE;
- byte decodedData[] = null;
- byte b1=0,b2=0,b3=0, b4=0, marker0=0, marker1=0;
+ int numberQuadruple = base64Data.length / FOURBYTE;
+ byte decodedData[] = null;
+ byte b1 = 0,b2 = 0,b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
int encodedIndex = 0;
- int dataIndex = 0;
+ int dataIndex = 0;
{
// this block sizes the output array properly - rlw
int lastData = base64Data.length;
// ignore the '=' padding
- while(base64Data[lastData-1] == PAD) {
- if(--lastData == 0) { return new byte[0]; }
+ while (base64Data[lastData - 1] == PAD) {
+ if (--lastData == 0) {
+ return new byte[0];
+ }
}
- decodedData = new byte[ lastData - numberQuadruple ];
+ decodedData = new byte[lastData - numberQuadruple];
}
- for (int i = 0; i<numberQuadruple; i++ ) {
- dataIndex = i*4;
- marker0 = base64Data[dataIndex +2];
- marker1 = base64Data[dataIndex +3];
+ for (int i = 0; i < numberQuadruple; i++) {
+ dataIndex = i * 4;
+ marker0 = base64Data[dataIndex + 2];
+ marker1 = base64Data[dataIndex + 3];
b1 = base64Alphabet[base64Data[dataIndex]];
- b2 = base64Alphabet[base64Data[dataIndex +1]];
+ b2 = base64Alphabet[base64Data[dataIndex + 1]];
- if ( marker0 != PAD && marker1 != PAD ) { //No PAD e.g 3cQl
- b3 = base64Alphabet[ marker0 ];
- b4 = base64Alphabet[ marker1 ];
-
- decodedData[encodedIndex] = (byte)( b1 <<2 | b2>>4 ) ;
- decodedData[encodedIndex+1] = (byte)(((b2 & 0xf)<<4 ) |( (b3>>2) &
0xf) );
- decodedData[encodedIndex+2] = (byte)( b3<<6 | b4 );
- } else if ( marker0 == PAD ) { //Two PAD e.g. 3c[Pad][Pad]
- decodedData[encodedIndex] = (byte)( b1 <<2 | b2>>4 ) ;
- } else if ( marker1 == PAD ) { //One PAD e.g. 3cQ[Pad]
- b3 = base64Alphabet[ marker0 ];
+ if (marker0 != PAD && marker1 != PAD) {
+ //No PAD e.g 3cQl
+ b3 = base64Alphabet[marker0];
+ b4 = base64Alphabet[marker1];
+
+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+ decodedData[encodedIndex + 1] = (byte) (((b2 & 0xf) << 4) | ((b3 >>
2) & 0xf));
+ decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
+ } else if (marker0 == PAD) {
+ //Two PAD e.g. 3c[Pad][Pad]
+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+ } else if (marker1 == PAD) {
+ //One PAD e.g. 3cQ[Pad]
+ b3 = base64Alphabet[marker0];
- decodedData[encodedIndex] = (byte)( b1 <<2 | b2>>4 );
- decodedData[encodedIndex+1] = (byte)(((b2 & 0xf)<<4 ) |( (b3>>2) &
0xf) );
+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+ decodedData[encodedIndex + 1] = (byte) (((b2 & 0xf) << 4) | ((b3 >>
2) & 0xf));
}
encodedIndex += 3;
}
1.2 +5 -5
jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/base64/Base64TestCase.java
Index: Base64TestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/base64/Base64TestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Base64TestCase.java 28 Jan 2002 04:58:50 -0000 1.1
+++ Base64TestCase.java 28 Jan 2002 05:00:18 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/base64/Base64TestCase.java,v
1.1 2002/01/28 04:58:50 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/28 04:58:50 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/codec/src/test/org/apache/commons/codec/base64/Base64TestCase.java,v
1.2 2002/01/28 05:00:18 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/28 05:00:18 $
*
* ====================================================================
*
@@ -62,8 +62,8 @@
package org.apache.commons.codec.base64;
-import junit.framework.TestCase;
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -101,7 +101,7 @@
/**
- *
+ * Test the Base64 implementation
*/
public void testBase64() {
String content = "Hello World";
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
