svn commit: r537585 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[vsiveton]

Author: vsiveton
Date: Sun May 13 06:36:19 2007
New Revision: 537585

URL: http://svn.apache.org/viewvc?view=rev&rev=537585
Log:
MJAVADOC-94: The javadoc option "-sourcetab" should be passed as 
"-linksourcetab"

o fixed alias def for linksourcetab and sources should not be linked only in 
online mode
o added a test to specify linksourcetab or sourcetab depending the javadoc 
version

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?view=diff&rev=537585&r1=537584&r2=537585
==============================================================================
--- 
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 13 06:36:19 2007
@@ -782,7 +782,7 @@
      * <br/>
      * Since Java 5.0.
      *
-     * @parameter expression="${sourcetab}" alias="{linksourcetab}"
+     * @parameter expression="${sourcetab}" alias="linksourcetab"
      */
     private String sourcetab;
 
@@ -1177,7 +1177,6 @@
             {
                 addLinkArguments( arguments );
                 addLinkofflineArguments( arguments );
-                addArgIf( arguments, linksource, "-linksource", 
SINCE_JAVADOC_1_4 );
             }
             else
             {
@@ -1196,7 +1195,15 @@
             addArgIf( arguments, notree, "-notree" );
             addArgIfNotEmpty( arguments, "-packagesheader", packagesheader, 
SINCE_JAVADOC_1_4_2 );
             addArgIf( arguments, serialwarn, "-serialwarn" );
-            addArgIfNotEmpty( arguments, "-sourcetab", sourcetab, 
SINCE_JAVADOC_1_5 );
+            addArgIf( arguments, linksource, "-linksource", SINCE_JAVADOC_1_4 
);
+            if ( fJavadocVersion == SINCE_JAVADOC_1_4_2 )
+            {
+                addArgIfNotEmpty( arguments, "-linksourcetab", sourcetab );
+            }
+            else
+            {
+                addArgIfNotEmpty( arguments, "-sourcetab", sourcetab, 
SINCE_JAVADOC_1_5 );
+            }
             addArgIf( arguments, splitindex, "-splitindex" );
             addArgIfNotEmpty( arguments, "-stylesheetfile",
                               quotedPathArgument( getStylesheetFile( 
javadocOutputDirectory ) ) );