sandygao 2003/01/20 09:44:41
Modified: java/src/org/apache/xerces/impl/msg
XMLSchemaMessages.properties
java/src/org/apache/xerces/impl/xs/traversers
XSDSimpleTypeTraverser.java
Log:
Error code change as per Erratum E1-15.
Revision Changes Path
1.58 +4 -5
xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
Index: XMLSchemaMessages.properties
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- XMLSchemaMessages.properties 20 Jan 2003 16:57:52 -0000 1.57
+++ XMLSchemaMessages.properties 20 Jan 2003 17:44:41 -0000 1.58
@@ -199,7 +199,9 @@
cos-particle-restrict.2 = cos-particle-restrict.2: Forbidden particle
restriction: ''{0}''.
cos-seq-range = cos-seq-range: error.
cos-st-derived-ok = cos-st-derived-ok: error.
- cos-st-restricts = cos-st-restricts: error.
+ cos-st-restricts.1.1 = cos-st-restricts.1.1: The {base type definition}
''{0}'' must be an atomic simple type definition or a built-in primitive datatype.
+ cos-st-restricts.2.3.1.1 = cos-st-restricts.2.3.1.1: The {final} of the
{item type definition} ''{0}'' must not contain list.
+ cos-st-restricts.3.3.1.1 = cos-st-restricts.3.3.1.1: The {member type
definitions} ''{0}'' must have a {final} which does not contain union.
cos-valid-default.1 = cos-valid-default.1: error.
cos-valid-default.2.1 = cos-valid-default.2.1: Element ''{0}'' has a value
constraint and must have a mixed or simple content model.
cos-valid-default.2.2.1 = cos-valid-default.2.2.1: error.
@@ -300,9 +302,6 @@
st-props-correct.1 = st-props-correct.1: error.
st-props-correct.2 = st-props-correct.2: circular definitions detected for
type ''{0}''.
st-props-correct.3 = st-props-correct.3: {final} of the {base type
definition} contains restriction.
- st-props-correct.4.1 = st-props-correct.4.1: The type definition is not a
valid restriction with repect to the base type ''{0}''.
- st-props-correct.4.2.1 = st-props-correct.4.2.1: {final} of the {base type
definition} contains list.
- st-props-correct.4.2.2 = st-props-correct.4.2.2: {final} of the {base type
definition} contains union.
totalDigits-valid-restriction = totalDigits-valid-restriction: totalDigits
value = ''{0}'' must be <= that of the base type ''{1}''.
whiteSpace-valid-restriction.1 = whiteSpace-valid-restriction.1: It is an
error if whiteSpace = ''preserve'' or ''replace'' and fBase.whiteSpace = ''collapse''.
whiteSpace-valid-restriction.2 = whiteSpace-valid-restriction.2: It is an
error if whiteSpace = ''preserve'' and fBase.whiteSpace = ''replace''.
1.21 +4 -4
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java
Index: XSDSimpleTypeTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XSDSimpleTypeTraverser.java 14 Jan 2003 20:21:48 -0000 1.20
+++ XSDSimpleTypeTraverser.java 20 Jan 2003 17:44:41 -0000 1.21
@@ -417,7 +417,7 @@
checkBuiltIn(refName, schemaDoc.fTargetNamespace)) {
return null;
}
- reportSchemaError("st-props-correct.4.1", new
Object[]{baseTypeStr.rawname}, elm);
+ reportSchemaError("cos-st-restricts.1.1", new
Object[]{baseTypeStr.rawname}, elm);
return SchemaGrammar.fAnySimpleType;
}
if ((baseType.getFinal() & baseRefContext) != 0) {
@@ -425,10 +425,10 @@
reportSchemaError("st-props-correct.3", new
Object[]{baseTypeStr.rawname}, elm);
}
else if (baseRefContext == XSConstants.DERIVATION_LIST) {
- reportSchemaError("st-props-correct.4.2.1", new
Object[]{baseTypeStr.rawname}, elm);
+ reportSchemaError("cos-st-restricts.2.3.1.1", new
Object[]{baseTypeStr.rawname}, elm);
}
else if (baseRefContext == XSConstants.DERIVATION_UNION) {
- reportSchemaError("st-props-correct.4.2.2", new
Object[]{baseTypeStr.rawname}, elm);
+ reportSchemaError("cos-st-restricts.3.3.1.1", new
Object[]{baseTypeStr.rawname}, elm);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
