Author: knoaman
Date: Mon Jul 14 07:17:47 2008
New Revision: 676599
URL: http://svn.apache.org/viewvc?rev=676599&view=rev
Log:
Type Alternatives - fix a bug and some typos
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java?rev=676599&r1=676598&r2=676599&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSElementDecl.java
Mon Jul 14 07:17:47 2008
@@ -168,7 +168,7 @@
return fDefaultTypeDef;
}
- public void setDefualtTypeDefinition() {
+ public void setDefaultTypeDefinition() {
if (fTypeAlternativePos == 0) {
//no type alternatives found on the element decl
fDefaultTypeDef = null;
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java?rev=676599&r1=676598&r2=676599&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
Mon Jul 14 07:17:47 2008
@@ -399,7 +399,7 @@
// if XML Schema 1.1, check for alternative types first
if (fSchemaHandler.fSchemaVersion == Constants.SCHEMA_VERSION_1_1)
{
- while (child.equals(SchemaSymbols.ELT_ALTERNATIVE)) {
+ while (childName.equals(SchemaSymbols.ELT_ALTERNATIVE)) {
fSchemaHandler.fTypeAlternativeTraverser.traverse(child, element, schemaDoc,
grammar);
child = DOMUtil.getNextSiblingElement(child);
if (child != null) {
@@ -409,7 +409,7 @@
if (!element.isTypeTableOK()) {
reportSchemaError("src-element.5", new
Object[]{nameAtt}, elmDecl);
}
- element.setDefualtTypeDefinition();
+ element.setDefaultTypeDefinition();
break;
}
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java?rev=676599&r1=676598&r2=676599&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
Mon Jul 14 07:17:47 2008
@@ -45,7 +45,7 @@
* </alternative>
*
* @author Hiranya Jayathilaka, University of Moratuwa
- * @version $Id:$
+ * @version $Id$
*/
class XSDTypeAlternativeTraverser extends XSDAbstractTraverser {
@@ -131,8 +131,8 @@
}
// if the type definition component is not present..
- // i.e. test attr value is absent, or no anonymous types are defined
- if (typeAtt == null || !hasAnonType) {
+ // i.e. test attr value is absent and no anonymous types are defined
+ if (typeAtt == null && !hasAnonType) {
reportSchemaError("src-type-alternative.3.12.13.2", null,
altElement);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
