You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@apache.org on 2005/04/01 16:50:56 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/dv/xs TimeDV.java AbstractDateTimeDV.java
ankitp 2005/04/01 06:50:56
Modified: java/src/org/apache/xerces/impl/dv/xs TimeDV.java
AbstractDateTimeDV.java
Log:
fix time comparison
Revision Changes Path
1.18 +1 -21 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TimeDV.java 17 Mar 2005 19:43:03 -0000 1.17
+++ TimeDV.java 1 Apr 2005 14:50:56 -0000 1.18
@@ -96,24 +96,4 @@
append(message, (char)date.utc, 0);
return message.toString();
}
-
- /* (non-Javadoc)
- * @see org.apache.xerces.impl.dv.xs.AbstractDateTimeDV#compareOrder2(org.apache.xerces.impl.dv.xs.AbstractDateTimeDV.DateTimeData, org.apache.xerces.impl.dv.xs.AbstractDateTimeDV.DateTimeData)
- */
- protected short compareOrder2(DateTimeData date1, DateTimeData date2) {
- if (date1.hour < date2.hour)
- return -1;
- if (date1.hour > date2.hour)
- return 1;
- if (date1.minute < date2.minute)
- return -1;
- if (date1.minute > date2.minute)
- return 1;
- if (date1.second < date2.second)
- return -1;
- if (date1.second > date2.second)
- return 1;
- return 0;
- }
-
}
1.38 +2 -6 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java
Index: AbstractDateTimeDV.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AbstractDateTimeDV.java 17 Mar 2005 19:43:03 -0000 1.37
+++ AbstractDateTimeDV.java 1 Apr 2005 14:50:56 -0000 1.38
@@ -94,7 +94,7 @@
*/
protected short compareDates(DateTimeData date1, DateTimeData date2, boolean strict) {
if (date1.utc == date2.utc) {
- return compareOrder2(date1, date2);
+ return compareOrder(date1, date2);
}
short c1, c2;
@@ -166,10 +166,6 @@
}
- protected short compareOrder2(DateTimeData date1, DateTimeData date2) {
- return compareOrder(date1, date2);
- }
-
/**
* Given normalized values, determines order-relation
* between give date/time objects.
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org