Author: ltheussl
Date: Thu Apr 9 18:14:48 2009
New Revision: 763760
URL: http://svn.apache.org/viewvc?rev=763760&view=rev
Log:
Checkstyle fixes
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=763760&r1=763759&r2=763760&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Thu Apr 9 18:14:48 2009
@@ -211,7 +211,7 @@
{
try
{
- toUrl = new File( getNormalizedPath( to ) ).toURL();
+ toUrl = new File( getNormalizedPath( to ) ).toURI().toURL();
}
catch ( MalformedURLException e1 )
{
@@ -227,7 +227,7 @@
{
try
{
- fromUrl = new File( getNormalizedPath( from ) ).toURL();
+ fromUrl = new File( getNormalizedPath( from )
).toURI().toURL();
}
catch ( MalformedURLException e1 )
{
@@ -424,7 +424,7 @@
/** {...@inheritdoc} */
public File getSiteDescriptorFromRepository( MavenProject project,
ArtifactRepository localRepository,
- List
remoteArtifactRepositories, Locale locale )
+ List repositories, Locale
locale )
throws SiteToolException
{
if ( project == null )
@@ -435,7 +435,7 @@
{
throw new IllegalArgumentException( "The parameter
'localRepository' can not be null" );
}
- if ( remoteArtifactRepositories == null )
+ if ( repositories == null )
{
throw new IllegalArgumentException( "The parameter
'remoteArtifactRepositories' can not be null" );
}
@@ -447,7 +447,7 @@
try
{
- return resolveSiteDescriptor( project, localRepository,
remoteArtifactRepositories, locale );
+ return resolveSiteDescriptor( project, localRepository,
repositories, locale );
}
catch ( ArtifactNotFoundException e )
{
@@ -619,7 +619,7 @@
}
/** {...@inheritdoc} */
- public String getInterpolatedSiteDescriptorContent( Map props,
MavenProject project, String siteDescriptorContent,
+ public String getInterpolatedSiteDescriptorContent( Map props,
MavenProject aProject, String siteDescriptorContent,
String inputEncoding,
String outputEncoding )
throws SiteToolException
{
@@ -627,7 +627,7 @@
{
throw new IllegalArgumentException( "The parameter 'props' can not
be null" );
}
- if ( project == null )
+ if ( aProject == null )
{
throw new IllegalArgumentException( "The parameter 'project' can
not be null" );
}
@@ -668,9 +668,9 @@
e );
}
- interpolator.addValueSource( new ObjectBasedValueSource( project ) );
+ interpolator.addValueSource( new ObjectBasedValueSource( aProject ) );
- interpolator.addValueSource( new MapBasedValueSource(
project.getProperties() ) );
+ interpolator.addValueSource( new MapBasedValueSource(
aProject.getProperties() ) );
siteDescriptorContent = interpolator.interpolate(
siteDescriptorContent, "project" );
@@ -688,10 +688,10 @@
}
/** {...@inheritdoc} */
- public MavenProject getParentProject( MavenProject project, List
reactorProjects,
+ public MavenProject getParentProject( MavenProject aProject, List
reactorProjects,
ArtifactRepository localRepository )
{
- if ( project == null )
+ if ( aProject == null )
{
throw new IllegalArgumentException( "The parameter 'project' can
not be null" );
}
@@ -706,7 +706,7 @@
MavenProject parentProject = null;
- MavenProject origParent = project.getParent();
+ MavenProject origParent = aProject.getParent();
if ( origParent != null )
{
Iterator reactorItr = reactorProjects.iterator();
@@ -724,11 +724,11 @@
}
}
- if ( parentProject == null && project.getBasedir() != null )
+ if ( parentProject == null && aProject.getBasedir() != null )
{
try
{
- File pomFile = new File( project.getBasedir(),
project.getModel().getParent().getRelativePath() );
+ File pomFile = new File( aProject.getBasedir(),
aProject.getModel().getParent().getRelativePath() );
if ( pomFile.isDirectory() )
{
@@ -755,7 +755,7 @@
{
try
{
- parentProject = mavenProjectBuilder.buildFromRepository(
project.getParentArtifact(), project
+ parentProject = mavenProjectBuilder.buildFromRepository(
aProject.getParentArtifact(), aProject
.getRemoteArtifactRepositories(), localRepository );
getLogger().info( "Parent project loaded from repository."
);
}
@@ -840,7 +840,8 @@
/**
* {...@inheritdoc}
- * @deprecated Please use {...@link #populateParentMenu(DecorationModel,
Locale, MavenProject, MavenProject, boolean)} instead
+ * @deprecated Please use
+ * {...@link #populateParentMenu(DecorationModel, Locale,
MavenProject, MavenProject, boolean)} instead
*/
public void populateProjectParentMenu( DecorationModel decorationModel,
Locale locale, MavenProject project,
MavenProject parentProject, boolean
keepInheritedRefs )
@@ -850,7 +851,9 @@
/**
* {...@inheritdoc}
- * @deprecated Please use {...@link #populateModulesMenu(MavenProject,
List, ArtifactRepository, DecorationModel, Locale, boolean)} instead
+ * @deprecated Please use
+ * {...@link #populateModulesMenu(MavenProject, List,
ArtifactRepository, DecorationModel, Locale, boolean)}
+ * instead
*/
public void populateModules( MavenProject project, List reactorProjects,
ArtifactRepository localRepository,
DecorationModel decorationModel, Locale
locale, boolean keepInheritedRefs )
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java?rev=763760&r1=763759&r2=763760&view=diff
==============================================================================
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Thu Apr 9 18:14:48 2009
@@ -225,7 +225,8 @@
* @param project a Maven project, not null.
* @param parentProject a Maven parent project, not null.
* @param keepInheritedRefs used for inherited references.
- * @deprecated Please use {...@link #populateParentMenu(DecorationModel,
Locale, MavenProject, MavenProject, boolean)} instead
+ * @deprecated Please use
+ * {...@link #populateParentMenu(DecorationModel, Locale,
MavenProject, MavenProject, boolean)} instead
*/
void populateProjectParentMenu( DecorationModel decorationModel, Locale
locale, MavenProject project,
MavenProject parentProject, boolean
keepInheritedRefs );
@@ -240,7 +241,9 @@
* @param locale the locale used for the i18n in DecorationModel. If null,
using the default locale in the jvm.
* @param keepInheritedRefs used for inherited references.
* @throws SiteToolException if any
- * @deprecated Please use {...@link #populateModulesMenu(MavenProject,
List, ArtifactRepository, DecorationModel, Locale, boolean)} instead
+ * @deprecated Please use
+ * {...@link #populateModulesMenu(MavenProject, List,
ArtifactRepository, DecorationModel, Locale, boolean)}
+ * instead
*/
void populateModules( MavenProject project, List reactorProjects,
ArtifactRepository localRepository,
DecorationModel decorationModel, Locale locale,
boolean keepInheritedRefs )
