You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by lt...@apache.org on 2011/04/05 13:35:39 UTC
svn commit: r1088984 -
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Author: ltheussl
Date: Tue Apr 5 11:35:39 2011
New Revision: 1088984
URL: http://svn.apache.org/viewvc?rev=1088984&view=rev
Log:
do not modify loop variable
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1088984&r1=1088983&r2=1088984&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Tue Apr 5 11:35:39 2011
@@ -227,13 +227,13 @@ public class DefaultSiteRenderer
for ( String doc : docs )
{
- doc = doc.trim();
+ String docc = doc.trim();
RenderingContext context =
- new RenderingContext( moduleBasedir, doc, module.getParserId(), module.getExtension() );
+ new RenderingContext( moduleBasedir, docc, module.getParserId(), module.getExtension() );
// TODO: DOXIA-111: we need a general filter here that knows how to alter the context
- if ( doc.toLowerCase( Locale.ENGLISH ).endsWith( ".vm" ) )
+ if ( docc.toLowerCase( Locale.ENGLISH ).endsWith( ".vm" ) )
{
context.setAttribute( "velocity", "true" );
}
@@ -249,7 +249,7 @@ public class DefaultSiteRenderer
File originalDoc = new File( originalContext.getBasedir(), originalContext.getInputName() );
- throw new RendererException( "Files '" + module.getSourceDirectory() + File.separator + doc
+ throw new RendererException( "Files '" + module.getSourceDirectory() + File.separator + docc
+ "' clashes with existing '" + originalDoc + "'." );
}
// -----------------------------------------------------------------------
@@ -266,13 +266,13 @@ public class DefaultSiteRenderer
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
throw new RendererException( "Files '" + module.getSourceDirectory() + File.separator
- + doc + "' clashes with existing '" + originalDoc + "'." );
+ + docc + "' clashes with existing '" + originalDoc + "'." );
}
if ( getLogger().isWarnEnabled() )
{
getLogger().warn(
- "Files '" + module.getSourceDirectory() + File.separator + doc
+ "Files '" + module.getSourceDirectory() + File.separator + docc
+ "' could clashes with existing '" + originalDoc + "'." );
}
}