Author: ltheussl Date: Mon Apr 4 13:10:33 2011 New Revision: 1088610 URL: http://svn.apache.org/viewvc?rev=1088610&view=rev Log: remove redundant casts
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-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.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=1088610&r1=1088609&r2=1088610&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 Mon Apr 4 13:10:33 2011 @@ -29,9 +29,6 @@ import org.apache.maven.doxia.site.decor import org.apache.maven.doxia.site.decoration.Logo; import org.apache.maven.doxia.site.decoration.Menu; import org.apache.maven.doxia.site.decoration.MenuItem; -import org.apache.maven.doxia.site.decoration.PublishDate; -import org.apache.maven.doxia.site.decoration.Skin; -import org.apache.maven.doxia.site.decoration.Version; import org.codehaus.plexus.util.xml.Xpp3Dom; @@ -60,29 +57,29 @@ public class DefaultDecorationModelInher if ( child.getBannerLeft() == null && parent.getBannerLeft() != null ) { - child.setBannerLeft( (Banner) parent.getBannerLeft().clone() ); + child.setBannerLeft( parent.getBannerLeft().clone()); rebaseBannerPaths( child.getBannerLeft(), urlContainer ); } if ( child.getBannerRight() == null && parent.getBannerRight() != null) { - child.setBannerRight( (Banner) parent.getBannerRight().clone() ); + child.setBannerRight( parent.getBannerRight().clone()); rebaseBannerPaths( child.getBannerRight(), urlContainer ); } if ( child.getPublishDate() == null && parent.getPublishDate() != null ) { - child.setPublishDate( (PublishDate) parent.getPublishDate().clone() ); + child.setPublishDate( parent.getPublishDate().clone()); } if ( child.getVersion() == null && parent.getVersion() != null ) { - child.setVersion( (Version) parent.getVersion().clone() ); + child.setVersion( parent.getVersion().clone()); } if ( child.getSkin() == null && parent.getSkin() != null ) { - child.setSkin( (Skin) parent.getSkin().clone() ); + child.setSkin( parent.getSkin().clone()); } child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(), parent.getPoweredBy(), urlContainer ) ); 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=1088610&r1=1088609&r2=1088610&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 Mon Apr 4 13:10:33 2011 @@ -157,7 +157,7 @@ public class DefaultSiteRenderer if ( moduleExcludes != null && moduleExcludes.containsKey( module.getParserId() ) ) { - addModuleFiles( moduleBasedir, module, (String) moduleExcludes.get( module.getParserId() ), + addModuleFiles( moduleBasedir, module, moduleExcludes.get( module.getParserId() ), files ); } else @@ -175,7 +175,7 @@ public class DefaultSiteRenderer if ( moduleExcludes != null && moduleExcludes.containsKey( module.getParserId() ) ) { addModuleFiles( module.getBasedir(), siteModuleManager.getSiteModule( module.getParserId() ), - (String) moduleExcludes.get( module.getParserId() ), files ); + moduleExcludes.get( module.getParserId() ), files ); } else { @@ -243,7 +243,7 @@ public class DefaultSiteRenderer if ( files.containsKey( key ) ) { - DocumentRenderer renderer = (DocumentRenderer) files.get( key ); + DocumentRenderer renderer = files.get( key ); RenderingContext originalContext = renderer.getRenderingContext();