svn commit: r681100 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main: java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java javadoc/org/apache/maven/plugin/javadoc/package.html

[vsiveton]

Author: vsiveton
Date: Wed Jul 30 09:05:22 2008
New Revision: 681100

URL: http://svn.apache.org/viewvc?rev=681100&view=rev
Log:
o fixed warning depending jdk version
o updated package doc

Modified:
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html

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=681100&r1=681099&r2=681100&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
 Wed Jul 30 09:05:22 2008
@@ -3497,6 +3497,10 @@
 
         addArgIfNotEmpty( arguments, "-classpath", 
JavadocUtil.quotedPathArgument( getClasspath() ) );
 
+        if ( isJavaDocVersionAtLeast( SINCE_JAVADOC_1_5 ) )
+        {
+            addArgIf( arguments, breakiterator, "-breakiterator", 
SINCE_JAVADOC_1_5 );
+        }
         if ( StringUtils.isNotEmpty( doclet ) )
         {
             addArgIfNotEmpty( arguments, "-doclet", 
JavadocUtil.quotedArgument( doclet ) );
@@ -3529,7 +3533,11 @@
                               JavadocUtil.quotedPathArgument( 
getOverview().getAbsolutePath() ) );
         }
         arguments.add( getAccessLevel() );
-        addArgIf( arguments, quiet, "-quiet", SINCE_JAVADOC_1_5 );
+
+        if ( isJavaDocVersionAtLeast( SINCE_JAVADOC_1_5 ) )
+        {
+            addArgIf( arguments, quiet, "-quiet", SINCE_JAVADOC_1_5 );
+        }
         addArgIfNotEmpty( arguments, "-source", JavadocUtil.quotedArgument( 
source ), SINCE_JAVADOC_1_4 );
         addArgIf( arguments, verbose, "-verbose" );
         addArgIfNotEmpty( arguments, null, additionalparam );
@@ -3568,7 +3576,10 @@
 
         addArgIf( arguments, author, "-author" );
         addArgIfNotEmpty( arguments, "-bottom", JavadocUtil.quotedArgument( 
getBottomText() ), false, false );
-        addArgIf( arguments, breakiterator, "-breakiterator", 
SINCE_JAVADOC_1_4 );
+        if ( !isJavaDocVersionAtLeast( SINCE_JAVADOC_1_5 ) )
+        {
+            addArgIf( arguments, breakiterator, "-breakiterator", 
SINCE_JAVADOC_1_4 );
+        }
         addArgIfNotEmpty( arguments, "-charset", JavadocUtil.quotedArgument( 
getCharset() ) );
         addArgIfNotEmpty( arguments, "-d", JavadocUtil.quotedPathArgument( 
javadocOutputDirectory.toString() ) );
         addArgIf( arguments, docfilessubdirs, "-docfilessubdirs", 
SINCE_JAVADOC_1_4 );
@@ -3604,9 +3615,9 @@
         addArgIf( arguments, notree, "-notree" );
         addArgIfNotEmpty( arguments, "-packagesheader", 
JavadocUtil.quotedArgument( packagesheader ),
                           SINCE_JAVADOC_1_4_2 );
-        if ( fJavadocVersion >= SINCE_JAVADOC_1_4 && fJavadocVersion < 
SINCE_JAVADOC_1_5 ) // Sun bug: 4714350
+        if ( !isJavaDocVersionAtLeast( SINCE_JAVADOC_1_5 ) ) // Sun bug: 
4714350
         {
-            addArgIf( arguments, quiet, "-quiet" );
+            addArgIf( arguments, quiet, "-quiet", SINCE_JAVADOC_1_4 );
         }
         addArgIf( arguments, serialwarn, "-serialwarn" );
         addArgIf( arguments, linksource, "-linksource", SINCE_JAVADOC_1_4 );
@@ -3614,10 +3625,7 @@
         {
             addArgIfNotEmpty( arguments, "-linksourcetab", sourcetab );
         }
-        else
-        {
-            addArgIfNotEmpty( arguments, "-sourcetab", sourcetab, 
SINCE_JAVADOC_1_5 );
-        }
+        addArgIfNotEmpty( arguments, "-sourcetab", sourcetab, 
SINCE_JAVADOC_1_5 );
         addArgIf( arguments, splitindex, "-splitindex" );
         addArgIfNotEmpty( arguments, "-stylesheetfile",
                           JavadocUtil.quotedPathArgument( getStylesheetFile( 
javadocOutputDirectory ) ) );

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html?rev=681100&r1=681099&r2=681100&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/javadoc/org/apache/maven/plugin/javadoc/package.html
 Wed Jul 30 09:05:22 2008
@@ -289,10 +289,10 @@
       <tr class="b">
         <td><b>-subpackages</b><i> package1</i><b>:</b><i> 
package2</i><b>:</b>... </td>
         <td>
-          1.5
+          1.4
         </td>
         <td>
-          &lt;subpackages/&gt;
+          -
         </td>
       </tr>
       <tr class="a">
@@ -356,7 +356,7 @@
           <b>-breakiterator</b>
         </td>
         <td>
-          1.4
+          1.4 only
         </td>
         <td>
           &lt;breakiterator/&gt;
@@ -871,4 +871,4 @@
       -->
     </style>
   </BODY>
-</HTML>
\ No newline at end of file
+</HTML>