Author: krosenvold
Date: Wed Oct 24 14:37:59 2012
New Revision: 1401712
URL: http://svn.apache.org/viewvc?rev=1401712&view=rev
Log:
o Fixed table headings
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1401712&r1=1401711&r2=1401712&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Wed Oct 24 14:37:59 2012
@@ -418,7 +418,8 @@ public class TeamListReport
{
return null;
}
- StringUtils.trim( email );
+ email = StringUtils.trim( email );
+ email = email.toLowerCase();
MessageDigest md;
try
{
@@ -454,6 +455,7 @@ public class TeamListReport
private String[] getRequiredContrHeaderArray( Map<String, Boolean>
requiredHeaders )
{
List<String> requiredArray = new ArrayList<String>();
+ String image = getI18nString( "contributors.image" );
String name = getI18nString( "contributors.name" );
String email = getI18nString( "contributors.email" );
String url = getI18nString( "contributors.url" );
@@ -463,8 +465,11 @@ public class TeamListReport
String timeZone = getI18nString( "contributors.timezone" );
String actualTime = getI18nString( "contributors.actualtime" );
String properties = getI18nString( "contributors.properties" );
-
- setRequiredArray( requiredHeaders, requiredArray, name, email,
url, organization, organizationUrl, roles,
+ if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE )
+ {
+ requiredArray.add( image );
+ }
+ setRequiredArray( requiredHeaders, requiredArray, image, name,
email, url, organization, organizationUrl, roles,
timeZone, actualTime, properties );
return requiredArray.toArray( new String[requiredArray.size()] );
@@ -478,6 +483,7 @@ public class TeamListReport
{
List<String> requiredArray = new ArrayList<String>();
+ String image = getI18nString( "developers.image" );
String id = getI18nString( "developers.id" );
String name = getI18nString( "developers.name" );
String email = getI18nString( "developers.email" );
@@ -489,12 +495,16 @@ public class TeamListReport
String actualTime = getI18nString( "developers.actualtime" );
String properties = getI18nString( "developers.properties" );
+ if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE )
+ {
+ requiredArray.add( image );
+ }
if ( requiredHeaders.get( ID ) == Boolean.TRUE )
{
requiredArray.add( id );
}
- setRequiredArray( requiredHeaders, requiredArray, name, email,
url, organization, organizationUrl, roles,
+ setRequiredArray( requiredHeaders, requiredArray, image, name,
email, url, organization, organizationUrl, roles,
timeZone, actualTime, properties );
return requiredArray.toArray( new String[requiredArray.size()] );
@@ -503,6 +513,7 @@ public class TeamListReport
/**
* @param requiredHeaders
* @param requiredArray
+ * @param image
* @param name
* @param email
* @param url
@@ -513,14 +524,10 @@ public class TeamListReport
* @param actualTime
* @param properties
*/
- private void setRequiredArray( Map<String, Boolean> requiredHeaders,
List<String> requiredArray, String name,
- String email, String url, String
organization, String organizationUrl,
+ private void setRequiredArray( Map<String, Boolean> requiredHeaders,
List<String> requiredArray, String image,
+ String name, String email, String url,
String organization, String organizationUrl,
String roles, String timeZone, String
actualTime, String properties )
{
- if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE )
- {
- requiredArray.add( name );
- }
if ( requiredHeaders.get( NAME ) == Boolean.TRUE )
{
requiredArray.add( name );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?rev=1401712&r1=1401711&r2=1401712&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
Wed Oct 24 14:37:59 2012
@@ -204,6 +204,7 @@ report.summary.download
report.team-list.contributors.actualtime = Actual
Time (GMT)
report.team-list.contributors.email = Email
report.team-list.contributors.intro = The
following additional people have contributed to this project through the way of
suggestions, patches or documentation.
+report.team-list.contributors.image = Image
report.team-list.contributors.name = Name
report.team-list.contributors.organization =
Organization
report.team-list.contributors.organizationurl =
Organization URL
@@ -215,6 +216,7 @@ report.team-list.contributors.url
report.team-list.description = This
document provides information on the members of this project. These are the
individuals who have contributed to the project in one form or another.
report.team-list.developers.actualtime = Actual
Time (GMT)
report.team-list.developers.email = Email
+report.team-list.developers.image = Image
report.team-list.developers.id = Id
report.team-list.developers.intro = The
following is a list of developers with commit privileges that have directly
contributed to the project in one way or another.
report.team-list.developers.name = Name
