You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2001/12/14 21:04:17 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/traversers XSDSimpleTypeTraverser.java XSDElementTraverser.java XSDComplexTypeTraverser.java XSDAttributeTraverser.java
sandygao 01/12/14 12:04:17
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDSimpleTypeTraverser.java
XSDElementTraverser.java
XSDComplexTypeTraverser.java
XSDAttributeTraverser.java
Log:
1. Updating an error message for element and attribute traversers.
2. Error were not reported for unnamed global simple/complex types.
Revision Changes Path
1.5 +4 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSDSimpleTypeTraverser.java 2001/11/30 19:29:23 1.4
+++ XSDSimpleTypeTraverser.java 2001/12/14 20:04:16 1.5
@@ -115,7 +115,7 @@
*
* @author Elena Litani, IBM
* @author Neeraj Bajaj, Sun Microsystems, Inc.
- * @version $Id: XSDSimpleTypeTraverser.java,v 1.4 2001/11/30 19:29:23 sandygao Exp $
+ * @version $Id: XSDSimpleTypeTraverser.java,v 1.5 2001/12/14 20:04:16 sandygao Exp $
*/
class XSDSimpleTypeTraverser extends XSDAbstractTraverser {
@@ -140,6 +140,9 @@
String nameAtt = (String)attrValues[XSAttributeChecker.ATTIDX_NAME];
XSSimpleType type = traverseSimpleTypeDecl(elmNode, attrValues, schemaDoc, grammar, true);
fAttrChecker.returnAttrArray(attrValues, schemaDoc);
+
+ if (nameAtt == null)
+ reportSchemaError("s4s-att-must-appear", new Object[]{SchemaSymbols.ELT_SIMPLETYPE, SchemaSymbols.ATT_NAME});
return type;
}
1.9 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
Index: XSDElementTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSDElementTraverser.java 2001/11/30 19:29:23 1.8
+++ XSDElementTraverser.java 2001/12/14 20:04:16 1.9
@@ -98,7 +98,7 @@
*
* @author Sandy Gao, IBM
*
- * @version $Id: XSDElementTraverser.java,v 1.8 2001/11/30 19:29:23 sandygao Exp $
+ * @version $Id: XSDElementTraverser.java,v 1.9 2001/12/14 20:04:16 sandygao Exp $
*/
class XSDElementTraverser extends XSDAbstractTraverser {
@@ -386,7 +386,7 @@
// required attributes
if (nameAtt == null) {
if (isGlobal)
- reportSchemaError("s4s-att-must-appear", new Object[]{NO_NAME, SchemaSymbols.ATT_NAME});
+ reportSchemaError("s4s-att-must-appear", new Object[]{SchemaSymbols.ELT_ELEMENT, SchemaSymbols.ATT_NAME});
else
reportSchemaError("src-element.2.1", null);
nameAtt = NO_NAME;
1.7 +6 -2 xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Index: XSDComplexTypeTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSDComplexTypeTraverser.java 2001/11/30 19:29:23 1.6
+++ XSDComplexTypeTraverser.java 2001/12/14 20:04:16 1.7
@@ -92,7 +92,7 @@
* ((group | all | choice | sequence)?,
* ((attribute | attributeGroup)*, anyAttribute?))))
* </complexType>
- * @version $Id: XSDComplexTypeTraverser.java,v 1.6 2001/11/30 19:29:23 sandygao Exp $
+ * @version $Id: XSDComplexTypeTraverser.java,v 1.7 2001/12/14 20:04:16 sandygao Exp $
*/
class XSDComplexTypeTraverser extends XSDAbstractParticleTraverser {
@@ -168,7 +168,11 @@
String complexTypeName = (String) attrValues[XSAttributeChecker.ATTIDX_NAME];
XSComplexTypeDecl type = traverseComplexTypeDecl (complexTypeNode,
complexTypeName, attrValues, schemaDoc, grammar);
- grammar.addGlobalTypeDecl(type);
+ if (complexTypeName == null) {
+ reportSchemaError("s4s-att-must-appear", new Object[]{SchemaSymbols.ELT_COMPLEXTYPE, SchemaSymbols.ATT_NAME});
+ } else {
+ grammar.addGlobalTypeDecl(type);
+ }
// need to add the type to the grammar for later constraint checking
grammar.addComplexTypeDecl(type);
fAttrChecker.returnAttrArray(attrValues, schemaDoc);
1.7 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
Index: XSDAttributeTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSDAttributeTraverser.java 2001/11/30 19:29:23 1.6
+++ XSDAttributeTraverser.java 2001/12/14 20:04:16 1.7
@@ -94,7 +94,7 @@
*
* @author Sandy Gao, IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
- * @version $Id: XSDAttributeTraverser.java,v 1.6 2001/11/30 19:29:23 sandygao Exp $
+ * @version $Id: XSDAttributeTraverser.java,v 1.7 2001/12/14 20:04:16 sandygao Exp $
*/
class XSDAttributeTraverser extends XSDAbstractTraverser {
@@ -329,7 +329,7 @@
// required attributes
if (nameAtt == null) {
if (isGlobal)
- reportSchemaError("s4s-att-must-appear", new Object[]{NO_NAME, SchemaSymbols.ATT_NAME});
+ reportSchemaError("s4s-att-must-appear", new Object[]{SchemaSymbols.ELT_ATTRIBUTE, SchemaSymbols.ATT_NAME});
else
reportSchemaError("src-attribute.3.1", null);
nameAtt = NO_NAME;
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org