You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/07/06 14:52:08 UTC
svn commit: r791468 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugin/javadoc/
test/java/org/apache/maven/plugin/javadoc/
test/resources/unit/fix-test/src/main/java/fix/test/
Author: vsiveton
Date: Mon Jul 6 12:52:08 2009
New Revision: 791468
URL: http://svn.apache.org/viewvc?rev=791468&view=rev
Log:
o more tests
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=791468&r1=791467&r2=791468&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Mon Jul 6 12:52:08 2009
@@ -3107,6 +3107,10 @@
// Note: docletTag.getValue() removes duplicate whitespace
String[] docletTagLines = getLines( docletTag.getValue() );
+ if ( docletTagLines.length == 0 )
+ {
+ docletTagLines = new String[] { "" };
+ }
StringBuffer sb = new StringBuffer();
int start = 0;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java?rev=791468&r1=791467&r2=791468&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/FixJavadocMojoTest.java Mon Jul 6 12:52:08 2009
@@ -184,6 +184,13 @@
" * if any" + EOL +
" */" + EOL +
" public String methodWithMultiLinesJavadoc( String aString, String anotherString )" ) != -1 );
+ assertTrue( content.indexOf( "" + EOL +
+ " /**" + EOL +
+ " * methodWithMultiLinesJavadoc2" + EOL +
+ " *" + EOL +
+ " * @return a {@link java.lang.String} object." + EOL +
+ " */" + EOL +
+ " protected String methodWithMultiLinesJavadoc2()" ) != -1 );
clazzFile = new File( packageDir, "ClassWithNoJavadoc.java" );
assertTrue( clazzFile.exists() );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java?rev=791468&r1=791467&r2=791468&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/fix-test/src/main/java/fix/test/ClassWithJavadoc.java Mon Jul 6 12:52:08 2009
@@ -85,4 +85,13 @@
{
return null;
}
+
+ /**
+ * methodWithMultiLinesJavadoc2
+ * @return
+ */
+ protected String methodWithMultiLinesJavadoc2()
+ {
+ return null;
+ }
}