You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2005/10/13 22:12:58 UTC

svn commit: r320901 - /maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Author: jdcasey
Date: Thu Oct 13 13:12:52 2005
New Revision: 320901

URL: http://svn.apache.org/viewcvs?rev=320901&view=rev
Log:
Resolving: MNG-704, allowing list syntax for tags in the javadoc configuration. NOTE: The old single-line tag config syntax is also still supported.

Modified:
    maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java

Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=320901&r1=320900&r2=320901&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Thu Oct 13 13:12:52 2005
@@ -479,6 +479,18 @@
     private String stylesheetfile;
 
     /**
+     * Contains a list of tag names, which will result in conversion to support the following, from the javadoc
+     * API:
+     * <br/>
+     * Enables the Javadoc tool to interpret a simple, one-argument custom block tag tagname in doc comments.
+     * See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#tag">tag</a>.
+     * It is a comma separated String.
+     *
+     * @parameter expression="${tags}"
+     */
+    private ArrayList tags;
+
+    /**
      * Enables the Javadoc tool to interpret a simple, one-argument custom block tag tagname in doc comments.
      * See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#tag">tag</a>.
      * It is a comma separated String.
@@ -824,7 +836,19 @@
             addArgIf( arguments, serialwarn, "-serialwarn" );
             addArgIf( arguments, splitindex, "-splitindex" );
             addArgIfNotEmpty( arguments, "-stylesheetfile", quotedPathArgument( stylesheetfile ) );
+            
             addArgIfNotEmpty( arguments, "-tag", quotedArgument( tag ), 1.4f, true );
+            
+            if ( tags != null && !tags.isEmpty() )
+            {
+                for ( Iterator it = tags.iterator(); it.hasNext(); )
+                {
+                    String tag = (String) it.next();
+                    
+                    addArgIfNotEmpty( arguments, "-tag", quotedArgument( tag ), 1.4f, true );
+                }
+            }
+            
             addArgIfNotEmpty( arguments, "-taglet", quotedArgument( taglet ), 1.4f );
             addArgIfNotEmpty( arguments, "-tagletpath", quotedPathArgument( tagletpath ), 1.4f );
             addArgIf( arguments, use, "-use" );