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 hb...@apache.org on 2011/02/19 17:28:02 UTC
svn commit: r1072376 - in /maven/doxia/doxia-sitetools/trunk:
doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/
doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/
doxia-doc-renderer/src/main/java...
Author: hboutemy
Date: Sat Feb 19 16:28:01 2011
New Revision: 1072376
URL: http://svn.apache.org/viewvc?rev=1072376&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=1072376&r1=1072375&r2=1072376&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java Sat Feb 19 16:28:01 2011
@@ -61,29 +61,29 @@ public class DefaultDecorationModelInher
if ( child.getBannerLeft() == null && parent.getBannerLeft() != null )
{
- child.setBannerLeft( (Banner) parent.getBannerLeft().clone());
+ child.setBannerLeft( (Banner) parent.getBannerLeft().clone() );
rebaseBannerPaths( child.getBannerLeft(), urlContainer );
}
if ( child.getBannerRight() == null && parent.getBannerRight() != null)
{
- child.setBannerRight( (Banner) parent.getBannerRight().clone());
+ child.setBannerRight( (Banner) parent.getBannerRight().clone() );
rebaseBannerPaths( child.getBannerRight(), urlContainer );
}
if ( child.getPublishDate() == null && parent.getPublishDate() != null )
{
- child.setPublishDate( (PublishDate) parent.getPublishDate().clone());
+ child.setPublishDate( (PublishDate) parent.getPublishDate().clone() );
}
if ( child.getVersion() == null && parent.getVersion() != null )
{
- child.setVersion( (Version) parent.getVersion().clone());
+ child.setVersion( (Version) parent.getVersion().clone() );
}
if ( child.getSkin() == null && parent.getSkin() != null )
{
- child.setSkin( (Skin) parent.getSkin().clone());
+ child.setSkin( (Skin) parent.getSkin().clone() );
}
child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(), parent.getPoweredBy(), urlContainer ) );
Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocRenderer.java?rev=1072376&r1=1072375&r2=1072376&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocRenderer.java Sat Feb 19 16:28:01 2011
@@ -62,5 +62,5 @@ public interface DocRenderer
*
* @return the ouput extension supported
*/
- public String getOutputExtension();
+ String getOutputExtension();
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java?rev=1072376&r1=1072375&r2=1072376&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java Sat Feb 19 16:28:01 2011
@@ -77,7 +77,8 @@ public class FoPdfRenderer
}
/** {@inheritDoc} */
- public void render( Map filesToProcess, File outputDirectory, DocumentModel documentModel, DocumentRendererContext context )
+ public void render( Map filesToProcess, File outputDirectory, DocumentModel documentModel,
+ DocumentRendererContext context )
throws DocumentRendererException, IOException
{
// copy resources, images, etc.
@@ -124,11 +125,11 @@ public class FoPdfRenderer
( context != null && context.get( "generateTOC" ) != null ? context.get( "generateTOC" ).toString().trim()
: "start" );
int tocPosition = 0;
- if ( "start".equalsIgnoreCase( generateTOC ))
+ if ( "start".equalsIgnoreCase( generateTOC ) )
{
tocPosition = FoAggregateSink.TOC_START;
}
- else if ( "end".equalsIgnoreCase( generateTOC ))
+ else if ( "end".equalsIgnoreCase( generateTOC ) )
{
tocPosition = FoAggregateSink.TOC_END;
}
@@ -275,8 +276,9 @@ public class FoPdfRenderer
}
}
- private void renderModules( String href, FoAggregateSink sink, DocumentTOCItem tocItem, DocumentRendererContext context )
- throws DocumentRendererException, IOException
+ private void renderModules( String href, FoAggregateSink sink, DocumentTOCItem tocItem,
+ DocumentRendererContext context )
+ throws DocumentRendererException, IOException
{
for ( Iterator i = siteModuleManager.getSiteModules().iterator(); i.hasNext(); )
{
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java?rev=1072376&r1=1072375&r2=1072376&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java Sat Feb 19 16:28:01 2011
@@ -167,7 +167,8 @@ public class SiteRenderingContext
*
* @return a {@link java.util.List} object with {@link java.util.Locale} objects.
*/
- public List getSiteLocales() {
+ public List getSiteLocales()
+ {
return siteLocales;
}
@@ -176,7 +177,8 @@ public class SiteRenderingContext
*
* @param locales List of {@link java.util.Locale} objects to add to the site locales list.
*/
- public void addSiteLocales( List locales ) {
+ public void addSiteLocales( List locales )
+ {
siteLocales.addAll( locales );
}