Author: mrglavas
Date: Sun Sep 10 22:01:27 2006
New Revision: 442099
URL: http://svn.apache.org/viewvc?view=rev&rev=442099
Log:
Fixing a couple bugs. Synthetic annotations weren't
being generated for element ref and group ref particles.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java?view=diff&rev=442099&r1=442098&r2=442099
==============================================================================
---
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
(original)
+++
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
Sun Sep 10 22:01:27 2006
@@ -166,10 +166,11 @@
if (child != null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
annotation = traverseAnnotationDecl(child, attrValues,
false, schemaDoc);
child = DOMUtil.getNextSiblingElement(child);
- } else {
- String text = DOMUtil.getSyntheticAnnotation(child);
+ }
+ else {
+ String text = DOMUtil.getSyntheticAnnotation(elmDecl);
if (text != null) {
- annotation = traverseSyntheticAnnotation(child, text,
attrValues, false, schemaDoc);
+ annotation = traverseSyntheticAnnotation(elmDecl,
text, attrValues, false, schemaDoc);
}
}
// Element Declaration Representation OK
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java?view=diff&rev=442099&r1=442098&r2=442099
==============================================================================
---
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
(original)
+++
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Sun Sep 10 22:01:27 2006
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.xerces.impl.xs.traversers;
import org.apache.xerces.impl.xs.SchemaGrammar;
@@ -80,10 +81,11 @@
if (child != null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
annotation = traverseAnnotationDecl(child, attrValues, false,
schemaDoc);
child = DOMUtil.getNextSiblingElement(child);
- } else {
- String text = DOMUtil.getSyntheticAnnotation(child);
+ }
+ else {
+ String text = DOMUtil.getSyntheticAnnotation(elmNode);
if (text != null) {
- annotation = traverseSyntheticAnnotation(child, text,
attrValues, false, schemaDoc);
+ annotation = traverseSyntheticAnnotation(elmNode, text,
attrValues, false, schemaDoc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
