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/05/18 22:29:04 UTC

svn commit: r657631 - /maven/sandbox/trunk/plugins/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJavasrcMojo.java

Author: hboutemy
Date: Sun May 18 13:29:04 2008
New Revision: 657631

URL: http://svn.apache.org/viewvc?rev=657631&view=rev
Log:
[JXR-62] made file encoding default to platform encoding

Modified:
    maven/sandbox/trunk/plugins/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJavasrcMojo.java

Modified: maven/sandbox/trunk/plugins/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJavasrcMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJavasrcMojo.java?rev=657631&r1=657630&r2=657631&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJavasrcMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJavasrcMojo.java Sun May 18 13:29:04 2008
@@ -158,16 +158,6 @@
     private String windowTitle;
 
     /**
-     * Gets the effective source file encoding.
-     *
-     * @return The effective source file encoding, defaults to <code>ISO-8859-1</code> instead of <code>null</code>.
-     */
-    protected String getEncoding()
-    {
-        return ( encoding == null ) ? ReaderFactory.ISO_8859_1 : encoding;
-    }
-
-    /**
      * Execute the <code>JavaSrc</code>.
      *
      * @throws IOException if any
@@ -190,7 +180,10 @@
         {
             options.setDoctitle( this.doctitle );
         }
-        options.setEncoding( getEncoding() );
+        if ( StringUtils.isNotEmpty( this.encoding ) )
+        {   
+            options.setEncoding( this.encoding );   
+        }
         if ( StringUtils.isNotEmpty( this.footer ) )
         {
             options.setFooter( this.footer );