Author: vsiveton Date: Sun Jul 5 11:49:31 2009 New Revision: 791231 URL: http://svn.apache.org/viewvc?rev=791231&view=rev Log: o used String outputDirectory instead of File
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.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=791231&r1=791230&r2=791231&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 Sun Jul 5 11:49:31 2009 @@ -319,7 +319,7 @@ * * @parameter expression="${outputDirectory}" default-value="${project.build.sourceDirectory}" */ - private File outputDirectory; + private String outputDirectory; /** * The Maven Project Object. @@ -572,8 +572,8 @@ return true; } - if ( outputDirectory != null - && !outputDirectory.getAbsolutePath().equals( getProjectSourceDirectory().getAbsolutePath() ) ) + File outputDir = new File( outputDirectory ).getAbsoluteFile(); + if ( !outputDir.getAbsolutePath().equals( getProjectSourceDirectory().getAbsolutePath() ) ) { return true; } @@ -1058,8 +1058,8 @@ getLog().debug( "Saving " + javaClass.getFullyQualifiedName() ); - if ( outputDirectory != null - && !outputDirectory.getAbsolutePath().equals( getProjectSourceDirectory().getAbsolutePath() ) ) + File outputDir = new File( outputDirectory ).getAbsoluteFile(); + if ( !outputDir.getAbsolutePath().equals( getProjectSourceDirectory().getAbsolutePath() ) ) { String path = StringUtils.replace( javaFile.getAbsolutePath().replaceAll( "\\\\", "/" ),