#38: Downgrade PrintWriter to Writer in Manifest

This closes #38

Author: michael-o

Diff for: src/main/java/org/codehaus/plexus/archiver/jar/Manifest.java

@@ -24,6 +24,7 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -299,12 +300,12 @@ public void addValue( String value )
         }
 
         /**
-         * Write the attribute out to a print writer.
+         * Writes the attribute out to a writer.
          *
          * @param writer the Writer to which the attribute is written
          * @throws IOException if the attribute value cannot be written
          */
-        void write( PrintWriter writer )
+        void write( Writer writer )
             throws IOException
         {
             StringWriter sWriter = new StringWriter();
@@ -317,7 +318,7 @@ void write( PrintWriter writer )
 
             byte[] convertedToUtf8 = sWriter.toString().getBytes( "UTF-8" );
 
-            writer.print( new String( convertedToUtf8, "UTF-8" ) );
+            writer.write( new String( convertedToUtf8, "UTF-8" ) );
         }
 
         /**
@@ -327,7 +328,7 @@ void write( PrintWriter writer )
          * @param value  the attribute value
          * @throws IOException if the attribute value cannot be written
          */
-        private void writeValue( PrintWriter writer, String value )
+        private void writeValue( Writer writer, String value )
             throws IOException
         {
             String nameValue = name + ": " + value;
@@ -350,7 +351,7 @@ private void writeValue( PrintWriter writer, String value )
          * @param line   the manifest line to be written
          * @throws java.io.IOException when Io excepts
          */
-        private void writeLine( PrintWriter writer, String line )
+        private void writeLine( Writer writer, String line )
             throws IOException
         {
             while ( line.getBytes().length > MAX_LINE_LENGTH )
@@ -367,10 +368,10 @@ private void writeLine( PrintWriter writer, String line )
                 {
                     throw new IOException( "Unable to write manifest line " + line );
                 }
-                writer.print( section + EOL );
+                writer.write( section + EOL );
                 line = " " + line.substring( breakIndex );
             }
-            writer.print( line + EOL );
+            writer.write( line + EOL );
         }
     }
 
@@ -417,7 +418,7 @@ public void addValue( String value )
             setValue( value1 );
         }
 
-        void write( PrintWriter writer )
+        void write( Writer writer )
             throws IOException
         {
             throw new UnsupportedOperationException( "Cant do this" );
@@ -845,12 +846,12 @@ public void addConfiguredAttribute( Attribute attribute )
     }
 
     /**
-     * Write the manifest out to a print writer.
+     * Writes the manifest out to a writer.
      *
      * @param writer the Writer to which the manifest is written
      * @throws IOException if the manifest cannot be written
      */
-    public void write( PrintWriter writer )
+    public void write( Writer writer )
         throws IOException
     {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -872,7 +873,7 @@ public String toString()
         StringWriter sw = new StringWriter();
         try
         {
-            write( new PrintWriter( sw ) );
+            write( sw );
         }
         catch ( IOException e )
         {

Diff for: src/test/java/org/codehaus/plexus/archiver/jar/ManifestTest.java

@@ -20,7 +20,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.jar.Attributes;
 import org.codehaus.plexus.PlexusTestCase;
@@ -100,7 +99,7 @@ public void testAttributeLongLineWrite()
                 + "123456789 123456789 123456789 ";
         attr.setName( "test" );
         attr.setValue( longLineOfChars );
-        attr.write( new PrintWriter( writer ) );
+        attr.write( writer );
         writer.flush();
         assertEquals( "should be multiline",
                       "test: 123456789 123456789 123456789 123456789 123456789 123456789 1234"
@@ -168,7 +167,7 @@ public void testAttributeSerialization()
         manifest.getEntries().put( "sub", attributes );
         manifest.getSection( "sub" ).addAttributeAndCheck( new Manifest.Attribute( "attB", "caB" ) );
         StringWriter writer = new StringWriter();
-        manifest.write(  new PrintWriter( writer )  );
+        manifest.write(  writer );
         String s = writer.toString();
         assertTrue( s.contains( "mfa1: fud1" ) );
         assertTrue( s.contains( "mfa2: fud2" ) );
@@ -207,7 +206,7 @@ public void checkMultiLineAttribute( String in, String expected )
         Manifest.Attribute attr = new Manifest.Attribute();
         attr.setName( "test" );
         attr.setValue( in );
-        attr.write( new PrintWriter( writer ) );
+        attr.write( writer );
         writer.flush();
 
         // Print the string with whitespace replaced with special codes
@@ -280,7 +279,7 @@ public void testAttributeSerializationPlexusManifest()
         attributes.addConfiguredAttribute( new Manifest.Attribute( "attB", "caB" ) );
         manifest.addConfiguredSection(  attributes );
         StringWriter writer = new StringWriter();
-        manifest.write(  new PrintWriter( writer )  );
+        manifest.write(  writer );
         String s = writer.toString();
         assertTrue( s.contains( "mfa1: fud1" ) );
         assertTrue( s.contains( "mfa2: fud2" ) );