You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2006/12/13 00:33:03 UTC
svn commit: r486413 - in /xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans:
GDateBuilder.java GDurationBuilder.java XmlCursor.java
Author: cezar
Date: Tue Dec 12 15:33:02 2006
New Revision: 486413
URL: http://svn.apache.org/viewvc?view=rev&rev=486413
Log:
Fixed a couple of bugs related to GDuration serialization and adding a
duration to a gdate that has to skip year zero.
Modified:
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCursor.java
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java?view=diff&rev=486413&r1=486412&r2=486413
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java Tue Dec 12 15:33:02 2006
@@ -803,7 +803,10 @@
// Add months and years
temp = _M + sign * month;
_M = _modulo(temp, 1, 13);
+ boolean yearWasLessThanZero = _CY < 0;
_CY = _CY + sign * year + (int)_fQuotient(temp, 1, 13);
+ if (yearWasLessThanZero && _CY>=0)
+ _CY +=1;
// In new month, day may need to be pegged before proceeding
if (hasDay())
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java?view=diff&rev=486413&r1=486412&r2=486413
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java Tue Dec 12 15:33:02 2006
@@ -579,7 +579,8 @@
BigDecimal s = duration.getFraction();
if (duration.getSecond() != 0)
s = s.add(BigDecimal.valueOf(duration.getSecond()));
- message.append(s);
+ // todo when upgrade to 1.5 message.append(s.stripTrailingZeros().toPlainString());
+ message.append(s.stripTrailingZeros());
message.append('S');
}
else if (duration.getSecond() != 0)
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCursor.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCursor.java?view=diff&rev=486413&r1=486412&r2=486413
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCursor.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCursor.java Tue Dec 12 15:33:02 2006
@@ -716,7 +716,7 @@
* @return The new current token type.
*/
- TokenType toFirstContentToken ( );
+ TokenType toFirstContentToken ( );
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org