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/07 11:53:57 UTC
svn commit: r791772 - 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: Tue Jul 7 09:53:57 2009
New Revision: 791772
URL: http://svn.apache.org/viewvc?rev=791772&view=rev
Log:
o fixed 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=791772&r1=791771&r2=791772&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 Tue Jul 7 09:53:57 2009
@@ -3127,7 +3127,8 @@
break;
}
- if ( originalJavadocLine.indexOf( docletTagLines[0] ) != -1 )
+ if ( StringUtils.removeDuplicateWhitespace( originalJavadocLine )
+ .endsWith( StringUtils.removeDuplicateWhitespace( docletTagLines[0] ) ) )
{
start = i;
}
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=791772&r1=791771&r2=791772&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 Tue Jul 7 09:53:57 2009
@@ -134,9 +134,9 @@
" public ClassWithJavadoc()" ) != -1 );
assertTrue( content.indexOf( "" + EOL +
" /**" + EOL +
- " * <p>main</p>" + EOL +
+ " * The main method" + EOL +
" *" + EOL +
- " * @param args an array of {@link java.lang.String} objects." + EOL +
+ " * @param args an array of strings that contains the arguments" + EOL +
" */" + EOL +
" public static void main( String[] args )" ) != -1 );
assertTrue( content.indexOf( "" + EOL +
@@ -178,8 +178,8 @@
" * multi" + EOL +
" * line" + EOL +
" * comments" + EOL +
- " * @param aString" + EOL +
- " * a string" + EOL +
+ " * @return a" + EOL +
+ " * String" + EOL +
" * @throws java.lang.UnsupportedOperationException" + EOL +
" * if any" + EOL +
" */" + EOL +
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=791772&r1=791771&r2=791772&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 Tue Jul 7 09:53:57 2009
@@ -37,6 +37,11 @@
// nop
}
+ /**
+ * The main method
+ *
+ * @param args an array of strings that contains the arguments
+ */
public static void main( String[] args )
{
System.out.println( "Sample Application." );