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 2011/05/02 22:00:25 UTC
svn commit: r1098769 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src:
main/java/org/apache/maven/report/projectinfo/ test/resources/plugin-configs/
Author: hboutemy
Date: Mon May 2 20:00:24 2011
New Revision: 1098769
URL: http://svn.apache.org/viewvc?rev=1098769&view=rev
Log:
[MPIR-221] support non-integer timezone offsets
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
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/test/resources/plugin-configs/project-team-plugin-config.xml
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=1098769&r1=1098768&r2=1098769&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java Mon May 2 20:00:24 2011
@@ -372,12 +372,12 @@ public class ProjectInfoReportUtils
return NumberUtils.isNumber( str );
}
- public static int toInt( String str, int defaultValue )
+ public static float toFloat( String str, float defaultValue )
{
if ( str.startsWith( "+" ) )
{
str = str.substring( 1 );
}
- return NumberUtils.toInt( str, defaultValue );
+ return NumberUtils.toFloat( str, defaultValue );
}
}
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=1098769&r1=1098768&r2=1098769&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 Mon May 2 20:00:24 2011
@@ -320,7 +320,7 @@ public class TeamListReport
else
{
// check if number is between -12 and +14
- int tz = ProjectInfoReportUtils.toInt( member.getTimezone().trim(), Integer.MIN_VALUE );
+ float tz = ProjectInfoReportUtils.toFloat( member.getTimezone().trim(), Integer.MIN_VALUE );
if ( tz == Integer.MIN_VALUE || !( tz >= -12 && tz <= 14 ) )
{
text( null );
@@ -330,7 +330,7 @@ public class TeamListReport
}
else
{
- text( member.getTimezone() );
+ text( member.getTimezone().trim() );
javascript.append( " offsetDate('" ).append( type ).append( "-" ).append( rowId ).append( "', '" );
javascript.append( member.getTimezone() ).append( "');" ).append( SystemUtils.LINE_SEPARATOR );
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/project-team-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/project-team-plugin-config.xml?rev=1098769&r1=1098768&r2=1098769&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/project-team-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/project-team-plugin-config.xml Mon May 2 20:00:24 2011
@@ -43,6 +43,11 @@ under the License.
</roles>
<timezone>-5</timezone>
</developer>
+ <developer>
+ <id>fractional</id>
+ <name>Mr Fraction</name>
+ <timezone>-5.5</timezone>
+ </developer>
</developers>
<build>
<plugins>