elena 2003/01/20 05:55:57
Modified: java/src/org/apache/xerces/dom PSVIAttrNSImpl.java
PSVIElementNSImpl.java
java/src/org/apache/xerces/impl/xs AttributePSVImpl.java
ElementPSVImpl.java XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xs/identity
IdentityConstraint.java
java/src/org/apache/xerces/impl/xs/psvi XSIDCDefinition.java
java/src/org/apache/xerces/xni/psvi ItemPSVI.java
Log:
Update XS API according to the erratum: E1-14 & E1-12
Revision Changes Path
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/PSVIAttrNSImpl.java
Index: PSVIAttrNSImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/PSVIAttrNSImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PSVIAttrNSImpl.java 17 Jul 2002 20:07:36 -0000 1.1
+++ PSVIAttrNSImpl.java 20 Jan 2003 13:55:56 -0000 1.2
@@ -105,7 +105,7 @@
protected short fValidationAttempted = AttributePSVI.VALIDATION_NONE;
/** validity: valid, invalid, unknown */
- protected short fValidity = AttributePSVI.VALIDITY_UNKNOWN;
+ protected short fValidity = AttributePSVI.VALIDITY_NOTKNOWN;
/** error codes */
protected StringList fErrorCodes = null;
1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/PSVIElementNSImpl.java
Index: PSVIElementNSImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/PSVIElementNSImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PSVIElementNSImpl.java 17 Jul 2002 20:07:36 -0000 1.1
+++ PSVIElementNSImpl.java 20 Jan 2003 13:55:56 -0000 1.2
@@ -113,7 +113,7 @@
protected short fValidationAttempted = ElementPSVI.VALIDATION_NONE;
/** validity: valid, invalid, unknown */
- protected short fValidity = ElementPSVI.VALIDITY_UNKNOWN;
+ protected short fValidity = ElementPSVI.VALIDITY_NOTKNOWN;
/** error codes */
protected StringList fErrorCodes = null;
1.15 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/AttributePSVImpl.java
Index: AttributePSVImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/AttributePSVImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AttributePSVImpl.java 18 Sep 2002 21:58:29 -0000 1.14
+++ AttributePSVImpl.java 20 Jan 2003 13:55:56 -0000 1.15
@@ -95,7 +95,7 @@
protected short fValidationAttempted = AttributePSVI.VALIDATION_NONE;
/** validity: valid, invalid, unknown */
- protected short fValidity = AttributePSVI.VALIDITY_UNKNOWN;
+ protected short fValidity = AttributePSVI.VALIDITY_NOTKNOWN;
/** error codes */
protected String[] fErrorCodes = null;
@@ -222,7 +222,7 @@
fSpecified = false;
fMemberType = null;
fValidationAttempted = AttributePSVI.VALIDATION_NONE;
- fValidity = AttributePSVI.VALIDITY_UNKNOWN;
+ fValidity = AttributePSVI.VALIDITY_NOTKNOWN;
fErrorCodes = null;
fValidationContext = null;
}
1.20 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/ElementPSVImpl.java
Index: ElementPSVImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/ElementPSVImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElementPSVImpl.java 18 Sep 2002 21:58:29 -0000 1.19
+++ ElementPSVImpl.java 20 Jan 2003 13:55:56 -0000 1.20
@@ -106,7 +106,7 @@
protected short fValidationAttempted = ElementPSVI.VALIDATION_NONE;
/** validity: valid, invalid, unknown */
- protected short fValidity = ElementPSVI.VALIDITY_UNKNOWN;
+ protected short fValidity = ElementPSVI.VALIDITY_NOTKNOWN;
/** error codes */
protected String[] fErrorCodes = null;
@@ -261,7 +261,7 @@
fNotation = null;
fMemberType = null;
fValidationAttempted = ElementPSVI.VALIDATION_NONE;
- fValidity = ElementPSVI.VALIDITY_UNKNOWN;
+ fValidity = ElementPSVI.VALIDITY_NOTKNOWN;
fErrorCodes = null;
fValidationContext = null;
fNormalizedValue = null;
1.132 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Index: XMLSchemaValidator.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- XMLSchemaValidator.java 17 Jan 2003 19:43:01 -0000 1.131
+++ XMLSchemaValidator.java 20 Jan 2003 13:55:56 -0000 1.132
@@ -2261,7 +2261,7 @@
}
else {
// PSVI: validity
- fCurrentPSVI.fValidity = ElementPSVI.VALIDITY_UNKNOWN;
+ fCurrentPSVI.fValidity = ElementPSVI.VALIDITY_NOTKNOWN;
// Discard the current context: ignore any error happened within
// the sub-elements/attributes of this element, because those
// errors won't affect the validity of the parent elements.
1.7 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java
Index: IdentityConstraint.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/IdentityConstraint.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IdentityConstraint.java 14 Jan 2003 20:21:46 -0000 1.6
+++ IdentityConstraint.java 20 Jan 2003 13:55:57 -0000 1.7
@@ -246,7 +246,7 @@
/**
* Optional. Annotation.
*/
- public XSAnnotation getAnnotation() {
+ public XSObjectList getAnnotations() {
// REVISIT: SCAPI: to implement
return null;
}
1.2 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/xs/psvi/XSIDCDefinition.java
Index: XSIDCDefinition.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/psvi/XSIDCDefinition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSIDCDefinition.java 14 Jan 2003 20:21:46 -0000 1.1
+++ XSIDCDefinition.java 20 Jan 2003 13:55:57 -0000 1.2
@@ -99,8 +99,8 @@
public XSIDCDefinition getRefKey();
/**
- * Optional. An [annotation].
+ * A set of [annotations].
*/
- public XSAnnotation getAnnotation();
+ public XSObjectList getAnnotations();
}
1.7 +2 -2 xml-xerces/java/src/org/apache/xerces/xni/psvi/ItemPSVI.java
Index: ItemPSVI.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/xni/psvi/ItemPSVI.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ItemPSVI.java 17 Jun 2002 18:41:46 -0000 1.6
+++ ItemPSVI.java 20 Jan 2003 13:55:57 -0000 1.7
@@ -72,7 +72,7 @@
been performed or that a strict assessment of validity could
not be performed
*/
- public static final short VALIDITY_UNKNOWN = 0;
+ public static final short VALIDITY_NOTKNOWN = 0;
/** Validity value indicating that validation has been strictly
assessed and the element in question is invalid according to the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
