commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1307789 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/ main/java/org/apache/commons/compress/archivers/cpio/ main/java/org/apache/commons/compress/archivers/dump/ main/java/org/apache/commons/comp...
Date Sat, 31 Mar 2012 12:30:10 GMT
Author: sebb
Date: Sat Mar 31 12:30:09 2012
New Revision: 1307789

URL: http://svn.apache.org/viewvc?rev=1307789&view=rev
Log:
Trailing spaces

Modified:
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.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/Lister.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioConstants.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveConstants.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectCompressorTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/IOMethodsTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.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/LongPathTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java Sat Mar 31 12:30:09 2012
@@ -41,7 +41,7 @@ public abstract class ArchiveInputStream
 
     private byte[] SINGLE = new byte[1];
     private static final int BYTE_MASK = 0xFF;
-    
+
     /** holds the number of bytes read in this stream */
     private long bytesRead = 0;
 
@@ -81,7 +81,7 @@ public abstract class ArchiveInputStream
         int num = read(SINGLE, 0, 1);
         return num == -1 ? -1 : SINGLE[0] & BYTE_MASK;
     }
-    
+
     /**
      * Increments the counter of already read bytes.
      * Doesn't increment if the EOF has been hit (read == -1)
@@ -104,7 +104,7 @@ public abstract class ArchiveInputStream
             bytesRead = bytesRead + read;
         }
     }
-    
+
     /**
      * Decrements the counter of already read bytes.
      * 
@@ -114,7 +114,7 @@ public abstract class ArchiveInputStream
     protected void pushedBackBytes(long pushedBack) {
         bytesRead -= pushedBack;
     }
-    
+
     /**
      * Returns the current number of bytes read from this stream.
      * @return the number of read bytes

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java Sat Mar 31 12:30:09 2012
@@ -47,7 +47,7 @@ import java.io.OutputStream;
  * </p>
  */
 public abstract class ArchiveOutputStream extends OutputStream {
-    
+
     /** Temporary buffer used for the {@link #write(int)} method */
     private final byte[] oneByte = new byte[1];
     static final int BYTE_MASK = 0xFF;
@@ -55,7 +55,7 @@ public abstract class ArchiveOutputStrea
     /** holds the number of bytes written to this stream */
     private long bytesWritten = 0;
     // Methods specific to ArchiveOutputStream
-    
+
     /**
      * Writes the headers for an archive entry to the output stream.
      * The caller must then write the content to the stream and call
@@ -72,7 +72,7 @@ public abstract class ArchiveOutputStrea
      * @throws IOException
      */
     public abstract void closeArchiveEntry() throws IOException;
-    
+
     /**
      * Finishes the addition of entries to this stream, without closing it.
      * Additional data can be written, if the format supports it.
@@ -93,9 +93,9 @@ public abstract class ArchiveOutputStrea
      * @throws IOException
      */
     public abstract ArchiveEntry createArchiveEntry(File inputFile, String entryName) throws IOException;
-    
+
     // Generic implementations of OutputStream methods that may be useful to sub-classes
-    
+
     /**
      * Writes a byte to the current archive entry.
      *
@@ -135,7 +135,7 @@ public abstract class ArchiveOutputStrea
             bytesWritten = bytesWritten + written;
         }
     }
-    
+
     /**
      * Returns the current number of bytes written to this stream.
      * @return the number of written bytes

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=1307789&r1=1307788&r2=1307789&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 Sat Mar 31 12:30:09 2012
@@ -116,11 +116,11 @@ public class ArchiveStreamFactory {
     public ArchiveInputStream createArchiveInputStream(
             final String archiverName, final InputStream in)
             throws ArchiveException {
-        
+
         if (archiverName == null) {
             throw new IllegalArgumentException("Archivername must not be null.");
         }
-        
+
         if (in == null) {
             throw new IllegalArgumentException("InputStream must not be null.");
         }
@@ -143,7 +143,7 @@ public class ArchiveStreamFactory {
         if (DUMP.equalsIgnoreCase(archiverName)) {
             return new DumpArchiveInputStream(in);
         }
-        
+
         throw new ArchiveException("Archiver: " + archiverName + " not found.");
     }
 

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/Lister.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/Lister.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/Lister.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/Lister.java Sat Mar 31 12:30:09 2012
@@ -33,7 +33,7 @@ import java.io.InputStream;
  */
 public final class Lister {
     private static final ArchiveStreamFactory factory = new ArchiveStreamFactory();
-    
+
     public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             usage();
@@ -62,7 +62,6 @@ public final class Lister {
 
     private static void usage() {
         System.out.println("Parameters: archive-name [archive-type]");
-        
     }
 
 }
\ No newline at end of file

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java Sat Mar 31 12:30:09 2012
@@ -363,7 +363,7 @@ public class CpioArchiveInputStream exte
         ret.setInode(readBinaryLong(2, swapHalfWord));
         final long mode = readBinaryLong(2, swapHalfWord);
         if (mode != 0){
-            ret.setMode(mode);            
+            ret.setMode(mode);
         }
         ret.setUID(readBinaryLong(2, swapHalfWord));
         ret.setGID(readBinaryLong(2, swapHalfWord));
@@ -433,7 +433,7 @@ public class CpioArchiveInputStream exte
      * Checks if the signature matches one of the following magic values:
      * 
      * Strings:
-     *  
+     *
      * "070701" - MAGIC_NEW
      * "070702" - MAGIC_NEW_CRC
      * "070707" - MAGIC_OLD_ASCII
@@ -446,7 +446,7 @@ public class CpioArchiveInputStream exte
         if (length < 6) {
             return false;
         }
-        
+
         // Check binary values
         if (signature[0] == 0x71 && (signature[1] & 0xFF) == 0xc7) {
             return true;

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java Sat Mar 31 12:30:09 2012
@@ -108,7 +108,7 @@ public class CpioArchiveOutputStream ext
      *            The format of the stream
      * @param blockSize
      *            The block size of the archive.
-     *            
+     * 
      * @since Apache Commons Compress 1.1
      */
     public CpioArchiveOutputStream(final OutputStream out, final short format,

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioConstants.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioConstants.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioConstants.java Sat Mar 31 12:30:09 2012
@@ -38,7 +38,7 @@ public interface CpioConstants {
     final int MAGIC_OLD_BINARY = 070707;
 
     // These FORMAT_ constants are internal to the code
-    
+
     /** write/read a CPIOArchiveEntry in the new format */
     final short FORMAT_NEW = 1;
 
@@ -60,7 +60,7 @@ public interface CpioConstants {
     /*
      * Constants for the MODE bits
      */
-    
+
     /** Mask for all file type bits. */
     final int S_IFMT   = 0170000;
 
@@ -130,7 +130,6 @@ public interface CpioConstants {
 
     /** Permits others to execute the file or to search the directory */
     final int C_IXOTH  = 0000001;
-    
 
     /** The special trailer marker */
     final String CPIO_TRAILER = "TRAILER!!!";

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioUtil.java Sat Mar 31 12:30:09 2012
@@ -68,7 +68,7 @@ class CpioUtil {
      * 
      * @param number 
      *            the input long number to be converted
-     *            
+     * 
      * @param length
      *            The length of the returned array
      * @param swapHalfWord

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveConstants.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveConstants.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveConstants.java Sat Mar 31 12:30:09 2012
@@ -46,7 +46,7 @@ public final class DumpArchiveConstants 
         ADDR(4),
         END(5),
         CLRI(6);
-   
+
         int code;
 
         private SEGMENT_TYPE(int code) {

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java Sat Mar 31 12:30:09 2012
@@ -768,7 +768,7 @@ public class DumpArchiveEntry implements
             return type;
         }
     }
-    
+
     public enum PERMISSION {
         SETUID(04000),
         SETGUI(02000),

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java Sat Mar 31 12:30:09 2012
@@ -72,10 +72,10 @@ public class TarArchiveOutputStream exte
 
     /** Indicates if putArchiveEntry has been called without closeArchiveEntry */
     private boolean haveUnclosedEntry = false;
-    
+
     /** indicates if this archive is finished */
     private boolean finished = false;
-    
+
     private final OutputStream out;
 
     private final ZipEncoding encoding;
@@ -208,7 +208,7 @@ public class TarArchiveOutputStream exte
         if (finished) {
             throw new IOException("This archive has already been finished");
         }
-        
+
         if(haveUnclosedEntry) {
             throw new IOException("This archives contains unclosed entries.");
         }
@@ -227,7 +227,7 @@ public class TarArchiveOutputStream exte
         if(!finished) {
             finish();
         }
-        
+
         if (!closed) {
             buffer.close();
             out.close();

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java Sat Mar 31 12:30:09 2012
@@ -54,7 +54,7 @@ class TarBuffer { // Not public, because
 
     private int             currBlkIdx;
     private int             currRecIdx;
-    
+
     /**
      * Constructor for a TarBuffer on an input stream.
      * @param inStream the input stream to use
@@ -114,7 +114,7 @@ class TarBuffer { // Not public, because
      */
     private TarBuffer(InputStream inStream, OutputStream outStream, int blockSize, int recordSize) {
         this.inStream = inStream;
-        this.outStream = outStream;        
+        this.outStream = outStream;
         this.blockSize = blockSize;
         this.recordSize = recordSize;
         this.recsPerBlock = (this.blockSize / this.recordSize);

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarConstants.java Sat Mar 31 12:30:09 2012
@@ -252,14 +252,14 @@ public interface TarConstants {
      * @since Apache Commons Compress 1.1
      */
     byte LF_PAX_EXTENDED_HEADER_UC = (byte) 'X';
-    
+
     /**
      * Identifies the entry as a Pax global extended header.
      *
      * @since Apache Commons Compress 1.1
      */
     byte LF_PAX_GLOBAL_EXTENDED_HEADER = (byte) 'g';
-    
+
     /**
      * The magic tag representing a POSIX tar archive.
      */
@@ -280,7 +280,7 @@ public interface TarConstants {
      * @since Apache Commons Compress 1.1
      */
     String MAGIC_ANT = "ustar\0";
-    
+
     /**
      * The "version" representing an Ant tar archive.
      *

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java Sat Mar 31 12:30:09 2012
@@ -72,7 +72,7 @@ public class TarUtils {
         };
 
     /** Private constructor to prevent instantiation of this utility class. */
-    private TarUtils(){    
+    private TarUtils(){
     }
 
     /**
@@ -437,7 +437,7 @@ public class TarUtils {
     public static int formatLongOctalBytes(final long value, byte[] buf, final int offset, final int length) {
 
         int idx=length-1; // For space
-        
+
         formatUnsignedOctalString(value, buf, offset, idx);
         buf[offset + idx] = (byte) ' '; // Trailing space
 

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnsupportedZipFeatureException.java Sat Mar 31 12:30:09 2012
@@ -75,7 +75,7 @@ public class UnsupportedZipFeatureExcept
          * The entry uses a data descriptor.
          */
         public static final Feature DATA_DESCRIPTOR = new Feature("data descriptor");
-        
+
         private final String name;
 
         private Feature(String name) {

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSet.java Sat Mar 31 12:30:09 2012
@@ -55,7 +55,7 @@ public final class ChangeSet {
     public void deleteDir(final String dirName) {
         addDeletion(new Change(dirName, Change.TYPE_DELETE_DIR));
     }
-    
+
     /**
      * Adds a new archive entry to the archive.
      * 
@@ -67,7 +67,7 @@ public final class ChangeSet {
     public void add(final ArchiveEntry pEntry, final InputStream pInput) {
         this.add(pEntry, pInput, true);
     }
-    
+
     /**
      * Adds a new archive entry to the archive.
      * If replace is set to true, this change will replace all other additions
@@ -78,7 +78,7 @@ public final class ChangeSet {
      * @param pInput
      *            the datastream to add
      * @param replace
-     *            indicates the this change should replace existing entries            
+     *            indicates the this change should replace existing entries
      */
     public void add(final ArchiveEntry pEntry, final InputStream pInput, final boolean replace) {
         addAddition(new Change(pEntry, pInput, replace));
@@ -91,7 +91,7 @@ public final class ChangeSet {
      *            the change which should result in an addition
      */
     private void addAddition(Change pChange) {
-        if (Change.TYPE_ADD != pChange.type() ||    
+        if (Change.TYPE_ADD != pChange.type() ||
             pChange.getInput() == null) {
             return;
         }
@@ -118,7 +118,7 @@ public final class ChangeSet {
         }
         changes.add(pChange);
     }
-    
+
     /**
      * Adds an delete change.
      * 
@@ -127,7 +127,7 @@ public final class ChangeSet {
      */
     private void addDeletion(Change pChange) {
         if ((Change.TYPE_DELETE != pChange.type() &&
-            Change.TYPE_DELETE_DIR != pChange.type()) ||    
+            Change.TYPE_DELETE_DIR != pChange.type()) ||
             pChange.targetFile() == null) {
             return;
         }

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetPerformer.java Sat Mar 31 12:30:09 2012
@@ -40,7 +40,7 @@ import org.apache.commons.compress.utils
  */
 public class ChangeSetPerformer {
     private final Set<Change> changes;
-    
+
     /**
      * Constructs a ChangeSetPerformer with the changes from this ChangeSet
      * @param changeSet the ChangeSet which operations are used for performing
@@ -48,7 +48,7 @@ public class ChangeSetPerformer {
     public ChangeSetPerformer(final ChangeSet changeSet) {
         changes = changeSet.getChanges();
     }
-    
+
     /**
      * Performs all changes collected in this ChangeSet on the input stream and
      * streams the result to the output stream. Perform may be called more than once.
@@ -67,9 +67,9 @@ public class ChangeSetPerformer {
     public ChangeSetResults perform(ArchiveInputStream in, ArchiveOutputStream out)
             throws IOException {
         ChangeSetResults results = new ChangeSetResults();
-        
+
         Set<Change> workingSet = new LinkedHashSet<Change>(changes);
-        
+
         for (Iterator<Change> it = workingSet.iterator(); it.hasNext();) {
             Change change = it.next();
 
@@ -113,7 +113,7 @@ public class ChangeSetPerformer {
                 results.addedFromStream(entry.getName());
             }
         }
-        
+
         // Adds files which hasn't been added from the original and do not have replace mode on
         for (Iterator<Change> it = workingSet.iterator(); it.hasNext();) {
             Change change = it.next();

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/changes/ChangeSetResults.java Sat Mar 31 12:30:09 2012
@@ -28,7 +28,7 @@ public class ChangeSetResults {
     private final List<String> addedFromChangeSet = new ArrayList<String>();
     private final List<String> addedFromStream = new ArrayList<String>();
     private final List<String> deleted = new ArrayList<String>();
-    
+
     /**
      * Adds the filename of a recently deleted file to the result list.
      * @param fileName the file which has been deleted
@@ -36,7 +36,7 @@ public class ChangeSetResults {
     void deleted(String fileName) {
         deleted.add(fileName);
     }
-    
+
     /**
      * Adds the name of a file to the result list which has been 
      * copied from the source stream to the target stream.
@@ -45,7 +45,7 @@ public class ChangeSetResults {
     void addedFromStream(String fileName) {
         addedFromStream.add(fileName);
     }
-    
+
     /**
      * Adds the name of a file to the result list which has been
      * copied from the changeset to the target stream
@@ -78,7 +78,7 @@ public class ChangeSetResults {
     public List<String> getDeleted() {
         return deleted;
     }
-    
+
     /**
      * Checks if an filename already has been added to the result list
      * @param filename the filename to check

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java Sat Mar 31 12:30:09 2012
@@ -22,7 +22,7 @@ import java.io.InputStream;
 
 public abstract class CompressorInputStream extends InputStream {
     private long bytesRead = 0;
-    
+
     /**
      * Increments the counter of already read bytes.
      * Doesn't increment if the EOF has been hit (read == -1)
@@ -34,7 +34,7 @@ public abstract class CompressorInputStr
     protected void count(int read) {
         count((long) read);
     }
-    
+
     /**
      * Increments the counter of already read bytes.
      * Doesn't increment if the EOF has been hit (read == -1)

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/FileNameUtil.java Sat Mar 31 12:30:09 2012
@@ -35,7 +35,7 @@ public class FileNameUtil {
      * versions of those file types. For example: from ".tar" to ".tgz".
      */
     private final Map<String, String> compressSuffix =
-        new HashMap<String, String>();        
+        new HashMap<String, String>();
 
     /**
      * Map from common filename suffixes of compressed files to the

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java Sat Mar 31 12:30:09 2012
@@ -1035,7 +1035,7 @@ public class BZip2CompressorInputStream 
         if (length < 3) {
             return false;
         }
-        
+
         if (signature[0] != 'B') {
             return false;
         }
@@ -1047,7 +1047,7 @@ public class BZip2CompressorInputStream 
         if (signature[2] != 'h') {
             return false;
         }
-        
+
         return true;
     }
 }

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/ArchiveUtils.java Sat Mar 31 12:30:09 2012
@@ -26,9 +26,9 @@ import org.apache.commons.compress.archi
  * Generic Archive utilities
  */
 public class ArchiveUtils {
-    
+
     /** Private constructor to prevent instantiation of this utility class. */
-    private ArchiveUtils(){    
+    private ArchiveUtils(){
     }
 
     /**
@@ -73,7 +73,7 @@ public class ArchiveUtils {
         }
         return isEqual(buffer1, 0, buffer1.length, buffer, offset, length, false);
     }
-    
+
     /**
      * Check if buffer contents matches Ascii String.
      * 
@@ -84,7 +84,7 @@ public class ArchiveUtils {
     public static boolean matchAsciiBuffer(String expected, byte[] buffer){
         return matchAsciiBuffer(expected, buffer, 0, buffer.length);
     }
-    
+
     /**
      * Convert a string to Ascii bytes.
      * Used for comparing "magic" strings which need to be independent of the default Locale.
@@ -167,13 +167,13 @@ public class ArchiveUtils {
                     if (buffer2[offset2+i] != 0){
                         return false;
                     }
-                }                
+                }
             }
             return true;
         }
         return false;
     }
-    
+
     /**
      * Compare byte buffers
      * 
@@ -190,7 +190,7 @@ public class ArchiveUtils {
             final byte[] buffer2, final int offset2, final int length2){
         return isEqual(buffer1, offset1, length1, buffer2, offset2, length2, false);
     }
-    
+
     /**
      * Compare byte buffers
      * 
@@ -201,7 +201,7 @@ public class ArchiveUtils {
     public static boolean isEqual(final byte[] buffer1, final byte[] buffer2 ){
         return isEqual(buffer1, 0, buffer1.length, buffer2, 0, buffer2.length, false);
     }
-    
+
     /**
      * Compare byte buffers, optionally ignoring trailing nulls
      * 
@@ -213,7 +213,7 @@ public class ArchiveUtils {
     public static boolean isEqual(final byte[] buffer1, final byte[] buffer2, boolean ignoreTrailingNulls){
         return isEqual(buffer1, 0, buffer1.length, buffer2, 0, buffer2.length, ignoreTrailingNulls);
     }
-    
+
     /**
      * Compare byte buffers, ignoring trailing nulls
      * 
@@ -230,5 +230,5 @@ public class ArchiveUtils {
             final byte[] buffer2, final int offset2, final int length2){
         return isEqual(buffer1, offset1, length1, buffer2, offset2, length2, true);
     }
-    
+
 }

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingInputStream.java Sat Mar 31 12:30:09 2012
@@ -65,7 +65,7 @@ public class CountingInputStream extends
             bytesRead += read;
         }
     }
-    
+
     /**
      * Returns the current number of bytes read from this stream.
      * @return the number of read bytes

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/utils/CountingOutputStream.java Sat Mar 31 12:30:09 2012
@@ -60,7 +60,7 @@ public class CountingOutputStream extend
             bytesWritten += written;
         }
     }
-    
+
     /**
      * Returns the current number of bytes written to this stream.
      * @return the number of written bytes

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java Sat Mar 31 12:30:09 2012
@@ -46,7 +46,7 @@ public abstract class AbstractTestCase e
 
     private File archive; // used to delete the archive in tearDown
     protected List<String> archiveList; // Lists the content of the archive as originally created
-    
+
     protected ArchiveStreamFactory factory = new ArchiveStreamFactory();
 
     public AbstractTestCase() {
@@ -300,7 +300,7 @@ public abstract class AbstractTestCase e
             throws Exception {
         checkArchiveContent(in, expected, true);
     }
-    
+
     /**
      * Checks that an archive input stream can be read, and that the file data matches file sizes.
      * 
@@ -330,7 +330,7 @@ public abstract class AbstractTestCase e
                         copied=IOUtils.copy(in, out);
                     } finally {
                         out.close();
-                    }                    
+                    }
                 }
                 final long size = entry.getSize();
                 if (size != ArchiveEntry.SIZE_UNKNOWN) {
@@ -389,6 +389,6 @@ public abstract class AbstractTestCase e
             return new File[] {tmpDir, tmpFile};
         } finally {
             fos.close();
-        }            
+        }
     }
 }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveReadTests.java Sat Mar 31 12:30:09 2012
@@ -42,21 +42,21 @@ import org.apache.commons.compress.archi
  * as JUnit does not allow one to change the display name of a test.
  */
 public class ArchiveReadTests extends AbstractTestCase {
-    
+
     final static ClassLoader classLoader = ArchiveReadTests.class.getClassLoader();
 
     private File file;
     private static final ArrayList<String> fileList = new ArrayList<String>();
-    
+
     public ArchiveReadTests(String name) {
         super(name);
     }
-    
+
     private ArchiveReadTests(String name, File file){
         super(name);
         this.file = file;
     }
-    
+
     public static TestSuite suite() throws IOException{
         TestSuite suite = new TestSuite("ArchiveReadTests");
         File arcdir =new File(classLoader.getResource("archives").getFile());
@@ -83,10 +83,10 @@ public class ArchiveReadTests extends Ab
             Test test = new ArchiveReadTests("testArchive", file);
             namedSuite.addTest(test);
             suite.addTest(namedSuite);
-        }        
+        }
         return suite;
     }
-    
+
     // files.txt contains size and filename
     @Override
     protected String getExpectedString(ArchiveEntry entry) {

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java Sat Mar 31 12:30:09 2012
@@ -44,16 +44,16 @@ public class ArchiveUtilsTest extends Ab
         assertTrue(ArchiveUtils.isEqual(buffer1, buffer3));
         assertTrue(ArchiveUtils.isEqual(buffer3, buffer1));
     }
-    
+
     public void testCompareAscii(){
         byte[] buffer1 = {'a','b','c'};
         byte[] buffer2 = {'d','e','f',0};
         assertTrue(ArchiveUtils.matchAsciiBuffer("abc", buffer1));
         assertFalse(ArchiveUtils.matchAsciiBuffer("abc\0", buffer1));
-        assertTrue(ArchiveUtils.matchAsciiBuffer("def\0", buffer2));        
+        assertTrue(ArchiveUtils.matchAsciiBuffer("def\0", buffer2));
         assertFalse(ArchiveUtils.matchAsciiBuffer("def", buffer2));
     }
-    
+
     public void testAsciiConversions() {
         asciiToByteAndBackOK("");
         asciiToByteAndBackOK("abcd");

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java Sat Mar 31 12:30:09 2012
@@ -75,7 +75,7 @@ public final class DetectArchiverTestCas
         assertNotNull(cpio);
         assertTrue(cpio instanceof CpioArchiveInputStream);
 
-// Not yet implemented        
+// Not yet implemented
 //        final ArchiveInputStream tgz = getStreamFor("bla.tgz");
 //        assertNotNull(tgz);
 //        assertTrue(tgz instanceof TarArchiveInputStream);
@@ -90,9 +90,9 @@ public final class DetectArchiverTestCas
                    new BufferedInputStream(new FileInputStream(
                        new File(rsc.getFile()))));
     }
-    
+
     // Check that the empty archives created by the code are readable
-    
+
     // Not possible to detect empty "ar" archive as it is completely empty
 //    public void testEmptyArArchive() throws Exception {
 //        emptyArchive("ar");

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectCompressorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectCompressorTestCase.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectCompressorTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/DetectCompressorTestCase.java Sat Mar 31 12:30:09 2012
@@ -62,5 +62,5 @@ public final class DetectCompressorTestC
                    new BufferedInputStream(new FileInputStream(
                        new File(rsc.getFile()))));
     }
-    
+
 }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/IOMethodsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/IOMethodsTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/IOMethodsTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/IOMethodsTest.java Sat Mar 31 12:30:09 2012
@@ -48,7 +48,7 @@ public class IOMethodsTest extends Abstr
             i += 2;
         }
     }
-    
+
     public void testWriteAr() throws Exception {
         ArchiveEntry entry = new ArArchiveEntry("dummy", bytesToTest);
         compareWrites("ar", entry);
@@ -102,7 +102,7 @@ public class IOMethodsTest extends Abstr
         ArchiveOutputStream aos3 = factory.createArchiveOutputStream(archiverName, out3);
         aos3.putArchiveEntry(entry);
         for (int i=0; i<byteTest.length; i++){
-            aos1.write(byteTest[i]);            
+            aos1.write(byteTest[i]);
         }
         aos1.closeArchiveEntry();
         aos1.close();
@@ -110,32 +110,32 @@ public class IOMethodsTest extends Abstr
         aos2.write(byteTest);
         aos2.closeArchiveEntry();
         aos2.close();
-        
+
         aos3.write(byteTest, 0, byteTest.length);
         aos3.closeArchiveEntry();
         aos3.close();
         assertEquals("out1!=out2",out1.toString(),out2.toString());
         assertEquals("out1!=out3",out1.toString(),out3.toString());
     }
-    
+
     private void compareReads(String archiverName) throws Exception {
         OutputStream out1 = new ByteArrayOutputStream();
         OutputStream out2 = new ByteArrayOutputStream();
         OutputStream out3 = new ByteArrayOutputStream();
         File file = createSingleEntryArchive(archiverName);
         file.deleteOnExit();
-        
+
         InputStream is1 = new FileInputStream(file);
         ArchiveInputStream ais1 = factory.createArchiveInputStream(archiverName, is1);
         final ArchiveEntry nextEntry = ais1.getNextEntry();
         assertNotNull(nextEntry);
-        
+
         byte [] buff = new byte[10]; // small so multiple reads are needed;
         long size = nextEntry.getSize();
         if (size != ArchiveEntry.SIZE_UNKNOWN) {
             assertTrue("Size should be > 0, found: "+size, size > 0);
         }
-        
+
         InputStream is2 = new FileInputStream(file);
         ArchiveInputStream ais2 = factory.createArchiveInputStream(archiverName, is2);
         final ArchiveEntry nextEntry2 = ais2.getNextEntry();
@@ -159,7 +159,7 @@ public class IOMethodsTest extends Abstr
             out2.write(buff, 0, bytes);
         }
         ais2.close();
-        
+
         while((bytes=ais3.read(buff, 0 , buff.length)) > 0){
             out3.write(buff, 0, bytes);
         }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java Sat Mar 31 12:30:09 2012
@@ -47,7 +47,7 @@ public class ArchiveOutputStreamTest ext
 
     public void testFinish() throws Exception {
         OutputStream out1 = new ByteArrayOutputStream();
-        
+
         ArchiveOutputStream aos1 = factory.createArchiveOutputStream("zip", out1);
         aos1.putArchiveEntry(new ZipArchiveEntry("dummy"));
         try {
@@ -56,7 +56,7 @@ public class ArchiveOutputStreamTest ext
         } catch (IOException io) {
             // Exception expected
         }
-        
+
         aos1 = factory.createArchiveOutputStream("jar", out1);
         aos1.putArchiveEntry(new JarArchiveEntry("dummy"));
         try {
@@ -65,7 +65,7 @@ public class ArchiveOutputStreamTest ext
         } catch (IOException io) {
             // Exception expected
         }
-        
+
         aos1 = factory.createArchiveOutputStream("ar", out1);
         aos1.putArchiveEntry(new ArArchiveEntry("dummy", 100));
         try {
@@ -74,7 +74,7 @@ public class ArchiveOutputStreamTest ext
         } catch (IOException io) {
             // Exception expected
         }
-        
+
         aos1 = factory.createArchiveOutputStream("cpio", out1);
         aos1.putArchiveEntry(new CpioArchiveEntry("dummy"));
         try {
@@ -83,7 +83,7 @@ public class ArchiveOutputStreamTest ext
         } catch (IOException io) {
             // Exception expected
         }
-        
+
         aos1 = factory.createArchiveOutputStream("tar", out1);
         aos1.putArchiveEntry(new TarArchiveEntry("dummy"));
         try {
@@ -96,12 +96,12 @@ public class ArchiveOutputStreamTest ext
 
     public void testOptionalFinish() throws Exception {
         OutputStream out1 = new ByteArrayOutputStream();
-        
+
         ArchiveOutputStream aos1 = factory.createArchiveOutputStream("zip", out1);
         aos1.putArchiveEntry(new ZipArchiveEntry("dummy"));
         aos1.closeArchiveEntry();
         aos1.close();
-        
+
         aos1 = factory.createArchiveOutputStream("jar", out1);
         aos1.putArchiveEntry(new JarArchiveEntry("dummy"));
         aos1.closeArchiveEntry();
@@ -113,7 +113,7 @@ public class ArchiveOutputStreamTest ext
             // Exception expected
         }
     }
-    
+
     public void testCallSequenceAr() throws Exception{
         doCallSequence("Ar");
     }
@@ -137,7 +137,7 @@ public class ArchiveOutputStreamTest ext
     private void doCallSequence(String archiveType) throws Exception {
         OutputStream out1 = new ByteArrayOutputStream();
         File dummy = getFile("test1.xml"); // need a real file
-        
+
         ArchiveOutputStream aos1;
         aos1 = factory.createArchiveOutputStream(archiveType, out1);
         aos1.putArchiveEntry(aos1.createArchiveEntry(dummy, "dummy"));
@@ -148,7 +148,7 @@ public class ArchiveOutputStreamTest ext
         aos1.close(); // omitted finish
 
         // TODO - check if archives ensure that data has been written to the stream?
-        
+
         aos1 = factory.createArchiveOutputStream(archiveType, out1);
         try {
             aos1.closeArchiveEntry();
@@ -162,7 +162,7 @@ public class ArchiveOutputStreamTest ext
         is.close();
 
         // TODO check if second putArchiveEntry() can follow without closeAE?
-        
+
         try {
             aos1.finish();
             fail("Should have raised IOException - finish() called before closeArchiveEntry()");

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java Sat Mar 31 12:30:09 2012
@@ -61,7 +61,7 @@ public final class CpioTestCase extends 
         final File file2 = getFile("test2.xml");
         final long file1Length = file1.length();
         final long file2Length = file2.length();
-        
+
         {
             final OutputStream out = new FileOutputStream(output);
             final ArchiveOutputStream os = new ArchiveStreamFactory().createArchiveOutputStream("cpio", out);

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=1307789&r1=1307788&r2=1307789&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 Sat Mar 31 12:30:09 2012
@@ -24,9 +24,9 @@ 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.";
 
 

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java Sat Mar 31 12:30:09 2012
@@ -44,7 +44,7 @@ import org.apache.commons.compress.archi
  * as JUnit does not allow one to change the display name of a test.
  */
 public class LongPathTest extends AbstractTestCase {
-    
+
     private static final ClassLoader classLoader = LongPathTest.class.getClassLoader();
 
     private File file;
@@ -54,12 +54,12 @@ public class LongPathTest extends Abstra
     public LongPathTest(String name) {
         super(name);
     }
-    
+
     private LongPathTest(String name, File file){
         super(name);
         this.file = file;
     }
-    
+
     public static TestSuite suite() throws IOException{
         TestSuite suite = new TestSuite("LongPathTests");
         URL resource = classLoader.getResource("longpath");
@@ -88,10 +88,10 @@ public class LongPathTest extends Abstra
             Test test = new LongPathTest("testArchive", file);
             namedSuite.addTest(test);
             suite.addTest(namedSuite);
-        }        
+        }
         return suite;
     }
-    
+
     public void testArchive() throws Exception {
         @SuppressWarnings("unchecked") // fileList is of correct type
         ArrayList<String> expected = (ArrayList<String>) fileList.clone();
@@ -124,7 +124,7 @@ public class LongPathTest extends Abstra
                 if (!ent.endsWith("/")){// not a directory
                     final int lastSlash = ent.lastIndexOf('/');
                     if (lastSlash >= 0) { // extract path name
-                        expected.add(ent.substring(lastSlash+1, ent.length()));                        
+                        expected.add(ent.substring(lastSlash+1, ent.length()));
                     } else {
                         expected.add(ent);
                     }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java Sat Mar 31 12:30:09 2012
@@ -167,7 +167,7 @@ public final class ZipTestCase extends A
      */
     public void testListAllFilesWithNestedArchive() throws Exception {
         final File input = getFile("OSX_ArchiveWithNestedArchive.zip");
-       
+
         List<String> results = new ArrayList<String>();
 
         final InputStream is = new FileInputStream(input);
@@ -192,7 +192,7 @@ public final class ZipTestCase extends A
             }
         }
         is.close();
-        
+
         results.contains("NestedArchiv.zip");
         results.contains("test1.xml");
         results.contains("test2.xml");

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java Sat Mar 31 12:30:09 2012
@@ -29,12 +29,12 @@ public class CpioArchiveInputStreamTest 
         expected.append("./test1.xml<?xml version=\"1.0\"?>\n");
         expected.append("<empty/>./test2.xml<?xml version=\"1.0\"?>\n");
         expected.append("<empty/>\n");
-        
+
 
         CpioArchiveInputStream in = 
                 new CpioArchiveInputStream(new FileInputStream(getFile("bla.cpio")));
         CpioArchiveEntry entry= null;
-        
+
         StringBuffer result = new StringBuffer();
         while ((entry = (CpioArchiveEntry) in.getNextEntry()) != null) {
             result.append(entry.getName());
@@ -45,5 +45,5 @@ public class CpioArchiveInputStreamTest 
          }
          in.close();
          assertEquals(result.toString(), expected.toString());
-    }    
+    }
 }

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java Sat Mar 31 12:30:09 2012
@@ -98,7 +98,7 @@ public class TarArchiveEntryTest extends
             AbstractTestCase.tryHardToDelete(f);
         }
     }
-    
+
     public void testMaxFileSize(){
         TarArchiveEntry t = new TarArchiveEntry("");
         t.setSize(0);

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java Sat Mar 31 12:30:09 2012
@@ -78,7 +78,7 @@ public class TarArchiveInputStreamTest {
                 in.close();
             }
         }
-    }        
+    }
 
     @Test
     public void datePriorToEpochInGNUFormat() throws Exception {
@@ -107,6 +107,6 @@ public class TarArchiveInputStreamTest {
                 in.close();
             }
         }
-    }        
+    }
 
 }
\ No newline at end of file

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java Sat Mar 31 12:30:09 2012
@@ -24,7 +24,7 @@ import org.apache.commons.compress.archi
 
 public class TarUtilsTest extends TestCase {
 
-    
+
     public void testName(){
         byte [] buff = new byte[20];
         String sb1 = "abcdefghijklmnopqrstuvwxyz";
@@ -40,7 +40,7 @@ public class TarUtilsTest extends TestCa
         sb2 = TarUtils.parseName(buff, 1, buff.length-1);
         assertEquals(sb1, sb2);
     }
-    
+
     public void testParseOctal() throws Exception{
         long value; 
         byte [] buffer;
@@ -54,10 +54,10 @@ public class TarUtilsTest extends TestCa
         assertEquals(MAX_OCTAL, value);
         buffer=new byte[]{0,0};
         value = TarUtils.parseOctal(buffer,0, buffer.length);
-        assertEquals(0, value);        
+        assertEquals(0, value);
         buffer=new byte[]{0,' '};
         value = TarUtils.parseOctal(buffer,0, buffer.length);
-        assertEquals(0, value);        
+        assertEquals(0, value);
     }
 
     public void testParseOctalInvalid() throws Exception{
@@ -113,7 +113,7 @@ public class TarUtilsTest extends TestCa
         parseValue = TarUtils.parseOctal(buffer,0, buffer.length);
         assertEquals(value,parseValue);
     }
-    
+
     private void checkRoundTripOctal(final long value) {
         checkRoundTripOctal(value, TarConstants.SIZELEN);
     }
@@ -155,7 +155,7 @@ public class TarUtilsTest extends TestCa
         checkRoundTripOctalOrBinary(-1, length); // will need binary format
         checkRoundTripOctalOrBinary(0xff00000000000001l, length);
     }
-    
+
     // Check correct trailing bytes are generated
     public void testTrailers() {
         byte [] buffer = new byte[12];
@@ -171,7 +171,7 @@ public class TarUtilsTest extends TestCa
         assertEquals(0  , buffer[buffer.length-2]);
         assertEquals('3', buffer[buffer.length-3]); // end of number
     }
-    
+
     public void testNegative() throws Exception {
         byte [] buffer = new byte[22];
         TarUtils.formatUnsignedOctalString(-1, buffer, 0, buffer.length);
@@ -181,14 +181,14 @@ public class TarUtilsTest extends TestCa
     public void testOverflow() throws Exception {
         byte [] buffer = new byte[8-1]; // a lot of the numbers have 8-byte buffers (nul term)
         TarUtils.formatUnsignedOctalString(07777777L, buffer, 0, buffer.length);
-        assertEquals("7777777", new String(buffer, "UTF-8"));        
+        assertEquals("7777777", new String(buffer, "UTF-8"));
         try {
             TarUtils.formatUnsignedOctalString(017777777L, buffer, 0, buffer.length);
             fail("Should have cause IllegalArgumentException");
         } catch (IllegalArgumentException expected) {
         }
     }
-    
+
     public void testRoundTripNames(){
         checkName("");
         checkName("The quick brown fox\n");

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java Sat Mar 31 12:30:09 2012
@@ -312,7 +312,7 @@ public class UTF8ZipFilesTest extends Ab
             zos.putArchiveEntry(ze);
             zos.write("ascii".getBytes("US-ASCII"));
             zos.closeArchiveEntry();
-            
+
             zos.finish();
         } finally {
             if (zos != null) {

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java?rev=1307789&r1=1307788&r2=1307789&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java Sat Mar 31 12:30:09 2012
@@ -43,7 +43,7 @@ import org.apache.commons.compress.archi
  * Checks several ChangeSet business logics.
  */
 public final class ChangeSetTestCase extends AbstractTestCase {
-    
+
     // Delete a directory tree
     private void archiveListDeleteDir(String prefix){
         Iterator<String> it = archiveList.iterator();
@@ -79,14 +79,14 @@ public final class ChangeSetTestCase ext
         try {
             in = new FileInputStream(getFile("test.txt"));
             in2 = new FileInputStream(getFile("test2.xml"));
-       
+
             ArchiveEntry e = new ZipArchiveEntry("test.txt");
             ArchiveEntry e2 = new ZipArchiveEntry("test.txt");
-            
+
             ChangeSet changes = new ChangeSet();
             changes.add(e, in);
             changes.add(e2, in2);
-            
+
             assertEquals(1, changes.getChanges().size());
             Change c = changes.getChanges().iterator().next();
             assertEquals(in2, c.getInput());
@@ -97,7 +97,7 @@ public final class ChangeSetTestCase ext
                 in2.close();
         }
     }
-    
+
     /**
      * Adds an ArchiveEntry with the same name two times.
      * Only the first addition should be found in the ChangeSet,
@@ -111,14 +111,14 @@ public final class ChangeSetTestCase ext
         try {
             in = new FileInputStream(getFile("test.txt"));
             in2 = new FileInputStream(getFile("test2.xml"));
-       
+
             ArchiveEntry e = new ZipArchiveEntry("test.txt");
             ArchiveEntry e2 = new ZipArchiveEntry("test.txt");
-            
+
             ChangeSet changes = new ChangeSet();
             changes.add(e, in, true);
             changes.add(e2, in2, false);
-            
+
             assertEquals(1, changes.getChanges().size());
             Change c = changes.getChanges().iterator().next();
             assertEquals(in, c.getInput());
@@ -129,7 +129,7 @@ public final class ChangeSetTestCase ext
                 in2.close();
         }
     }
-    
+
     /**
      * Tries to delete the folder "bla" from an archive file. This should result in
      * the deletion of bla/*, which actually means bla/test4.xml should be
@@ -274,7 +274,7 @@ public final class ChangeSetTestCase ext
             ChangeSet changes = new ChangeSet();
             changes.delete("bla/test5.xml");
             archiveListDelete("bla/test5.xml");
-            
+
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
             is.close();
@@ -314,7 +314,7 @@ public final class ChangeSetTestCase ext
             ChangeSet changes = new ChangeSet();
             changes.delete("bla");
             //archiveListDelete("bla");
-            
+
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
             is.close();
@@ -344,7 +344,7 @@ public final class ChangeSetTestCase ext
         ArchiveInputStream ais = null;
         File result = File.createTempFile("test", "."+archivename);
         result.deleteOnExit();
-        
+
         File testtxt = null;
         try {
 
@@ -384,7 +384,7 @@ public final class ChangeSetTestCase ext
             check = this.checkArchiveContent(in, archiveList, false);
             File test3xml = new File(check,"result/test/test3.xml");
             assertEquals(testtxt.length(), test3xml.length());
-            
+
             BufferedReader reader = new BufferedReader(new FileReader(test3xml));
             String str;
             while ((str = reader.readLine()) != null) {
@@ -399,7 +399,7 @@ public final class ChangeSetTestCase ext
             rmdir(check);
         } 
     }
-    
+
     /**
      * Checks for the correct ChangeSetResults
      * 
@@ -441,7 +441,7 @@ public final class ChangeSetTestCase ext
             assertTrue(results.getDeleted().contains("bla/test4.xml"));
             assertTrue(results.getDeleted().contains("bla/test5.xml"));
             assertTrue(results.getDeleted().contains("bla/blubber/test6.xml"));
-            
+
             assertTrue(results.getAddedFromStream().contains("testdata/test1.xml"));
             assertTrue(results.getAddedFromStream().contains("testdata/test2.xml"));
             assertTrue(results.getAddedFromStream().contains("test/test3.xml"));
@@ -458,7 +458,7 @@ public final class ChangeSetTestCase ext
 
         this.checkArchiveContent(result, archiveList);
     }
-    
+
     /**
      * Tries to delete a directory with a file and adds a new directory with a
      * new file and with the same name. Should delete dir1/* and add
@@ -582,7 +582,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
             is.close();
 
         } finally {
@@ -630,7 +630,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
             is.close();
 
         } finally {
@@ -667,7 +667,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -704,7 +704,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -742,7 +742,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -786,7 +786,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -830,7 +830,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -866,7 +866,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -909,7 +909,7 @@ public final class ChangeSetTestCase ext
 
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
-            
+
         } finally {
             if (out != null)
                 out.close();
@@ -945,7 +945,7 @@ public final class ChangeSetTestCase ext
      */
     public void testAddMoveDelete() throws Exception {
     }
-    
+
     /**
      * Check can add a file to an empty archive.
      * 
@@ -1015,12 +1015,12 @@ public final class ChangeSetTestCase ext
                     new FileOutputStream(result));
             changes.delete("test1.xml");
             archiveListDelete("test1.xml");
-            
+
             final File file = getFile("test.txt");
             ArchiveEntry entry = out.createArchiveEntry(file,"bla/test.txt");
             changes.add(entry, new FileInputStream(file));
             archiveList.add("bla/test.txt");
-            
+
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
             is.close();
@@ -1068,7 +1068,7 @@ public final class ChangeSetTestCase ext
 
             changes.delete("test1.xml");
             archiveListDelete("test1.xml");
-            
+
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             performer.perform(ais, out);
             is.close();
@@ -1086,7 +1086,7 @@ public final class ChangeSetTestCase ext
 
         this.checkArchiveContent(result, archiveList);
     }
-    
+
     /**
      * Adds a file with the same filename as an existing file from the stream.
      * Should lead to a replacement.
@@ -1113,7 +1113,7 @@ public final class ChangeSetTestCase ext
             final File file1 = getFile("test.txt");
             ArchiveEntry entry = new ZipArchiveEntry("testdata/test1.xml");
             changes.add(entry, new FileInputStream(file1), true);
-            
+
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             ChangeSetResults results = performer.perform(ais, out);
             assertTrue(results.getAddedFromChangeSet().contains("testdata/test1.xml"));
@@ -1128,7 +1128,7 @@ public final class ChangeSetTestCase ext
 
         this.checkArchiveContent(result, archiveList);
     }
-    
+
     /**
      * Adds a file with the same filename as an existing file from the stream.
      * Should lead to a replacement.
@@ -1155,7 +1155,7 @@ public final class ChangeSetTestCase ext
             final File file1 = getFile("test.txt");
             ArchiveEntry entry = new ZipArchiveEntry("testdata/test1.xml");
             changes.add(entry, new FileInputStream(file1), false);
-            
+
             ChangeSetPerformer performer = new ChangeSetPerformer(changes);
             ChangeSetResults results = performer.perform(ais, out);
             assertTrue(results.getAddedFromStream().contains("testdata/test1.xml"));
@@ -1172,5 +1172,5 @@ public final class ChangeSetTestCase ext
 
         this.checkArchiveContent(result, archiveList);
     }
-    
+
 }

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=1307789&r1=1307788&r2=1307789&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 Sat Mar 31 12:30:09 2012
@@ -124,5 +124,5 @@ public final class BZip2TestCase extends
             is.close();
         }
     }
-    
+
 }



Mime
View raw message