svn commit: r791233 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java

[vsiveton]

Author: vsiveton
Date: Sun Jul  5 12:10:54 2009
New Revision: 791233

URL: http://svn.apache.org/viewvc?rev=791233&view=rev
Log:
o reverted r791231

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=791233&r1=791232&r2=791233&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 12:10:54 2009
@@ -319,7 +319,7 @@
      *
      * @parameter expression="${outputDirectory}" 
default-value="${project.build.sourceDirectory}"
      */
-    private String outputDirectory;
+    private File outputDirectory;
 
     /**
      * The Maven Project Object.
@@ -572,8 +572,8 @@
             return true;
         }
 
-        File outputDir = new File( outputDirectory ).getAbsoluteFile();
-        if ( !outputDir.getAbsolutePath().equals( 
getProjectSourceDirectory().getAbsolutePath() ) )
+        if ( outputDirectory != null
+            && !outputDirectory.getAbsolutePath().equals( 
getProjectSourceDirectory().getAbsolutePath() ) )
         {
             return true;
         }
@@ -1058,8 +1058,8 @@
 
         getLog().debug( "Saving " + javaClass.getFullyQualifiedName() );
 
-        File outputDir = new File( outputDirectory ).getAbsoluteFile();
-        if ( !outputDir.getAbsolutePath().equals( 
getProjectSourceDirectory().getAbsolutePath() ) )
+        if ( outputDirectory != null
+            && !outputDirectory.getAbsolutePath().equals( 
getProjectSourceDirectory().getAbsolutePath() ) )
         {
             String path =
                 StringUtils.replace( javaFile.getAbsolutePath().replaceAll( 
"\\\\", "/" ),