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:50:39 UTC
svn commit: r1604426 -
/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:50:39 2014
New Revision: 1604426
URL: http://svn.apache.org/r1604426
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=1604426&r1=1604425&r2=1604426&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:50:39 2014
@@ -1333,13 +1333,7 @@ public class DefaultSiteTool
*/
private static String getDistMgmntSiteUrl( MavenProject project )
{
- DistributionManagement distMgmnt = project.getDistributionManagement();
- if ( distMgmnt != null && distMgmnt.getSite() != null && distMgmnt.getSite().getUrl() != null )
- {
- return urlEncode( distMgmnt.getSite().getUrl() );
- }
-
- return null;
+ return getDistMgmntSiteUrl( project.getDistributionManagement() );
}
/**
@@ -1350,11 +1344,14 @@ public class DefaultSiteTool
*/
private static String getDistMgmntSiteUrl( Model model )
{
- if ( model.getDistributionManagement() != null
- && model.getDistributionManagement().getSite() != null
- && model.getDistributionManagement().getSite().getUrl() != null )
+ return getDistMgmntSiteUrl( model.getDistributionManagement() );
+ }
+
+ private static String getDistMgmntSiteUrl( DistributionManagement distMgmnt )
+ {
+ if ( distMgmnt != null && distMgmnt.getSite() != null && distMgmnt.getSite().getUrl() != null )
{
- return urlEncode( model.getDistributionManagement().getSite().getUrl() );
+ return urlEncode( distMgmnt.getSite().getUrl() );
}
return null;