ankitp 2004/11/25 11:24:06
Modified: java/src/org/apache/xerces/impl/dv/xs TimeDV.java
DurationDV.java
Log:
bug fixes for toString methods
Revision Changes Path
1.13 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/TimeDV.java
Index: TimeDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/TimeDV.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TimeDV.java 6 Oct 2004 14:56:47 -0000 1.12
+++ TimeDV.java 25 Nov 2004 19:24:06 -0000 1.13
@@ -85,7 +85,7 @@
StringBuffer message = new StringBuffer(16);
append(message, date.hour, 2);
message.append(':');
- append(message, date.month, 2);
+ append(message, date.minute, 2);
message.append(':');
append(message, date.second);
1.14 +9 -10
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DurationDV.java
Index: DurationDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DurationDV.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DurationDV.java 6 Oct 2004 14:56:46 -0000 1.13
+++ DurationDV.java 25 Nov 2004 19:24:06 -0000 1.14
@@ -338,24 +338,23 @@
protected String dateToString(DateTimeData date) {
StringBuffer message = new StringBuffer(30);
- int negate = 1;
- if ( date.year<0 ) {
+ if ( date.year<0 || date.month<0 || date.day<0
+ || date.hour<0 || date.minute<0 || date.second<0) {
message.append('-');
- negate=-1;
}
message.append('P');
- message.append(negate * date.year);
+ message.append((date.year < 0?-1:1) * date.year);
message.append('Y');
- message.append(negate * date.month);
+ message.append((date.month < 0?-1:1) * date.month);
message.append('M');
- message.append(negate * date.day);
+ message.append((date.day < 0?-1:1) * date.day);
message.append('D');
message.append('T');
- message.append(negate * date.hour);
+ message.append((date.hour < 0?-1:1) * date.hour);
message.append('H');
- message.append(negate * date.minute);
+ message.append((date.minute < 0?-1:1) * date.minute);
message.append('M');
- message.append(negate * date.second);
+ message.append((date.second < 0?-1:1) * date.second);
message.append('S');
return message.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
