You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/21 17:47:13 UTC
svn commit: r1604425 -
/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: hboutemy
Date: Sat Jun 21 15:47:12 2014
New Revision: 1604425
URL: http://svn.apache.org/r1604425
Log:
code simplification
Modified:
maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1604425&r1=1604424&r2=1604425&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Jun 21 15:47:12 2014
@@ -1105,9 +1105,10 @@ public class DefaultSiteTool
}
// Merge the parent and child site descriptors
- assembler.assembleModelInheritance( name, decoration, parent, getDistMgmntSiteUrl( project ),
- getDistMgmntSiteUrl( parentProject ) == null
- ? getDistMgmntSiteUrl( project ) : getDistMgmntSiteUrl( parentProject ) );
+ String projectDistMgmnt = getDistMgmntSiteUrl( project );
+ String parentDistMgmnt = getDistMgmntSiteUrl( parentProject );
+ assembler.assembleModelInheritance( name, decoration, parent, projectDistMgmnt,
+ parentDistMgmnt == null ? projectDistMgmnt : parentDistMgmnt );
}
if ( decoration != null && decoration.getSkin() != null )
@@ -1332,11 +1333,10 @@ public class DefaultSiteTool
*/
private static String getDistMgmntSiteUrl( MavenProject project )
{
- if ( project.getDistributionManagement() != null
- && project.getDistributionManagement().getSite() != null
- && project.getDistributionManagement().getSite().getUrl() != null )
+ DistributionManagement distMgmnt = project.getDistributionManagement();
+ if ( distMgmnt != null && distMgmnt.getSite() != null && distMgmnt.getSite().getUrl() != null )
{
- return urlEncode( project.getDistributionManagement().getSite().getUrl() );
+ return urlEncode( distMgmnt.getSite().getUrl() );
}
return null;