Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolving: MNG-1164...added the ability to use a null key in addArg...(), and used this to avoid passing in the key -additionalparam. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320891 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-10-13 19:39:52 +00:00
parent 02c020ad64
commit 02eba11c6f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
View File

@ -769,8 +769,7 @@ public class JavadocReport
addArgIf( arguments, quiet, "-quiet", 1.4f ); addArgIf( arguments, quiet, "-quiet", 1.4f );
addArgIfNotEmpty( arguments, "-source", quotedArgument( source ), 1.4f ); addArgIfNotEmpty( arguments, "-source", quotedArgument( source ), 1.4f );
addArgIf( arguments, verbose, "-verbose" ); addArgIf( arguments, verbose, "-verbose" );
addArgIfNotEmpty( arguments, "-additionalparam", quotedArgument( additionalparam ) ); addArgIfNotEmpty( arguments, null, quotedArgument( additionalparam ) );
addArgIfNotEmpty( arguments, "-sourcePath", quotedPathArgument( sourcePath.toString() ) ); addArgIfNotEmpty( arguments, "-sourcePath", quotedPathArgument( sourcePath.toString() ) );
// javadoc arguments for default doclet // javadoc arguments for default doclet
@ -979,8 +978,11 @@ public class JavadocReport
private void addArgIfNotEmpty( List arguments, String key, String value, boolean repeatKey ) private void addArgIfNotEmpty( List arguments, String key, String value, boolean repeatKey )
{ {
if ( !StringUtils.isEmpty( value ) ) if ( !StringUtils.isEmpty( value ) )
{
if ( !StringUtils.isEmpty( key ) )
{ {
arguments.add( key ); arguments.add( key );
}
StringTokenizer token = new StringTokenizer( value, "," ); StringTokenizer token = new StringTokenizer( value, "," );
while ( token.hasMoreTokens() ) while ( token.hasMoreTokens() )