You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/04/01 11:53:00 UTC

svn commit: r643342 - /maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java

Author: hboutemy
Date: Tue Apr  1 02:52:43 2008
New Revision: 643342

URL: http://svn.apache.org/viewvc?rev=643342&view=rev
Log:
[MPLUGIN-95] Output proper charset name in XDoc report for mojos
Submitted by: Benjamin Bentmann

Modified:
    maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java

Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=643342&r1=643341&r2=643342&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java Tue Apr  1 02:52:43 2008
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -103,12 +104,14 @@
         throws IOException
     {
         File outputFile = new File( destinationDirectory, getMojoFilename( mojoDescriptor, "xml" ) );
-        OutputStreamWriter writer = null;
+        String encoding = "UTF-8";
+        Writer writer = null;
         try
         {
-            writer = new OutputStreamWriter( new FileOutputStream( outputFile ), "UTF-8" );
+            writer = new OutputStreamWriter( new FileOutputStream( outputFile ), encoding );
 
-            writeBody( writer, mojoDescriptor );
+            XMLWriter w = new PrettyPrintXMLWriter( new PrintWriter( writer ), encoding, null );
+            writeBody( mojoDescriptor, w );
 
             writer.flush();
         }
@@ -123,10 +126,8 @@
         return mojo.getGoal() + "-mojo." + ext;
     }
 
-    private void writeBody( OutputStreamWriter writer, MojoDescriptor mojoDescriptor )
+    private void writeBody( MojoDescriptor mojoDescriptor, XMLWriter w )
     {
-        XMLWriter w = new PrettyPrintXMLWriter( new PrintWriter( writer ), writer.getEncoding(), null );
-
         w.startElement( "document" );
 
         // ----------------------------------------------------------------------