svn commit: r759487 - in /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar: ArArchiveEntry.java ArArchiveInputStream.java ArArchiveOutputStream.java

[sebb]

Author: sebb
Date: Sat Mar 28 15:48:15 2009
New Revision: 759487

URL: http://svn.apache.org/viewvc?rev=759487&view=rev
Log:
Move header and trailer strings to ArArchiveEntry constants

Modified:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java?rev=759487&r1=759486&r2=759487&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
 Sat Mar 28 15:48:15 2009
@@ -27,6 +27,12 @@
  */
 public class ArArchiveEntry implements ArchiveEntry {
 
+    /** The header for each entry */
+    public static final String HEADER = "!<arch>\n";
+
+    /** The trailer for each entry */
+    public static final String TRAILER = "`\012";
+    
     private final String name;
        private final int userId;
        private final int groupId;

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java?rev=759487&r1=759486&r2=759487&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
 Sat Mar 28 15:48:15 2009
@@ -42,7 +42,7 @@
     public ArArchiveEntry getNextArEntry() throws IOException {
 
         if (offset == 0) {
-            final byte[] expected = "!<arch>\n".getBytes();
+            final byte[] expected = ArArchiveEntry.HEADER.getBytes();
             final byte[] realized = new byte[expected.length]; 
             final int read = read(realized);
             if (read != expected.length) {
@@ -78,7 +78,7 @@
         read(length);
 
         {
-            final byte[] expected = "`\012".getBytes();
+            final byte[] expected = ArArchiveEntry.TRAILER.getBytes();
             final byte[] realized = new byte[expected.length]; 
             final int read = read(realized);
             if (read != expected.length) {

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java?rev=759487&r1=759486&r2=759487&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
 Sat Mar 28 15:48:15 2009
@@ -41,14 +41,14 @@
     }
 
     private long writeArchiveHeader() throws IOException {
-        final String header = "!<arch>\n";
-        out.write(header.getBytes());
-        return header.length();
+        byte [] header = ArArchiveEntry.HEADER.getBytes();
+        out.write(header);
+        return header.length;
     }
 
     public void closeArchiveEntry() throws IOException {
         if ((entryOffset % 2) != 0) {
-            out.write('\n');
+            out.write('\n'); // Pad byte
             archiveOffset++;
         }
     }
@@ -137,7 +137,7 @@
 
         offset = fill(offset, 58, ' ');
 
-        offset += write("`\012");
+        offset += write(ArArchiveEntry.TRAILER);
 
         return offset;
     }