svn commit: r645262 - /maven/sandbox/branches/MNG-2216/MJAVADOC-182/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[hb...@apache.org]

Author: hboutemy
Date: Sun Apr  6 09:26:35 2008
New Revision: 645262

URL: http://svn.apache.org/viewvc?rev=645262&view=rev
Log:
[MJAVADOC-182] added support for project.build.sourceEncoding property

Modified:
    maven/sandbox/branches/MNG-2216/MJAVADOC-182/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: maven/sandbox/branches/MNG-2216/MJAVADOC-182/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/MNG-2216/MJAVADOC-182/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=645262&r1=645261&r2=645262&view=diff
==============================================================================
--- maven/sandbox/branches/MNG-2216/MJAVADOC-182/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/sandbox/branches/MNG-2216/MJAVADOC-182/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Apr  6 09:26:35 2008
@@ -70,6 +70,7 @@
 import org.apache.maven.wagon.PathUtils;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -353,7 +354,7 @@
      * <br/>
      * <b>Note</b>: Since 2.4, the default value is locked to <code>ISO-8859-1</code> to better reproducing build.
      *
-     * @parameter expression="${encoding}" default-value="ISO-8859-1"
+     * @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
      */
     private String encoding;
 
@@ -1132,6 +1133,16 @@
     }
 
     /**
+     * Gets the source file encoding.
+     *
+     * @return The source file encoding, never <code>null</code>.
+     */
+    protected String getEncoding()
+    {
+        return ( encoding == null ) ? ReaderFactory.ISO_8859_1 : encoding;
+    }
+
+    /**
      * @param locale the wanted locale (actually unused).
      * @throws MavenReportException if any
      */
@@ -1319,7 +1330,7 @@
             addArgIfNotEmpty( arguments, "-doclet", JavadocUtil.quotedArgument( doclet ) );
             addArgIfNotEmpty( arguments, "-docletpath", JavadocUtil.quotedPathArgument( getDocletPath() ) );
         }
-        addArgIfNotEmpty( arguments, "-encoding", JavadocUtil.quotedArgument( encoding ) );
+        addArgIfNotEmpty( arguments, "-encoding", JavadocUtil.quotedArgument( getEncoding() ) );
         addArgIfNotEmpty( arguments, "-extdirs", JavadocUtil.quotedPathArgument( extdirs ) );
 
         if ( old && isJavaDocVersionAtLeast( SINCE_JAVADOC_1_4 ) )
@@ -3012,9 +3023,9 @@
         throws MavenReportException
     {
         // encoding
-        if ( StringUtils.isNotEmpty( encoding ) && !JavadocUtil.validateEncoding( encoding ) )
+        if ( !JavadocUtil.validateEncoding( getEncoding() ) )
         {
-            throw new MavenReportException( "Encoding not supported: " + encoding );
+            throw new MavenReportException( "Encoding not supported: " + getEncoding() );
         }
     }