You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/11/27 14:59:17 UTC
svn commit: r1642157 -
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Author: michaelo
Date: Thu Nov 27 13:59:16 2014
New Revision: 1642157
URL: http://svn.apache.org/r1642157
Log:
[MPIR-311] Specific SCM intro is missing if dev connection is given but not anonymous connection
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=1642157&r1=1642156&r2=1642157&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Thu Nov 27 13:59:16 2014
@@ -220,7 +220,7 @@ public class ScmReport
ScmRepository devRepository = getScmRepository( devConnection );
// Overview section
- renderOverviewSection( anonymousRepository );
+ renderOverviewSection( anonymousRepository, devRepository );
// Web access section
renderWebAccessSection( webAccessUrl );
@@ -242,48 +242,49 @@ public class ScmReport
* Render the overview section
*
* @param anonymousRepository the anonymous repository
+ * @param devRepository the developer repository
*/
- private void renderOverviewSection( ScmRepository anonymousRepository )
+ private void renderOverviewSection( ScmRepository anonymousRepository, ScmRepository devRepository )
{
startSection( getI18nString( "overview.title" ) );
- if ( isScmSystem( anonymousRepository, "clearcase" ) )
+ if ( isScmSystem( anonymousRepository, "clearcase" ) || isScmSystem( devRepository, "clearcase" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "clearcase.intro" ) );
sink.paragraph_();
}
- else if ( isScmSystem( anonymousRepository, "cvs" ) )
+ else if ( isScmSystem( anonymousRepository, "cvs" ) || isScmSystem( devRepository, "cvs" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "cvs.intro" ) );
sink.paragraph_();
}
- else if ( isScmSystem( anonymousRepository, "git" ) )
+ else if ( isScmSystem( anonymousRepository, "git" ) || isScmSystem( devRepository, "git" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "git.intro" ) );
sink.paragraph_();
}
- else if ( isScmSystem( anonymousRepository, "hg" ) )
+ else if ( isScmSystem( anonymousRepository, "hg" ) || isScmSystem( devRepository, "hg" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "hg.intro" ) );
sink.paragraph_();
}
- else if ( isScmSystem( anonymousRepository, "perforce" ) )
+ else if ( isScmSystem( anonymousRepository, "perforce" ) || isScmSystem( devRepository, "perforce" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "perforce.intro" ) );
sink.paragraph_();
}
- else if ( isScmSystem( anonymousRepository, "starteam" ) )
+ else if ( isScmSystem( anonymousRepository, "starteam" ) || isScmSystem( devRepository, "starteam" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "starteam.intro" ) );
sink.paragraph_();
}
- else if ( isScmSystem( anonymousRepository, "svn" ) )
+ else if ( isScmSystem( anonymousRepository, "svn" ) || isScmSystem( devRepository, "svn" ) )
{
sink.paragraph();
linkPatternedText( getI18nString( "svn.intro" ) );