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:01:11 UTC
svn commit: r657619 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: hboutemy
Date: Sun May 18 13:01:11 2008
New Revision: 657619
URL: http://svn.apache.org/viewvc?rev=657619&view=rev
Log:
[MJAVADOC-185] reverted MJAVADOC-165, ie default to platform encoding
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=657619&r1=657618&r2=657619&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun May 18 13:01:11 2008
@@ -367,7 +367,8 @@
* <br/>
* See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#encoding">encoding</a>.
* <br/>
- * <b>Note</b>: Since 2.4, the default value is locked to <code>ISO-8859-1</code> to better reproducing build.
+ * <b>Note</b>: In 2.4, the default value was locked to <code>ISO-8859-1</code> to better reproducing build,but
+ * this was reverted in 2.5.
*
* @parameter expression="${encoding}" default-value="${project.build.sourceEncoding}"
*/
@@ -1148,16 +1149,6 @@
}
/**
- * 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
*/
@@ -1345,7 +1336,7 @@
addArgIfNotEmpty( arguments, "-doclet", JavadocUtil.quotedArgument( doclet ) );
addArgIfNotEmpty( arguments, "-docletpath", JavadocUtil.quotedPathArgument( getDocletPath() ) );
}
- addArgIfNotEmpty( arguments, "-encoding", JavadocUtil.quotedArgument( getEncoding() ) );
+ addArgIfNotEmpty( arguments, "-encoding", JavadocUtil.quotedArgument( encoding ) );
addArgIfNotEmpty( arguments, "-extdirs", JavadocUtil.quotedPathArgument( extdirs ) );
if ( old && isJavaDocVersionAtLeast( SINCE_JAVADOC_1_4 ) )
@@ -3095,9 +3086,9 @@
throws MavenReportException
{
// encoding
- if ( !JavadocUtil.validateEncoding( getEncoding() ) )
+ if ( StringUtils.isNotEmpty( encoding ) && !JavadocUtil.validateEncoding( encoding ) )
{
- throw new MavenReportException( "Encoding not supported: " + getEncoding() );
+ throw new MavenReportException( "Encoding not supported: " + encoding );
}
}