svn commit: r1618382 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz: Archive.java BindPair.java Folder.java StreamMap.java

[bodewig]

Author: bodewig
Date: Sat Aug 16 16:40:58 2014
New Revision: 1618382

URL: http://svn.apache.org/r1618382
Log:
add a bunch of toString methods

Modified:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java?rev=1618382&r1=1618381&r2=1618382&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Archive.java
 Sat Aug 16 16:40:58 2014
@@ -36,4 +36,20 @@ class Archive {
     SevenZArchiveEntry[] files;
     /// Mapping between folders, files and streams.
     StreamMap streamMap;
+
+    @Override
+    public String toString() {
+        return "Archive with packed streams starting at offset " + packPos
+            + ", " + lengthOf(packSizes) + " pack sizes, " + lengthOf(packCrcs)
+            + " CRCs, " + lengthOf(folders) + " folders, " + lengthOf(files)
+            + " files and " + streamMap;
+    }
+
+    private static String lengthOf(long[] a) {
+        return a == null ? "(null)" : String.valueOf(a.length); 
+    }
+
+    private static String lengthOf(Object[] a) {
+        return a == null ? "(null)" : String.valueOf(a.length); 
+    }
 }

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java?rev=1618382&r1=1618381&r2=1618382&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BindPair.java
 Sat Aug 16 16:40:58 2014
@@ -20,4 +20,9 @@ package org.apache.commons.compress.arch
 class BindPair {
     long inIndex;
     long outIndex;
+
+    @Override
+    public String toString() {
+        return "BindPair binding input " + inIndex + " to output " + outIndex;
+    }
 }

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java?rev=1618382&r1=1618381&r2=1618382&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
 Sat Aug 16 16:40:58 2014
@@ -40,7 +40,9 @@ class Folder {
     boolean hasCrc;
     /// The CRC, if present.
     long crc;
-    /// The number of unpack substreams, one per non-empty file in this folder.
+    /// The number of unpack substreams, product of the number of
+    /// output streams and the nuber of non-empty files in this
+    /// folder.
     int numUnpackSubStreams;
 
     /**
@@ -89,5 +91,15 @@ class Folder {
         }
         return 0;
     }
+
+    @Override
+    public String toString() {
+        return "Folder with " + coders.length + " coders, " + totalInputStreams
+            + " input streams, " + totalOutputStreams + " output streams, "
+            + bindPairs.length + " bind pairs, " + packedStreams.length
+            + " packed streams, " + unpackSizes.length + " unpack sizes, "
+            + (hasCrc ? "with CRC " + crc : "without CRC")
+            + " and " + numUnpackSubStreams + " unpack streams";
+    }
 }
 

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java?rev=1618382&r1=1618381&r2=1618382&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/StreamMap.java
 Sat Aug 16 16:40:58 2014
@@ -27,4 +27,12 @@ class StreamMap {
     int[] folderFirstFileIndex;
     /// Index of folder for each file.
     int[] fileFolderIndex;
+
+    @Override
+    public String toString() {
+        return "StreamMap with indices of " + folderFirstPackStreamIndex.length
+            + " folders, offsets of " + packStreamOffsets.length + " packed 
streams,"
+            + " first files of " + folderFirstFileIndex.length + " folders and"
+            + " folder indices for " + fileFolderIndex.length + " files";
+    }
 }