Author: knoaman
Date: Tue Oct 7 14:47:23 2008
New Revision: 702650
URL: http://svn.apache.org/viewvc?rev=702650&view=rev
Log:
Fix indentation problem
Modified:
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/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=702650&r1=702649&r2=702650&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
Tue Oct 7 14:47:23 2008
@@ -517,7 +517,7 @@
// 4 If there is an {substitution group affiliation}, the {type
definition} of the element declaration must be validly derived from the {type
definition} of the {substitution group affiliation}, given the value of the
{substitution group exclusions} of the {substitution group affiliation}, as
defined in Type Derivation OK (Complex) (3.4.6) (if the {type definition} is
complex) or as defined in Type Derivation OK (Simple) (3.14.6) (if the {type
definition} is simple).
if (element.fSubGroup != null) {
- for (int i=0; i< element.fSubGroup.length; i++) {
+ for (int i=0; i< element.fSubGroup.length; i++) {
if
(!fSchemaHandler.fXSConstraints.checkTypeDerivationOk(element.fType,
element.fSubGroup[i].fType, element.fSubGroup[i].fFinal)) {
reportSchemaError ("e-props-correct.4", new
Object[]{nameAtt, ((QName)subGroupAtt.get(i)).prefix
+":"+((QName)subGroupAtt.get(i)).localpart}, elmDecl);
}
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=702650&r1=702649&r2=702650&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
Tue Oct 7 14:47:23 2008
@@ -49,12 +49,12 @@
*/
class XSDTypeAlternativeTraverser extends XSDAbstractTraverser {
- XSDTypeAlternativeTraverser (XSDHandler handler,
+ XSDTypeAlternativeTraverser (XSDHandler handler,
XSAttributeChecker attrChecker) {
super(handler, attrChecker);
}
-
- /**
+
+ /**
* Traverse the given alternative element and update the
* schema grammar. Validate the content of the type alternative
* element.
@@ -111,17 +111,17 @@
XSTypeDefinition typeDef = null;
if (childName.equals(SchemaSymbols.ELT_COMPLEXTYPE)) {
typeDef =
fSchemaHandler.fComplexTypeTraverser.traverseLocal(childNode, schemaDoc,
grammar);
- hasAnonType = true;
+ hasAnonType = true;
childNode = DOMUtil.getNextSiblingElement(childNode);
- }
+ }
else if (childName.equals(SchemaSymbols.ELT_SIMPLETYPE)) {
- typeDef =
fSchemaHandler.fSimpleTypeTraverser.traverseLocal(childNode, schemaDoc,
grammar);
- hasAnonType = true;
+ typeDef =
fSchemaHandler.fSimpleTypeTraverser.traverseLocal(childNode, schemaDoc,
grammar);
+ hasAnonType = true;
childNode = DOMUtil.getNextSiblingElement(childNode);
}
if (alternativeType == null) {
- alternativeType = typeDef;
+ alternativeType = typeDef;
}
// type and either <simpleType> or <complexType> are mutually
exclusive.
@@ -133,12 +133,12 @@
// if the type definition component is not present..
// 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);
+ reportSchemaError("src-type-alternative.3.12.13.2", null,
altElement);
}
// fall back to the element declaration's type
if (alternativeType == null) {
- alternativeType= element.fType;
+ alternativeType= element.fType;
}
// not expecting any more children
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
