You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xmlbeans-cvs@xml.apache.org by da...@apache.org on 2004/01/23 23:37:43 UTC
cvs commit: xml-xmlbeans/v1/test/src/drt/drtcases GDateTests.java
daveremy 2004/01/23 14:37:43
Modified: v1/src/xmlpublic/org/apache/xmlbeans Tag:
xmlbeans-1-0-1_branch GDateBuilder.java
v1/test/src/drt/drtcases Tag: xmlbeans-1-0-1_branch
GDateTests.java
Log:
Submitted by: Kevin Krouse
Reviewed by: David Bau
Handle normalizing timezones against "+00:00" and "-00:00".
DRTs: passed
Revision Changes Path
No revision
No revision
1.3.2.1 +2 -2 xml-xmlbeans/v1/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java
Index: GDateBuilder.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- GDateBuilder.java 4 Nov 2003 16:09:00 -0000 1.3
+++ GDateBuilder.java 23 Jan 2004 22:37:42 -0000 1.3.2.1
@@ -688,9 +688,9 @@
{
if (!((tzSign == 0 && tzHour == 0 && tzMinute == 0) ||
((tzSign == -1 || tzSign == 1) &&
- (tzHour == 0 && tzMinute > 0 || tzHour > 0 && tzMinute >= 0) &&
+ (tzHour >= 0 && tzMinute >= 0) &&
(tzHour == 14 && tzMinute == 0 || tzHour < 14 && tzMinute < 60))))
- throw new IllegalArgumentException("time zone must be betwen -14:00 and +14:00");
+ throw new IllegalArgumentException("time zone must be between -14:00 and +14:00");
if (!hasTimeZone() || !hasTime())
throw new IllegalStateException("cannot normalize time zone without both time and timezone");
No revision
No revision
1.3.2.1 +2 -0 xml-xmlbeans/v1/test/src/drt/drtcases/GDateTests.java
Index: GDateTests.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/test/src/drt/drtcases/GDateTests.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- GDateTests.java 4 Nov 2003 16:09:00 -0000 1.3
+++ GDateTests.java 23 Jan 2004 22:37:43 -0000 1.3.2.1
@@ -486,6 +486,8 @@
public static void testAPI() throws Exception
{
GDateBuilder builder = new GDateBuilder("1970-12-20T04:14:22Z");
+ builder.normalizeToTimeZone(1, 0, 0);
+ Assert.assertEquals("1970-12-20T04:14:22+00:00", builder.toString());
builder.setTimeZone(615);
Assert.assertEquals("1970-12-20T04:14:22+10:15", builder.toString());
builder.setTimeZone(-345);
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org