Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-779 

fix defaults

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291371 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-25 03:09:06 +00:00
parent 1c576b6c09
commit 9b52245750
1 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
View File

@ -73,26 +73,6 @@ public class JavadocReport
// Using for the plugin:xdoc goal. Best way? // Using for the plugin:xdoc goal. Best way?
/**
* Default bottom
*/
private static final String DEFAULT_BOTTOM = "Copyright ${project.inceptionYear-currentYear} ${project.organization.name}. All Rights Reserved.";
/**
* Default doctitle
*/
private static final String DEFAULT_DOCTITLE = "${windowtitle}";
/**
* Default organization name
*/
private static final String DEFAULT_ORGANIZATION_NAME = "The Apache Software Foundation";
/**
* Default window title
*/
private static final String DEFAULT_WINDOW_TITLE = "${project.name} ${project.version} API";
private static final String PATH_SEPARATOR = System.getProperty( "path.separator" ); private static final String PATH_SEPARATOR = System.getProperty( "path.separator" );
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
@ -289,7 +269,7 @@ public class JavadocReport
* Specifies the text to be placed at the bottom of each output file. * Specifies the text to be placed at the bottom of each output file.
* See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#bottom">bottom</a>. * See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#bottom">bottom</a>.
* *
* @parameter expression="${bottom}" default-value="Copyright ${project.inceptionYear-currentYear} ${project.organization.name}. All Rights Reserved." * @parameter expression="${bottom}" default-value="Copyright {inceptionYear}-{currentYear} ${project.organization.name}. All Rights Reserved."
*/ */
private String bottom; private String bottom;
@ -774,36 +754,20 @@ public class JavadocReport
// javadoc arguments for default doclet // javadoc arguments for default doclet
if ( StringUtils.isEmpty( doclet ) ) if ( StringUtils.isEmpty( doclet ) )
{ {
// Specify default values bottom = StringUtils.replace( bottom, "{currentYear}", year );
if ( bottom.equals( DEFAULT_BOTTOM ) ) if ( project.getInceptionYear() != null )
{ {
bottom = "Copyright &copy; " + year + " "; bottom = StringUtils.replace( bottom, "{inceptionYear}", project.getInceptionYear() );
if ( ( model.getOrganization() != null ) &&
( !StringUtils.isEmpty( model.getOrganization().getName() ) ) )
{
bottom += model.getOrganization().getName();
} }
else else
{ {
bottom += DEFAULT_ORGANIZATION_NAME; bottom = StringUtils.replace( bottom, "{inceptionYear}-", "" );
}
bottom += ". All Rights Reserved.";
} }
if ( StringUtils.isEmpty( stylesheetfile ) ) if ( StringUtils.isEmpty( stylesheetfile ) )
{ {
stylesheetfile = javadocDirectory + File.separator + DEFAULT_CSS_NAME; stylesheetfile = javadocDirectory + File.separator + DEFAULT_CSS_NAME;
} }
if ( windowtitle.equals( DEFAULT_WINDOW_TITLE ) )
{
windowtitle = ( model.getName() == null ? model.getArtifactId() : model.getName() ) + " " +
model.getVersion() + " API";
}
if ( doctitle.equals( DEFAULT_DOCTITLE ) )
{
doctitle = windowtitle;
}
// End Specify default values // End Specify default values
addArgIf( arguments, author, "-author" ); addArgIf( arguments, author, "-author" );