You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/03/08 17:34:04 UTC
svn commit: r384258 -
/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
Author: evenisse
Date: Wed Mar 8 08:34:03 2006
New Revision: 384258
URL: http://svn.apache.org/viewcvs?rev=384258&view=rev
Log:
Allow more formats
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java?rev=384258&r1=384257&r2=384258&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java Wed Mar 8 08:34:03 2006
@@ -78,6 +78,10 @@
private static final SimpleDateFormat TIMESTAMP_FORMAT_2 = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
+ private static final SimpleDateFormat TIMESTAMP_FORMAT_3 = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss z" );
+
+ private static final SimpleDateFormat TIMESTAMP_FORMAT_4 = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss z" );
+
/**
* Date the changes were committed
*/
@@ -259,11 +263,12 @@
if ( !StringUtils.isEmpty( userDatePattern ) )
{
SimpleDateFormat format = new SimpleDateFormat( userDatePattern );
+
this.date = format.parse( date );
}
else
{
- this.date = TIMESTAMP_FORMAT_1.parse( date );
+ this.date = TIMESTAMP_FORMAT_3.parse( date );
}
}
catch ( ParseException e )
@@ -272,17 +277,31 @@
{
try
{
- this.date = TIMESTAMP_FORMAT_2.parse( date );
+ this.date = TIMESTAMP_FORMAT_3.parse( date );
}
catch ( ParseException pe )
{
try
{
- this.date = TIMESTAMP_FORMAT_2.parse( date );
+ this.date = TIMESTAMP_FORMAT_4.parse( date );
}
- catch ( ParseException ex )
+ catch ( ParseException pe1 )
{
- throw new IllegalArgumentException( "Unable to parse date: " + date );
+ try
+ {
+ this.date = TIMESTAMP_FORMAT_1.parse( date );
+ }
+ catch ( ParseException pe2 )
+ {
+ try
+ {
+ this.date = TIMESTAMP_FORMAT_2.parse( date );
+ }
+ catch ( ParseException pe3 )
+ {
+ throw new IllegalArgumentException( "Unable to parse date: " + date );
+ }
+ }
}
}
}
@@ -290,11 +309,25 @@
{
try
{
- this.date = TIMESTAMP_FORMAT_2.parse( date );
+ this.date = TIMESTAMP_FORMAT_4.parse( date );
}
- catch ( ParseException ex )
+ catch ( ParseException pe1 )
{
- throw new IllegalArgumentException( "Unable to parse date: " + date );
+ try
+ {
+ this.date = TIMESTAMP_FORMAT_1.parse( date );
+ }
+ catch ( ParseException pe2 )
+ {
+ try
+ {
+ this.date = TIMESTAMP_FORMAT_2.parse( date );
+ }
+ catch ( ParseException pe3 )
+ {
+ throw new IllegalArgumentException( "Unable to parse date: " + date );
+ }
+ }
}
}
}