commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r918256 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/ main/java/org/apache/commons/compress/archivers/jar/ main/java/org/apache/commons/compress/changes/ main/java/org/apache/commons/compress/comp...
Date Tue, 02 Mar 2010 23:27:19 GMT
Author: sebb
Date: Tue Mar  2 23:27:18 2010
New Revision: 918256

URL: http://svn.apache.org/viewvc?rev=918256&view=rev
Log:
Tab police

Modified:
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/Change.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
    commons/proper/compress/trunk/src/test/resources/test2.xml

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveException.java
Tue Mar  2 23:27:18 2010
@@ -23,7 +23,7 @@
  */
 public class ArchiveException extends Exception {
 
-	/** Serial */
+    /** Serial */
     private static final long serialVersionUID = 2772690708123267100L;
 
     /**
@@ -34,9 +34,9 @@
      *            the detail message
      */
     public ArchiveException(String message) {
-		super(message);
-	}
-	
+        super(message);
+    }
+
     /**
      * Constructs a new exception with the specified detail message and cause.
      * 
@@ -45,8 +45,8 @@
      * @param cause
      *            the cause
      */
-	public ArchiveException(String message, Exception cause) {
-		super(message);
-		this.initCause(cause);
-	}
+    public ArchiveException(String message, Exception cause) {
+        super(message);
+        this.initCause(cause);
+    }
 }

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
Tue Mar  2 23:27:18 2010
@@ -95,7 +95,7 @@
         }
         
         if (in == null) {
-        	throw new IllegalArgumentException("InputStream must not be null.");
+            throw new IllegalArgumentException("InputStream must not be null.");
         }
 
         if (AR.equalsIgnoreCase(archiverName)) {
@@ -133,7 +133,7 @@
             throw new IllegalArgumentException("Archivername must not be null.");
         }
         if (out == null) {
-        	throw new IllegalArgumentException("OutputStream must not be null.");
+            throw new IllegalArgumentException("OutputStream must not be null.");
         }
 
         if (AR.equalsIgnoreCase(archiverName)) {

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveEntry.java
Tue Mar  2 23:27:18 2010
@@ -28,43 +28,43 @@
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 
 /**
- * 
+ *
  * @NotThreadSafe
  */
 public class JarArchiveEntry extends ZipArchiveEntry implements ArchiveEntry {
 
-	private Attributes manifestAttributes = null;
-	private Certificate[] certificates = null; 
-	
-	public JarArchiveEntry(ZipEntry entry) throws ZipException {
-		super(entry);
-	}
-
-	public JarArchiveEntry(String name) {
-		super(name);
-	}
-
-	public JarArchiveEntry(ZipArchiveEntry entry) throws ZipException {
-		super(entry);
-	}
-
-	public JarArchiveEntry(JarEntry entry) throws ZipException {
-		super(entry);
-		
-	}
-
-	public Attributes getManifestAttributes() {
-		return manifestAttributes;
-	}
+    private Attributes manifestAttributes = null;
+    private Certificate[] certificates = null;
 
-	public Certificate[] getCertificates() {
+    public JarArchiveEntry(ZipEntry entry) throws ZipException {
+        super(entry);
+    }
+
+    public JarArchiveEntry(String name) {
+        super(name);
+    }
+
+    public JarArchiveEntry(ZipArchiveEntry entry) throws ZipException {
+        super(entry);
+    }
+
+    public JarArchiveEntry(JarEntry entry) throws ZipException {
+        super(entry);
+
+    }
+
+    public Attributes getManifestAttributes() {
+        return manifestAttributes;
+    }
+
+    public Certificate[] getCertificates() {
             if (certificates != null) {
                 Certificate[] certs = new Certificate[certificates.length];
                 System.arraycopy(certificates, 0, certs, 0, certs.length);
                 return certs;
             }
             return null;
-	}
+    }
 
     /* (non-Javadoc)
      * @see org.apache.commons.compress.archivers.zip.ZipArchiveEntry#equals(java.lang.Object)

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/Change.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/Change.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/Change.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/Change.java
Tue Mar  2 23:27:18 2010
@@ -28,67 +28,67 @@
  * @Immutable
  */
 class Change {
-	private final String targetFile; // entry name to delete
-	private final ArchiveEntry entry; // new entry to add
-	private final InputStream input; // source for new entry
-	private final boolean replaceMode; // change should replaceMode existing entries
-	
-	// Type of change
-	private final int type;
-	// Possible type values
-	static final int TYPE_DELETE = 1;
-	static final int TYPE_ADD = 2;
-	static final int TYPE_MOVE = 3; // NOT USED
-	static final int TYPE_DELETE_DIR = 4;
-	
-	/**
-	 * Constructor. Takes the filename of the file to be deleted
-	 * from the stream as argument.
-	 * @param pFilename the filename of the file to delete
-	 */
-	Change(final String pFilename, int type) {
-		if(pFilename == null) {
-			throw new NullPointerException();
-		}
-		this.targetFile = pFilename;
-		this.type = type;
-		this.input = null;
-		this.entry = null;
-		this.replaceMode = true;
-	}
-		
-	/**
-	 * Construct a change which adds an entry.
-	 * 
-	 * @param pEntry the entry details
-	 * @param pInput the InputStream for the entry data
-	 */
-	Change(final ArchiveEntry pEntry, final InputStream pInput, boolean replace) {
-		if(pEntry == null || pInput == null) {
-			throw new NullPointerException();
-		}
-		this.entry = pEntry;
-		this.input = pInput;
-		type = TYPE_ADD;
-		targetFile = null;
-		this.replaceMode = replace;
-	}
-	
-	ArchiveEntry getEntry() {
-		return entry;
-	}
-
-	InputStream getInput() {
-		return input;
-	}
-
-	String targetFile() {
-		return targetFile;
-	}
-	
-	int type() {
-		return type;
-	}
+    private final String targetFile; // entry name to delete
+    private final ArchiveEntry entry; // new entry to add
+    private final InputStream input; // source for new entry
+    private final boolean replaceMode; // change should replaceMode existing entries
+
+    // Type of change
+    private final int type;
+    // Possible type values
+    static final int TYPE_DELETE = 1;
+    static final int TYPE_ADD = 2;
+    static final int TYPE_MOVE = 3; // NOT USED
+    static final int TYPE_DELETE_DIR = 4;
+
+    /**
+     * Constructor. Takes the filename of the file to be deleted
+     * from the stream as argument.
+     * @param pFilename the filename of the file to delete
+     */
+    Change(final String pFilename, int type) {
+        if(pFilename == null) {
+            throw new NullPointerException();
+        }
+        this.targetFile = pFilename;
+        this.type = type;
+        this.input = null;
+        this.entry = null;
+        this.replaceMode = true;
+    }
+
+    /**
+     * Construct a change which adds an entry.
+     * 
+     * @param pEntry the entry details
+     * @param pInput the InputStream for the entry data
+     */
+    Change(final ArchiveEntry pEntry, final InputStream pInput, boolean replace) {
+        if(pEntry == null || pInput == null) {
+            throw new NullPointerException();
+        }
+        this.entry = pEntry;
+        this.input = pInput;
+        type = TYPE_ADD;
+        targetFile = null;
+        this.replaceMode = replace;
+    }
+
+    ArchiveEntry getEntry() {
+        return entry;
+    }
+
+    InputStream getInput() {
+        return input;
+    }
+
+    String targetFile() {
+        return targetFile;
+    }
+
+    int type() {
+        return type;
+    }
 
     boolean isReplaceMode() {
         return replaceMode;

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/CRC.java
Tue Mar  2 23:27:18 2010
@@ -25,110 +25,110 @@
  */
 class CRC {
     private static final int crc32Table[] = {
-	        0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
-	        0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
-	        0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
-	        0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
-	        0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
-	        0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-	        0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
-	        0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
-	        0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-	        0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
-	        0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
-	        0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-	        0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
-	        0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
-	        0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
-	        0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
-	        0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
-	        0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-	        0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
-	        0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
-	        0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
-	        0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
-	        0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
-	        0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-	        0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
-	        0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
-	        0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
-	        0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
-	        0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
-	        0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-	        0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
-	        0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
-	        0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
-	        0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
-	        0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
-	        0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-	        0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
-	        0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
-	        0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
-	        0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
-	        0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
-	        0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-	        0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
-	        0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
-	        0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
-	        0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
-	        0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
-	        0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-	        0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
-	        0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
-	        0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
-	        0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
-	        0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
-	        0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
-	        0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
-	        0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
-	        0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
-	        0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
-	        0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
-	        0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-	        0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
-	        0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
-	        0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
-	        0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-	    };
-
-	    CRC() {
-	        initialiseCRC();
-	    }
-
-	    void initialiseCRC() {
-	        globalCrc = 0xffffffff;
-	    }
-
-	    int getFinalCRC() {
-	        return ~globalCrc;
-	    }
-
-	    int getGlobalCRC() {
-	        return globalCrc;
-	    }
-
-	    void setGlobalCRC(int newCrc) {
-	        globalCrc = newCrc;
-	    }
-
-	    void updateCRC(int inCh) {
-	        int temp = (globalCrc >> 24) ^ inCh;
-	        if (temp < 0) {
-	            temp = 256 + temp;
-	        }
-	        globalCrc = (globalCrc << 8) ^ CRC.crc32Table[temp];
-	    }
-
-	    void updateCRC(int inCh, int repeat) {
-	        int globalCrcShadow = this.globalCrc;
-	        while (repeat-- > 0) {
-	            int temp = (globalCrcShadow >> 24) ^ inCh;
-	            globalCrcShadow = (globalCrcShadow << 8) ^ crc32Table[(temp >= 0)
-	                                                      ? temp
-	                                                      : (temp + 256)];
-	        }
-	        this.globalCrc = globalCrcShadow;
-	    }
+            0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
+            0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
+            0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+            0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+            0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
+            0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+            0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
+            0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
+            0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+            0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
+            0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
+            0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+            0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
+            0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+            0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+            0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
+            0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
+            0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+            0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+            0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
+            0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+            0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
+            0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
+            0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+            0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
+            0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
+            0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+            0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
+            0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+            0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+            0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
+            0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
+            0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+            0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+            0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
+            0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+            0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
+            0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
+            0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+            0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
+            0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
+            0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+            0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
+            0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+            0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+            0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
+            0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
+            0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+            0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+            0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
+            0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+            0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
+            0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
+            0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+            0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
+            0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
+            0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+            0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
+            0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+            0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+            0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
+            0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
+            0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+            0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+        };
+
+        CRC() {
+            initialiseCRC();
+        }
+
+        void initialiseCRC() {
+            globalCrc = 0xffffffff;
+        }
+
+        int getFinalCRC() {
+            return ~globalCrc;
+        }
+
+        int getGlobalCRC() {
+            return globalCrc;
+        }
+
+        void setGlobalCRC(int newCrc) {
+            globalCrc = newCrc;
+        }
+
+        void updateCRC(int inCh) {
+            int temp = (globalCrc >> 24) ^ inCh;
+            if (temp < 0) {
+                temp = 256 + temp;
+            }
+            globalCrc = (globalCrc << 8) ^ CRC.crc32Table[temp];
+        }
+
+        void updateCRC(int inCh, int repeat) {
+            int globalCrcShadow = this.globalCrc;
+            while (repeat-- > 0) {
+                int temp = (globalCrcShadow >> 24) ^ inCh;
+                globalCrcShadow = (globalCrcShadow << 8) ^ crc32Table[(temp >= 0)
+                                                          ? temp
+                                                          : (temp + 256)];
+            }
+            this.globalCrc = globalCrcShadow;
+        }
 
-	    private int globalCrc;
+        private int globalCrc;
 }
\ No newline at end of file

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java
(original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/IOUtils.java
Tue Mar  2 23:27:18 2010
@@ -29,13 +29,13 @@
 public final class IOUtils {
 
     /** Private constructor to prevent instantiation of this utility class. */
-    private IOUtils(){    
+    private IOUtils(){
     }
 
-	/**
+    /**
      * Copies the content of a InputStream into an OutputStream.
      * Uses a default buffer size of 8024 bytes.
-     * 
+     *
      * @param input
      *            the InputStream to copy
      * @param output
@@ -46,10 +46,10 @@
     public static long copy(final InputStream input, final OutputStream output) throws IOException
{
         return copy(input, output, 8024);
     }
-    
+
     /**
      * Copies the content of a InputStream into an OutputStream
-     * 
+     *
      * @param input
      *            the InputStream to copy
      * @param output

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
Tue Mar  2 23:27:18 2010
@@ -4,59 +4,56 @@
 import junit.framework.TestCase;
 
 public class ExceptionMessageTest extends TestCase {
-	
-	private static final String ARCHIVER_NULL_MESSAGE = "Archivername must not be null.";
-	
-	private static final String INPUTSTREAM_NULL_MESSAGE = "InputStream must not be null.";
-	
-	private static final String OUTPUTSTREAM_NULL_MESSAGE = "OutputStream must not be null.";
-	
-	
-	
-	public void testMessageWhenArchiverNameIsNull_1(){
-		try{
-			new ArchiveStreamFactory().createArchiveInputStream(null, System.in);
-			fail("Should raise an IllegalArgumentException.");
-		}catch (IllegalArgumentException e) {
-			Assert.assertEquals(ARCHIVER_NULL_MESSAGE, e.getMessage());
-		} catch (ArchiveException e) {
-			fail("ArchiveException not expected");
-		}
-	}
-	
-	public void testMessageWhenInputStreamIsNull(){
-		try{
-			new ArchiveStreamFactory().createArchiveInputStream("zip", null);
-			fail("Should raise an IllegalArgumentException.");
-		}catch (IllegalArgumentException e) {
-			Assert.assertEquals(INPUTSTREAM_NULL_MESSAGE, e.getMessage());
-		} catch (ArchiveException e) {
-			fail("ArchiveException not expected");
-		}
-	}
-	
-	public void testMessageWhenArchiverNameIsNull_2(){
-		try{
-			new ArchiveStreamFactory().createArchiveOutputStream(null, System.out);
-			fail("Should raise an IllegalArgumentException.");
-		} catch (IllegalArgumentException e) {
-			Assert.assertEquals(ARCHIVER_NULL_MESSAGE, e.getMessage());
-		} catch (ArchiveException e){
-			fail("ArchiveException not expected");
-		}
-	}
-	
-	public void testMessageWhenOutputStreamIsNull(){
-		try{
-			new ArchiveStreamFactory().createArchiveOutputStream("zip", null);
-			fail("Should raise an IllegalArgumentException.");
-		} catch (IllegalArgumentException e) {
-			Assert.assertEquals(OUTPUTSTREAM_NULL_MESSAGE, e.getMessage());
-		} catch (ArchiveException e) {
-			fail("ArchiveException not expected");
-		}
-	}
-	
-	
+
+    private static final String ARCHIVER_NULL_MESSAGE = "Archivername must not be null.";
+    
+    private static final String INPUTSTREAM_NULL_MESSAGE = "InputStream must not be null.";
+    
+    private static final String OUTPUTSTREAM_NULL_MESSAGE = "OutputStream must not be null.";
+
+
+    public void testMessageWhenArchiverNameIsNull_1(){
+        try{
+            new ArchiveStreamFactory().createArchiveInputStream(null, System.in);
+            fail("Should raise an IllegalArgumentException.");
+        }catch (IllegalArgumentException e) {
+            Assert.assertEquals(ARCHIVER_NULL_MESSAGE, e.getMessage());
+        } catch (ArchiveException e) {
+            fail("ArchiveException not expected");
+        }
+    }
+
+    public void testMessageWhenInputStreamIsNull(){
+        try{
+            new ArchiveStreamFactory().createArchiveInputStream("zip", null);
+            fail("Should raise an IllegalArgumentException.");
+        }catch (IllegalArgumentException e) {
+            Assert.assertEquals(INPUTSTREAM_NULL_MESSAGE, e.getMessage());
+        } catch (ArchiveException e) {
+            fail("ArchiveException not expected");
+        }
+    }
+
+    public void testMessageWhenArchiverNameIsNull_2(){
+        try{
+            new ArchiveStreamFactory().createArchiveOutputStream(null, System.out);
+            fail("Should raise an IllegalArgumentException.");
+        } catch (IllegalArgumentException e) {
+            Assert.assertEquals(ARCHIVER_NULL_MESSAGE, e.getMessage());
+        } catch (ArchiveException e){
+            fail("ArchiveException not expected");
+        }
+    }
+
+    public void testMessageWhenOutputStreamIsNull(){
+        try{
+            new ArchiveStreamFactory().createArchiveOutputStream("zip", null);
+            fail("Should raise an IllegalArgumentException.");
+        } catch (IllegalArgumentException e) {
+            Assert.assertEquals(OUTPUTSTREAM_NULL_MESSAGE, e.getMessage());
+        } catch (ArchiveException e) {
+            fail("ArchiveException not expected");
+        }
+    }
 
 }
\ No newline at end of file

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
Tue Mar  2 23:27:18 2010
@@ -30,20 +30,20 @@
 import org.apache.commons.compress.AbstractTestCase;
 
 public final class JarTestCase extends AbstractTestCase {
-	public void testJarArchiveCreation() throws Exception {
-		final File output = new File(dir, "bla.jar");
+    public void testJarArchiveCreation() throws Exception {
+        final File output = new File(dir, "bla.jar");
+
+        final File file1 = getFile("test1.xml");
+        final File file2 = getFile("test2.xml");
 
-		final File file1 = getFile("test1.xml");
-		final File file2 = getFile("test2.xml");
-		
         final OutputStream out = new FileOutputStream(output);
-        
+
         final ArchiveOutputStream os = new ArchiveStreamFactory().createArchiveOutputStream("jar",
out);
 
         os.putArchiveEntry(new ZipArchiveEntry("testdata/test1.xml"));
         IOUtils.copy(new FileInputStream(file1), os);
         os.closeArchiveEntry();
-        
+
         os.putArchiveEntry(new ZipArchiveEntry("testdata/test2.xml"));
         IOUtils.copy(new FileInputStream(file2), os);
         os.closeArchiveEntry();
@@ -51,59 +51,59 @@
         os.close();
     }
 
-	
-	public void testJarUnarchive() throws Exception {
-		final File input = getFile("bla.jar");
+
+    public void testJarUnarchive() throws Exception {
+        final File input = getFile("bla.jar");
         final InputStream is = new FileInputStream(input);
         final ArchiveInputStream in = new ArchiveStreamFactory().createArchiveInputStream("jar",
is);
-        
+
         ZipArchiveEntry entry = (ZipArchiveEntry)in.getNextEntry();
         File o = new File(dir, entry.getName());
         o.getParentFile().mkdirs();
         OutputStream out = new FileOutputStream(o);
         IOUtils.copy(in, out);
         out.close();
-        
+
         entry = (ZipArchiveEntry)in.getNextEntry();
         o = new File(dir, entry.getName());
         o.getParentFile().mkdirs();
         out = new FileOutputStream(o);
         IOUtils.copy(in, out);
         out.close();
-        
+
         entry = (ZipArchiveEntry)in.getNextEntry();
         o = new File(dir, entry.getName());
         o.getParentFile().mkdirs();
         out = new FileOutputStream(o);
         IOUtils.copy(in, out);
         out.close();
-        
+
         in.close();
         is.close();
     }
-	
-	public void testJarUnarchiveAll() throws Exception {
-		final File input = getFile("bla.jar");
+
+    public void testJarUnarchiveAll() throws Exception {
+        final File input = getFile("bla.jar");
         final InputStream is = new FileInputStream(input);
         final ArchiveInputStream in = new ArchiveStreamFactory().createArchiveInputStream("jar",
is);
-        
+
         ArchiveEntry entry = in.getNextEntry();
-		while (entry != null) {
-			File archiveEntry = new File(dir, entry.getName());
-			archiveEntry.getParentFile().mkdirs();
-			if(entry.isDirectory()){
-				archiveEntry.mkdir();
-				entry = in.getNextEntry();
-				continue;
-			}
-			OutputStream out = new FileOutputStream(archiveEntry);
-			IOUtils.copy(in, out);
-			out.close();
-			entry = in.getNextEntry();
-		}
-		
-		in.close();
-		is.close();
-	}
+        while (entry != null) {
+            File archiveEntry = new File(dir, entry.getName());
+            archiveEntry.getParentFile().mkdirs();
+            if(entry.isDirectory()){
+                archiveEntry.mkdir();
+                entry = in.getNextEntry();
+                continue;
+            }
+            OutputStream out = new FileOutputStream(archiveEntry);
+            IOUtils.copy(in, out);
+            out.close();
+            entry = in.getNextEntry();
+        }
+
+        in.close();
+        is.close();
+    }
 
 }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
Tue Mar  2 23:27:18 2010
@@ -33,9 +33,9 @@
 
 public final class TarTestCase extends AbstractTestCase {
     public void testTarArchiveCreation() throws Exception {
-		final File output = new File(dir, "bla.tar");
-		final File file1 = getFile("test1.xml");
-    	final OutputStream out = new FileOutputStream(output);
+        final File output = new File(dir, "bla.tar");
+        final File file1 = getFile("test1.xml");
+        final OutputStream out = new FileOutputStream(output);
         final ArchiveOutputStream os = new ArchiveStreamFactory().createArchiveOutputStream("tar",
out);
         final TarArchiveEntry entry = new TarArchiveEntry("testdata/test1.xml");
         entry.setModTime(0);
@@ -50,15 +50,15 @@
         os.closeArchiveEntry();
         os.close();
     }
-    
+
     public void testTarArchiveLongNameCreation() throws Exception {
-    	String name = "testdata/12345678901234567890123456789012345678901234567890123456789012345678901234567890123456.xml";
-    	byte[] bytes = name.getBytes();
-    	assertEquals(bytes.length, 99);
-    	
-		final File output = new File(dir, "bla.tar");
-		final File file1 = getFile("test1.xml");
-    	final OutputStream out = new FileOutputStream(output);
+        String name = "testdata/12345678901234567890123456789012345678901234567890123456789012345678901234567890123456.xml";
+        byte[] bytes = name.getBytes();
+        assertEquals(bytes.length, 99);
+
+        final File output = new File(dir, "bla.tar");
+        final File file1 = getFile("test1.xml");
+        final OutputStream out = new FileOutputStream(output);
         final ArchiveOutputStream os = new ArchiveStreamFactory().createArchiveOutputStream("tar",
out);
         final TarArchiveEntry entry = new TarArchiveEntry(name);
         entry.setModTime(0);
@@ -75,37 +75,37 @@
         os.close();
         out.close();
         in.close();
-        
-        
+
+
         ArchiveOutputStream os2 = null;
         try {
-        	String toLongName = "testdata/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567.xml";
-        	final File output2 = new File(dir, "bla.tar");
-        	final OutputStream out2 = new FileOutputStream(output2);
-        	os2 = new ArchiveStreamFactory().createArchiveOutputStream("tar", out2);
-        	final TarArchiveEntry entry2 = new TarArchiveEntry(toLongName);
-        	entry2.setModTime(0);
-        	entry2.setSize(file1.length());
-        	entry2.setUserId(0);
-        	entry2.setGroupId(0);
-        	entry2.setUserName("avalon");
-        	entry2.setGroupName("excalibur");
-        	entry2.setMode(0100000);
-        	os2.putArchiveEntry(entry);
-        	IOUtils.copy(new FileInputStream(file1), os2);
+            String toLongName = "testdata/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567.xml";
+            final File output2 = new File(dir, "bla.tar");
+            final OutputStream out2 = new FileOutputStream(output2);
+            os2 = new ArchiveStreamFactory().createArchiveOutputStream("tar", out2);
+            final TarArchiveEntry entry2 = new TarArchiveEntry(toLongName);
+            entry2.setModTime(0);
+            entry2.setSize(file1.length());
+            entry2.setUserId(0);
+            entry2.setGroupId(0);
+            entry2.setUserName("avalon");
+            entry2.setGroupName("excalibur");
+            entry2.setMode(0100000);
+            os2.putArchiveEntry(entry);
+            IOUtils.copy(new FileInputStream(file1), os2);
             os2.closeArchiveEntry();
         } catch(IOException e) {
-        	assertTrue(true);
+            assertTrue(true);
         } finally {
-        	if (os2 != null){
-        	    os2.close();
-        	}
+            if (os2 != null){
+                os2.close();
+            }
         }
     }
-    
+
     public void testTarUnarchive() throws Exception {
-		final File input = getFile("bla.tar");
-		final InputStream is = new FileInputStream(input);
+        final File input = getFile("bla.tar");
+        final InputStream is = new FileInputStream(input);
         final ArchiveInputStream in = new ArchiveStreamFactory().createArchiveInputStream("tar",
is);
         final TarArchiveEntry entry = (TarArchiveEntry)in.getNextEntry();
         final OutputStream out = new FileOutputStream(new File(dir, entry.getName()));

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveInputStream.java
Tue Mar  2 23:27:18 2010
@@ -25,36 +25,36 @@
 
 public final class MemoryArchiveInputStream extends ArchiveInputStream {
 
-	private final String[] filenames;
-	private final String[] content;
-	private int p;
-	
-	public MemoryArchiveInputStream( final String[][] pFiles ) {
-		filenames = new String[pFiles.length];
-		content = new String[pFiles.length];
-		
-		for (int i = 0; i < pFiles.length; i++) {
-			String[] nameAndContent = pFiles[i];
-			filenames[i] = nameAndContent[0];
-			content[i] = nameAndContent[1];
-		}
-		p = 0;
-	}
-	
-	public ArchiveEntry getNextEntry() throws IOException {
-		if (p >= filenames.length) {
-			return null;
-		}
-
-		return new MemoryArchiveEntry(filenames[p]);
-	}
-
-	public String readString() {
-		return content[p++];
-	}
-	
-	public int read() throws IOException {
-		return 0;
-	}
+    private final String[] filenames;
+    private final String[] content;
+    private int p;
+
+    public MemoryArchiveInputStream( final String[][] pFiles ) {
+        filenames = new String[pFiles.length];
+        content = new String[pFiles.length];
+
+        for (int i = 0; i < pFiles.length; i++) {
+            String[] nameAndContent = pFiles[i];
+            filenames[i] = nameAndContent[0];
+            content[i] = nameAndContent[1];
+        }
+        p = 0;
+    }
+
+    public ArchiveEntry getNextEntry() throws IOException {
+        if (p >= filenames.length) {
+            return null;
+        }
+
+        return new MemoryArchiveEntry(filenames[p]);
+    }
+
+    public String readString() {
+        return content[p++];
+    }
+
+    public int read() throws IOException {
+        return 0;
+    }
 
 }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java
Tue Mar  2 23:27:18 2010
@@ -26,28 +26,28 @@
 
 public final class MemoryArchiveTestCase extends TestCase {
 
-	public void testReading() throws IOException {
-		
-		final MemoryArchiveInputStream is = new MemoryArchiveInputStream(new String[][] {
-				{ "test1",     "content1" },
-				{ "test2",     "content2" },
-				});
-
-		final ArchiveEntry entry1 = is.getNextEntry();
-		assertNotNull(entry1);
-		assertEquals("test1", entry1.getName());
-		final String content1 = is.readString();
-		assertEquals("content1", content1);
-		
-		final ArchiveEntry entry2 = is.getNextEntry();
-		assertNotNull(entry2);
-		assertEquals("test2", entry2.getName());
-		final String content2 = is.readString();
-		assertEquals("content2", content2);
-		
-		final ArchiveEntry entry3 = is.getNextEntry();
-		assertNull(entry3);
-		
-	}
+    public void testReading() throws IOException {
+
+        final MemoryArchiveInputStream is = new MemoryArchiveInputStream(new String[][] {
+                { "test1",     "content1" },
+                { "test2",     "content2" },
+                });
+
+        final ArchiveEntry entry1 = is.getNextEntry();
+        assertNotNull(entry1);
+        assertEquals("test1", entry1.getName());
+        final String content1 = is.readString();
+        assertEquals("content1", content1);
+
+        final ArchiveEntry entry2 = is.getNextEntry();
+        assertNotNull(entry2);
+        assertEquals("test2", entry2.getName());
+        final String content2 = is.readString();
+        assertEquals("content2", content2);
+
+        final ArchiveEntry entry3 = is.getNextEntry();
+        assertNull(entry3);
+
+    }
 
 }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java
Tue Mar  2 23:27:18 2010
@@ -30,7 +30,7 @@
 
     public void testReadPasswordEncryptedEntryViaZipFile()
         throws IOException, URISyntaxException {
-	URL zip = getClass().getResource("/password-encrypted.zip");
+        URL zip = getClass().getResource("/password-encrypted.zip");
         File file = new File(new URI(zip.toString()));
         ZipFile zf = null;
         try {
@@ -52,7 +52,7 @@
 
     public void testReadPasswordEncryptedEntryViaStream()
         throws IOException, URISyntaxException {
-	URL zip = getClass().getResource("/password-encrypted.zip");
+        URL zip = getClass().getResource("/password-encrypted.zip");
         File file = new File(new URI(zip.toString()));
         ZipArchiveInputStream zin = null;
         try {

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
Tue Mar  2 23:27:18 2010
@@ -24,17 +24,17 @@
 import junit.framework.TestCase;
 
 public class ZipUtilTest extends TestCase {
-    
+
     private Date time;
     private ZipLong zl;
-    
+
     /**
      * Constructor
-     */	
+     */
     public ZipUtilTest(String name) {
         super(name);
     }
-	
+
     protected void setUp() throws Exception {
         time = new Date();
         Calendar cal = Calendar.getInstance();
@@ -43,7 +43,7 @@
         int month = cal.get(Calendar.MONTH) + 1;
         long value =  ((year - 1980) << 25)
             |         (month << 21)
-            |	      (cal.get(Calendar.DAY_OF_MONTH) << 16)
+            |         (cal.get(Calendar.DAY_OF_MONTH) << 16)
             |         (cal.get(Calendar.HOUR_OF_DAY) << 11)
             |         (cal.get(Calendar.MINUTE) << 5)
             |         (cal.get(Calendar.SECOND) >> 1);
@@ -59,7 +59,7 @@
     protected void tearDown() throws Exception {
         super.tearDown();
     }
-    
+
     public void testZipLong() throws Exception {
         ZipLong test = ZipUtil.toDosTime(time);
         assertEquals(test.getValue(), zl.getValue());

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
(original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
Tue Mar  2 23:27:18 2010
@@ -29,43 +29,43 @@
 
 public final class BZip2TestCase extends AbstractTestCase {
 
-	public void testBzipCreation()  throws Exception {
-	    File output = null;
-	    final File input = getFile("test.txt");
-	    {
-    		output = new File(dir, "test.txt.bz2");
-    		final OutputStream out = new FileOutputStream(output);
-    		final CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("bzip2",
out);
-    		FileInputStream in = new FileInputStream(input);
-    		IOUtils.copy(in, cos);
-    		cos.close();
-    		in.close();
-		}
-		
-	    final File decompressed = new File(dir, "decompressed.txt");
-		{
-		    final File toDecompress = output;
-	        final InputStream is = new FileInputStream(toDecompress);
-	        final CompressorInputStream in = 
-	            new CompressorStreamFactory().createCompressorInputStream("bzip2", is);
-	        FileOutputStream os = new FileOutputStream(decompressed);
-	        IOUtils.copy(in, os);
-	        is.close();
-	        os.close();
-		}
-		
-		assertEquals(input.length(),decompressed.length());
-	}
-	
-	public void testBzip2Unarchive() throws Exception {
-		final File input = getFile("bla.txt.bz2");
-		final File output = new File(dir, "bla.txt");
+    public void testBzipCreation()  throws Exception {
+        File output = null;
+        final File input = getFile("test.txt");
+        {
+            output = new File(dir, "test.txt.bz2");
+            final OutputStream out = new FileOutputStream(output);
+            final CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("bzip2",
out);
+            FileInputStream in = new FileInputStream(input);
+            IOUtils.copy(in, cos);
+            cos.close();
+            in.close();
+        }
+
+        final File decompressed = new File(dir, "decompressed.txt");
+        {
+            final File toDecompress = output;
+            final InputStream is = new FileInputStream(toDecompress);
+            final CompressorInputStream in =
+                new CompressorStreamFactory().createCompressorInputStream("bzip2", is);
+            FileOutputStream os = new FileOutputStream(decompressed);
+            IOUtils.copy(in, os);
+            is.close();
+            os.close();
+        }
+
+        assertEquals(input.length(),decompressed.length());
+    }
+
+    public void testBzip2Unarchive() throws Exception {
+        final File input = getFile("bla.txt.bz2");
+        final File output = new File(dir, "bla.txt");
         final InputStream is = new FileInputStream(input);
         final CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("bzip2",
is);
         FileOutputStream os = new FileOutputStream(output);
         IOUtils.copy(in, os);
-		is.close();
-		os.close();
+        is.close();
+        os.close();
     }
 
 }

Modified: commons/proper/compress/trunk/src/test/resources/test2.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/resources/test2.xml?rev=918256&r1=918255&r2=918256&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/resources/test2.xml (original)
+++ commons/proper/compress/trunk/src/test/resources/test2.xml Tue Mar  2 23:27:18 2010
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
 <!DOCTYPE connections>
 <meinxml>
-	<leer />
+    <leer />
 </meinxml>



Mime
View raw message