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 2007/07/07 13:18:04 UTC
svn commit: r554179 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc:
AbstractJavadocMojo.java TestJavadocReport.java
Author: vsiveton
Date: Sat Jul 7 04:18:01 2007
New Revision: 554179
URL: http://svn.apache.org/viewvc?view=rev&rev=554179
Log:
MJAVADOC-131: file configuration should use File type instead of String
o Changed the type of javadocDirectory and overview fields to File
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?view=diff&rev=554179&r1=554178&r2=554179
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sat Jul 7 04:18:01 2007
@@ -154,7 +154,7 @@
*
* @parameter expression="${basedir}/src/main/javadoc"
*/
- private String javadocDirectory;
+ private File javadocDirectory;
/**
* Set an additional parameter(s) on the command line. This value should include quotes as necessary for
@@ -415,7 +415,7 @@
*
* @parameter expression="${overview}" default-value="${basedir}/src/main/javadoc/overview.html"
*/
- private String overview;
+ private File overview;
/**
* Specifies the access level for classes and members to show in the Javadocs.
@@ -1011,7 +1011,7 @@
/**
* @return the current javadoc directory
*/
- protected String getJavadocDirectory()
+ protected File getJavadocDirectory()
{
return javadocDirectory;
}
@@ -1027,7 +1027,7 @@
/**
* @return the overview documentation file from the user parameter or from the <code>javadocdirectory</code>
*/
- protected String getOverview()
+ protected File getOverview()
{
return overview;
}
@@ -1208,9 +1208,9 @@
addArgIf( arguments, old, "-1.1" );
}
- if ( ( StringUtils.isNotEmpty( getOverview() ) ) && ( new File( getOverview() ).exists() ) )
+ if ( ( getOverview() != null ) && ( getOverview().exists() ) )
{
- addArgIfNotEmpty( arguments, "-overview", quotedPathArgument( getOverview() ) );
+ addArgIfNotEmpty( arguments, "-overview", quotedPathArgument( getOverview().getAbsolutePath() ) );
}
arguments.add( getAccessLevel() );
addArgIf( arguments, quiet, "-quiet", SINCE_JAVADOC_1_4 );
@@ -1474,10 +1474,10 @@
if ( getJavadocDirectory() != null )
{
- File javadocDir = new File( getJavadocDirectory() );
+ File javadocDir = getJavadocDirectory();
if ( javadocDir.exists() && javadocDir.isDirectory() )
{
- sourcePaths.add( getJavadocDirectory() );
+ sourcePaths.add( getJavadocDirectory().getAbsolutePath() );
}
}
@@ -1502,7 +1502,7 @@
sourcePaths.addAll( sourceRoots );
}
- String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getJavadocDirectory() );
+ String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
File javadocDir = new File( subProject.getExecutionProject().getBasedir(), javadocDirRelative );
if ( javadocDir.exists() && javadocDir.isDirectory() )
{
@@ -2385,7 +2385,7 @@
if ( getJavadocDirectory() != null )
{
- copyJavadocResources( outputDirectory, new File( getJavadocDirectory() ) );
+ copyJavadocResources( outputDirectory, getJavadocDirectory() );
}
if ( aggregate && project.isExecutionRoot() )
@@ -2396,7 +2396,7 @@
if ( subProject != project )
{
- String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getJavadocDirectory() );
+ String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
File javadocDir = new File( subProject.getBasedir(), javadocDirRelative );
copyJavadocResources( outputDirectory, javadocDir );
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java?view=diff&rev=554179&r1=554178&r2=554179
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java Sat Jul 7 04:18:01 2007
@@ -65,7 +65,7 @@
*
* @parameter expression="${overview}" default-value="${basedir}/src/test/javadoc/overview.html"
*/
- private String overview;
+ private File overview;
/**
* Specifies the title to be placed in the HTML title tag.
@@ -100,7 +100,7 @@
*
* @parameter expression="${basedir}/src/test/javadoc"
*/
- private String javadocDirectory;
+ private File javadocDirectory;
/**
* The name of the test Javadoc report.
@@ -237,7 +237,7 @@
/**
* @see org.apache.maven.plugin.javadoc.AbstractJavadocMojo#getJavadocDirectory()
*/
- protected String getJavadocDirectory()
+ protected File getJavadocDirectory()
{
return javadocDirectory;
}
@@ -253,7 +253,7 @@
/**
* @see org.apache.maven.plugin.javadoc.AbstractJavadocMojo#getOverview()
*/
- protected String getOverview()
+ protected File getOverview()
{
return overview;
}