ankitp 2005/03/17 11:43:04
Modified: java/src/org/apache/xerces/impl/dv/xs YearDV.java
TimeDV.java DateTimeDV.java DateDV.java
MonthDayDV.java DayDV.java AbstractDateTimeDV.java
YearMonthDV.java MonthDV.java
Log:
changing where un-normalized values are saved.
Revision Changes Path
1.16 +4 -1
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearDV.java
Index: YearDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearDV.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- YearDV.java 17 Dec 2004 20:21:24 -0000 1.15
+++ YearDV.java 17 Mar 2005 19:43:03 -0000 1.16
@@ -79,6 +79,9 @@
//validate and normalize
validateDateTime(date);
+ //save unnormalized values
+ saveUnnormalized(date);
+
if ( date.utc!=0 && date.utc!='Z' ) {
normalize(date);
}
1.17 +5 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TimeDV.java 17 Dec 2004 20:21:24 -0000 1.16
+++ TimeDV.java 17 Mar 2005 19:43:03 -0000 1.17
@@ -69,7 +69,10 @@
validateDateTime(date);
- if ( date.utc!=0 ) {
+ //save unnormalized values
+ saveUnnormalized(date);
+
+ if ( date.utc!=0 && date.utc != 'Z') {
normalize(date);
}
date.position = 2;
1.15 +4 -1
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java
Index: DateTimeDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateTimeDV.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DateTimeDV.java 17 Dec 2004 20:21:24 -0000 1.14
+++ DateTimeDV.java 17 Mar 2005 19:43:03 -0000 1.15
@@ -69,6 +69,9 @@
//REVISIT: do we need SchemaDateTimeException?
validateDateTime(date);
+ //save unnormalized values
+ saveUnnormalized(date);
+
if (date.utc!=0 && date.utc!='Z') {
normalize(date);
}
1.18 +4 -1
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateDV.java
Index: DateDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DateDV.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DateDV.java 17 Dec 2004 20:21:24 -0000 1.17
+++ DateDV.java 17 Mar 2005 19:43:03 -0000 1.18
@@ -57,6 +57,9 @@
//REVISIT: do we need SchemaDateTimeException?
validateDateTime(date);
+ //save unnormalized values
+ saveUnnormalized(date);
+
if (date.utc!=0 && date.utc!='Z') {
normalize(date);
}
1.16 +5 -2
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java
Index: MonthDayDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDayDV.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MonthDayDV.java 17 Dec 2004 20:21:24 -0000 1.15
+++ MonthDayDV.java 17 Mar 2005 19:43:03 -0000 1.16
@@ -88,7 +88,10 @@
//validate and normalize
validateDateTime(date);
-
+
+ //save unnormalized values
+ saveUnnormalized(date);
+
if ( date.utc!=0 && date.utc!='Z' ) {
normalize(date);
}
1.16 +4 -1
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DayDV.java
Index: DayDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/DayDV.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DayDV.java 17 Dec 2004 20:21:24 -0000 1.15
+++ DayDV.java 17 Mar 2005 19:43:03 -0000 1.16
@@ -77,6 +77,9 @@
//validate and normalize
validateDateTime(date);
+ //save unnormalized values
+ saveUnnormalized(date);
+
if ( date.utc!=0 && date.utc!='Z' ) {
normalize(date);
}
1.37 +2 -4
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- AbstractDateTimeDV.java 10 Mar 2005 16:19:48 -0000 1.36
+++ AbstractDateTimeDV.java 17 Mar 2005 19:43:03 -0000 1.37
@@ -571,8 +571,6 @@
// should consider reorganizing it.
//
- //save unnormalized values
- saveUnnormalized(date);
//add minutes (from time zone)
int negate = -1;
@@ -625,7 +623,7 @@
/**
* @param date
*/
- private void saveUnnormalized(DateTimeData date) {
+ protected void saveUnnormalized(DateTimeData date) {
date.unNormYear = date.year;
date.unNormMonth = date.month;
date.unNormDay = date.day;
1.16 +4 -1
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java
Index: YearMonthDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/YearMonthDV.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- YearMonthDV.java 17 Dec 2004 20:21:24 -0000 1.15
+++ YearMonthDV.java 17 Mar 2005 19:43:03 -0000 1.16
@@ -66,6 +66,9 @@
validateDateTime(date);
+ //save unnormalized values
+ saveUnnormalized(date);
+
if ( date.utc!=0 && date.utc!='Z' ) {
normalize(date);
}
1.18 +4 -1
xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDV.java
Index: MonthDV.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/MonthDV.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MonthDV.java 17 Dec 2004 20:21:24 -0000 1.17
+++ MonthDV.java 17 Mar 2005 19:43:03 -0000 1.18
@@ -86,6 +86,9 @@
//validate and normalize
validateDateTime(date);
+ //save unnormalized values
+ saveUnnormalized(date);
+
if ( date.utc!=0 && date.utc!='Z' ) {
normalize(date);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
