mrglavas 2004/12/19 21:43:37
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDAbstractParticleTraverser.java
XSDAttributeGroupTraverser.java XSDHandler.java
XSDSimpleTypeTraverser.java
XSDAbstractTraverser.java
XSDAbstractIDConstraintTraverser.java
XSDElementTraverser.java XSDGroupTraverser.java
XSDWildcardTraverser.java XSDNotationTraverser.java
XSDComplexTypeTraverser.java
XSDAttributeTraverser.java
Log:
Enable validation of synthetic annotations. When both features:
"http://apache.org/xml/features/validate-annotations";
and "http://apache.org/xml/features/generate-synthetic-annotations"; are true
then synthetic annotations will be validated.
Revision Changes Path
1.20 +5 -5
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
Index: XSDAbstractParticleTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XSDAbstractParticleTraverser.java 16 Dec 2004 16:45:20 -0000 1.19
+++ XSDAbstractParticleTraverser.java 20 Dec 2004 05:43:36 -0000 1.20
@@ -70,8 +70,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(allDecl);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(allDecl, text,
attrValues, false, schemaDoc);
}
}
String childName = null;
@@ -197,8 +197,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(decl);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(decl, text,
attrValues, false, schemaDoc);
}
}
1.15 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
Index: XSDAttributeGroupTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSDAttributeGroupTraverser.java 16 Dec 2004 16:45:20 -0000 1.14
+++ XSDAttributeGroupTraverser.java 20 Dec 2004 05:43:36 -0000 1.15
@@ -124,8 +124,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(elmNode);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(elmNode, text,
attrValues, false, schemaDoc);
}
}
1.84 +11 -10
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Index: XSDHandler.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- XSDHandler.java 16 Dec 2004 16:45:20 -0000 1.83
+++ XSDHandler.java 20 Dec 2004 05:43:36 -0000 1.84
@@ -721,8 +721,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(child);
- if(text != null) {
-
sg.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(text,
importAttrs, true, currSchemaInfo));
+ if (text != null) {
+
sg.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(child, text,
importAttrs, true, currSchemaInfo));
}
}
fAttributeChecker.returnAttrArray(importAttrs,
currSchemaInfo);
@@ -795,8 +795,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(child);
- if(text != null) {
-
sg.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(text,
includeAttrs, true, currSchemaInfo));
+ if (text != null) {
+
sg.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(child, text,
includeAttrs, true, currSchemaInfo));
}
}
}
@@ -813,8 +813,8 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(child);
- if(text != null) {
-
sg.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(text,
includeAttrs, true, currSchemaInfo));
+ if (text != null) {
+
sg.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(child, text,
includeAttrs, true, currSchemaInfo));
}
}
// catch all other content errors later
@@ -1113,10 +1113,11 @@
}
} // end for
- if(!sawAnnotation) {
+ if (!sawAnnotation) {
String text = DOMUtil.getSyntheticAnnotation(currRoot);
- if(text != null)
-
currSG.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(text,
currSchemaDoc.getSchemaAttrs(), true, currSchemaDoc));
+ if (text != null) {
+
currSG.addAnnotation(fElementTraverser.traverseSyntheticAnnotation(currRoot,
text, currSchemaDoc.getSchemaAttrs(), true, currSchemaDoc));
+ }
}
/** Collect annotation information for validation. **/
1.30 +10 -8
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XSDSimpleTypeTraverser.java 16 Dec 2004 16:45:20 -0000 1.29
+++ XSDSimpleTypeTraverser.java 20 Dec 2004 05:43:36 -0000 1.30
@@ -148,8 +148,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(simpleTypeDecl);
- if(text != null) {
- XSAnnotationImpl annotation =
traverseSyntheticAnnotation(text, attrValues, false, schemaDoc);
+ if (text != null) {
+ XSAnnotationImpl annotation =
traverseSyntheticAnnotation(simpleTypeDecl, text, attrValues, false, schemaDoc);
annotations = new XSAnnotationImpl[] {annotation};
}
}
@@ -200,9 +200,10 @@
//check content (annotation?, ...)
if (content != null &&
DOMUtil.getLocalName(content).equals(SchemaSymbols.ELT_ANNOTATION)) {
XSAnnotationImpl annotation = traverseAnnotationDecl(content,
contentAttrs, false, schemaDoc);
- if(annotation != null ) {
- if(annotations == null)
+ if (annotation != null ) {
+ if(annotations == null) {
annotations = new XSAnnotationImpl [] {annotation};
+ }
else {
XSAnnotationImpl [] tempArray = new XSAnnotationImpl[2];
tempArray[0] = annotations[0];
@@ -214,10 +215,11 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(child);
- if(text != null) {
- XSAnnotationImpl annotation =
traverseSyntheticAnnotation(text, contentAttrs, false, schemaDoc);
- if(annotations == null)
+ if (text != null) {
+ XSAnnotationImpl annotation =
traverseSyntheticAnnotation(child, text, contentAttrs, false, schemaDoc);
+ if (annotations == null) {
annotations = new XSAnnotationImpl [] {annotation};
+ }
else {
XSAnnotationImpl [] tempArray = new XSAnnotationImpl[2];
tempArray[0] = annotations[0];
1.41 +53 -46
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Index: XSDAbstractTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XSDAbstractTraverser.java 16 Dec 2004 16:45:20 -0000 1.40
+++ XSDAbstractTraverser.java 20 Dec 2004 05:43:36 -0000 1.41
@@ -159,8 +159,8 @@
StringBuffer localStrBuffer = new StringBuffer(64);
localStrBuffer.append(" ");
// Vector should contain rawname value pairs
- int i=0;
- while(i<annotationLocalAttrs.size()) {
+ int i = 0;
+ while (i < annotationLocalAttrs.size()) {
String rawname = (String)annotationLocalAttrs.elementAt(i++);
int colonIndex = rawname.indexOf(':');
String prefix, localpart;
@@ -208,8 +208,8 @@
}
- XSAnnotationImpl traverseSyntheticAnnotation(String initialContent,
Object[] parentAttrs,
- boolean isGlobal, XSDocumentInfo schemaDoc) {
+ XSAnnotationImpl traverseSyntheticAnnotation(Element annotationParent,
String initialContent,
+ Object[] parentAttrs, boolean isGlobal, XSDocumentInfo
schemaDoc) {
String contents = initialContent;
@@ -218,12 +218,12 @@
// fish out local attributes passed from parent
Vector annotationLocalAttrs =
(Vector)parentAttrs[XSAttributeChecker.ATTIDX_NONSCHEMA];
// optimize for case where there are no local attributes
- if(annotationLocalAttrs != null && !annotationLocalAttrs.isEmpty()) {
+ if (annotationLocalAttrs != null && !annotationLocalAttrs.isEmpty())
{
StringBuffer localStrBuffer = new StringBuffer(64);
localStrBuffer.append(" ");
// Vector should contain rawname value pairs
- int i=0;
- while(i<annotationLocalAttrs.size()) {
+ int i = 0;
+ while (i < annotationLocalAttrs.size()) {
String rawname = (String)annotationLocalAttrs.elementAt(i++);
int colonIndex = rawname.indexOf(':');
String prefix, localpart;
@@ -253,8 +253,15 @@
contentBuffer.append(contents.substring(0,annotationTokenEnd));
contentBuffer.append(localStrBuffer.toString());
contentBuffer.append(contents.substring(annotationTokenEnd,
contents.length()));
- return new XSAnnotationImpl(contentBuffer.toString(), grammar);
+ final String annotation = contentBuffer.toString();
+ if (fValidateAnnotations) {
+ schemaDoc.addAnnotation(new XSAnnotationInfo(annotation,
annotationParent));
+ }
+ return new XSAnnotationImpl(annotation, grammar);
} else {
+ if (fValidateAnnotations) {
+ schemaDoc.addAnnotation(new XSAnnotationInfo(contents,
annotationParent));
+ }
return new XSAnnotationImpl(contents, grammar);
}
}
@@ -331,8 +338,8 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(content);
- if(text != null) {
-
enumAnnotations.add(enumAnnotations.getLength()-1,
traverseSyntheticAnnotation(text, attrs, false, schemaDoc));
+ if (text != null) {
+
enumAnnotations.add(enumAnnotations.getLength()-1,
traverseSyntheticAnnotation(content, text, attrs, false, schemaDoc));
}
}
if (child !=null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
@@ -341,8 +348,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(content);
- if(text != null) {
- enumAnnotations.add(enumAnnotations.getLength() - 1,
traverseSyntheticAnnotation(text, attrs, false, schemaDoc));
+ if (text != null) {
+ enumAnnotations.add(enumAnnotations.getLength() - 1,
traverseSyntheticAnnotation(content, text, attrs, false, schemaDoc));
}
}
}
@@ -496,43 +503,43 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(content);
- if(text != null) {
- XSAnnotationImpl annotation =
traverseSyntheticAnnotation(text, attrs, false, schemaDoc);
+ if (text != null) {
+ XSAnnotationImpl annotation =
traverseSyntheticAnnotation(content, text, attrs, false, schemaDoc);
switch (currentFacet) {
- case XSSimpleType.FACET_MINLENGTH:
- xsFacets.minLengthAnnotation = annotation;
- break;
- case XSSimpleType.FACET_MAXLENGTH:
- xsFacets.maxLengthAnnotation = annotation;
- break;
- case XSSimpleType.FACET_MAXEXCLUSIVE:
- xsFacets.maxExclusiveAnnotation = annotation;
- break;
- case XSSimpleType.FACET_MAXINCLUSIVE:
- xsFacets.maxInclusiveAnnotation = annotation;
- break;
- case XSSimpleType.FACET_MINEXCLUSIVE:
- xsFacets.minExclusiveAnnotation = annotation;
- break;
- case XSSimpleType.FACET_MININCLUSIVE:
- xsFacets.minInclusiveAnnotation = annotation;
- break;
- case XSSimpleType.FACET_TOTALDIGITS:
- xsFacets.totalDigitsAnnotation = annotation;
- break;
- case XSSimpleType.FACET_FRACTIONDIGITS:
- xsFacets.fractionDigitsAnnotation =
annotation;
- break;
- case XSSimpleType.FACET_WHITESPACE:
- xsFacets.whiteSpaceAnnotation = annotation;
- break;
- case XSSimpleType.FACET_LENGTH:
- xsFacets.lengthAnnotation = annotation;
- break;
+ case XSSimpleType.FACET_MINLENGTH:
+ xsFacets.minLengthAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_MAXLENGTH:
+ xsFacets.maxLengthAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_MAXEXCLUSIVE:
+ xsFacets.maxExclusiveAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_MAXINCLUSIVE:
+ xsFacets.maxInclusiveAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_MINEXCLUSIVE:
+ xsFacets.minExclusiveAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_MININCLUSIVE:
+ xsFacets.minInclusiveAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_TOTALDIGITS:
+ xsFacets.totalDigitsAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_FRACTIONDIGITS:
+ xsFacets.fractionDigitsAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_WHITESPACE:
+ xsFacets.whiteSpaceAnnotation =
annotation;
+ break;
+ case XSSimpleType.FACET_LENGTH:
+ xsFacets.lengthAnnotation = annotation;
+ break;
}
}
}
- if (child !=null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
+ if (child != null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
reportSchemaError("s4s-elt-must-match.1", new
Object[]{facet, "(annotation?)", DOMUtil.getLocalName(child)}, child);
}
}
1.12 +7 -7
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
Index: XSDAbstractIDConstraintTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSDAbstractIDConstraintTraverser.java 16 Dec 2004 16:45:20 -0000
1.11
+++ XSDAbstractIDConstraintTraverser.java 20 Dec 2004 05:43:36 -0000
1.12
@@ -67,8 +67,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(icElem);
- if(text != null) {
- ic.addAnnotation(traverseSyntheticAnnotation(text,
icElemAttrs, false, schemaDoc));
+ if (text != null) {
+ ic.addAnnotation(traverseSyntheticAnnotation(icElem, text,
icElemAttrs, false, schemaDoc));
}
}
@@ -96,8 +96,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(sElem);
- if(text != null) {
- ic.addAnnotation(traverseSyntheticAnnotation(text,
attrValues, false, schemaDoc));
+ if (text != null) {
+ ic.addAnnotation(traverseSyntheticAnnotation(icElem, text,
attrValues, false, schemaDoc));
}
}
@@ -151,8 +151,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(fElem);
- if(text != null) {
- ic.addAnnotation(traverseSyntheticAnnotation(text,
attrValues, false, schemaDoc));
+ if (text != null) {
+ ic.addAnnotation(traverseSyntheticAnnotation(icElem,
text, attrValues, false, schemaDoc));
}
}
String fText =
((String)attrValues[XSAttributeChecker.ATTIDX_XPATH]);
1.34 +3 -3
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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XSDElementTraverser.java 16 Dec 2004 16:45:20 -0000 1.33
+++ XSDElementTraverser.java 20 Dec 2004 05:43:36 -0000 1.34
@@ -311,8 +311,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(elmDecl);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(elmDecl, text,
attrValues, false, schemaDoc);
}
}
element.fAnnotation = annotation;
1.23 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Index: XSDGroupTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XSDGroupTraverser.java 16 Dec 2004 16:45:20 -0000 1.22
+++ XSDGroupTraverser.java 20 Dec 2004 05:43:36 -0000 1.23
@@ -148,8 +148,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(elmNode);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text,
attrValues, false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(elmNode, text,
attrValues, false, schemaDoc);
}
}
1.15 +5 -5
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java
Index: XSDWildcardTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSDWildcardTraverser.java 16 Dec 2004 16:45:20 -0000 1.14
+++ XSDWildcardTraverser.java 20 Dec 2004 05:43:36 -0000 1.15
@@ -164,8 +164,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(elmNode);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text,
attrValues, false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(elmNode, text,
attrValues, false, schemaDoc);
}
}
@@ -175,8 +175,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(elmNode);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(elmNode, text,
attrValues, false, schemaDoc);
}
}
wildcard.fAnnotation = annotation;
1.18 +3 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java
Index: XSDNotationTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDNotationTraverser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XSDNotationTraverser.java 16 Dec 2004 16:45:20 -0000 1.17
+++ XSDNotationTraverser.java 20 Dec 2004 05:43:36 -0000 1.18
@@ -84,8 +84,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(elmNode);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(elmNode, text,
attrValues, false, schemaDoc);
}
}
notation.fAnnotation = annotation;
1.46 +17 -17
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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XSDComplexTypeTraverser.java 16 Dec 2004 16:45:20 -0000 1.45
+++ XSDComplexTypeTraverser.java 20 Dec 2004 05:43:36 -0000 1.46
@@ -212,8 +212,8 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(complexTypeDecl);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
attrValues, false, schemaDoc));
+ if (text != null) {
+
addAnnotation(traverseSyntheticAnnotation(complexTypeDecl, text, attrValues,
false, schemaDoc));
}
}
if (child !=null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
@@ -224,8 +224,8 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(complexTypeDecl);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
attrValues, false, schemaDoc));
+ if (text != null) {
+
addAnnotation(traverseSyntheticAnnotation(complexTypeDecl, text, attrValues,
false, schemaDoc));
}
}
//
---------------------------------------------------------------
@@ -319,8 +319,8 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(simpleContentElement);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
simpleContentAttrValues, false, schemaDoc));
+ if (text != null) {
+
addAnnotation(traverseSyntheticAnnotation(simpleContentElement, text,
simpleContentAttrValues, false, schemaDoc));
}
}
@@ -444,8 +444,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(scElement);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
derivationTypeAttrValues, false, schemaDoc));
+ if (text != null) {
+ addAnnotation(traverseSyntheticAnnotation(scElement,
text, derivationTypeAttrValues, false, schemaDoc));
}
}
@@ -460,8 +460,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(scElement);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
derivationTypeAttrValues, false, schemaDoc));
+ if (text != null) {
+ addAnnotation(traverseSyntheticAnnotation(scElement, text,
derivationTypeAttrValues, false, schemaDoc));
}
}
@@ -654,8 +654,8 @@
}
else {
String text =
DOMUtil.getSyntheticAnnotation(complexContentElement);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
complexContentAttrValues, false, schemaDoc));
+ if (text != null) {
+
addAnnotation(traverseSyntheticAnnotation(complexContentElement, text,
complexContentAttrValues, false, schemaDoc));
}
}
@@ -748,8 +748,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(complexContent);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
derivationTypeAttrValues, false, schemaDoc));
+ if (text != null) {
+
addAnnotation(traverseSyntheticAnnotation(complexContent, text,
derivationTypeAttrValues, false, schemaDoc));
}
}
if (complexContent !=null &&
@@ -762,8 +762,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(complexContent);
- if(text != null) {
- addAnnotation(traverseSyntheticAnnotation(text,
derivationTypeAttrValues, false, schemaDoc));
+ if (text != null) {
+ addAnnotation(traverseSyntheticAnnotation(complexContent,
text, derivationTypeAttrValues, false, schemaDoc));
}
}
//
-----------------------------------------------------------------------
1.31 +3 -3
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XSDAttributeTraverser.java 16 Dec 2004 16:45:20 -0000 1.30
+++ XSDAttributeTraverser.java 20 Dec 2004 05:43:36 -0000 1.31
@@ -266,8 +266,8 @@
}
else {
String text = DOMUtil.getSyntheticAnnotation(attrDecl);
- if(text != null) {
- annotation = traverseSyntheticAnnotation(text, attrValues,
false, schemaDoc);
+ if (text != null) {
+ annotation = traverseSyntheticAnnotation(attrDecl, text,
attrValues, false, schemaDoc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
