Author: knoaman
Date: Mon Nov 3 08:36:45 2008
New Revision: 710098
URL: http://svn.apache.org/viewvc?rev=710098&view=rev
Log:
Fix indentation
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java?rev=710098&r1=710097&r2=710098&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
Mon Nov 3 08:36:45 2008
@@ -173,7 +173,7 @@
}
public void setAssertions(XSObjectListImpl assertions) {
- fAssertions = assertions;
+ fAssertions = assertions;
}
public XSCMValidator getContentModel(CMBuilder cmBuilder) {
@@ -567,7 +567,7 @@
}
fAnnotations = null;
if (fAssertions != null) {
- fAssertions.clear();
+ fAssertions.clear();
}
fAssertions = null;
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java?rev=710098&r1=710097&r2=710098&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Mon Nov 3 08:36:45 2008
@@ -639,8 +639,8 @@
// Traverse any attributes
//
-----------------------------------------------------------------------
if (attrOrAssertNode != null) {
- if (isAttrOrAttrGroup(attrOrAssertNode)) {
- Element
node=traverseAttrsAndAttrGrps(attrOrAssertNode,fAttrGrp,
+ if (isAttrOrAttrGroup(attrOrAssertNode)) {
+ Element
node=traverseAttrsAndAttrGrps(attrOrAssertNode,fAttrGrp,
schemaDoc,grammar,fComplexTypeDecl);
if (node != null) {
@@ -658,11 +658,11 @@
}
}
}
- else if (isAssert(attrOrAssertNode)) {
+ else if (isAssert(attrOrAssertNode)) {
traverseAsserts(attrOrAssertNode, schemaDoc, grammar,
fComplexTypeDecl);
- }
- else {
+ }
+ else {
fAttrChecker.returnAttrArray(simpleContentAttrValues,
schemaDoc);
fAttrChecker.returnAttrArray(derivationTypeAttrValues,
schemaDoc);
throw new
ComplexTypeRecoverableError("s4s-elt-invalid-content.1",
@@ -711,7 +711,7 @@
} else {
// a non assert element after attributes is an
error
fAttrChecker.returnAttrArray(simpleContentAttrValues, schemaDoc);
-
fAttrChecker.returnAttrArray(derivationTypeAttrValues, schemaDoc);
+
fAttrChecker.returnAttrArray(derivationTypeAttrValues, schemaDoc);
throw new ComplexTypeRecoverableError(
"s4s-elt-invalid-content.1",
new Object[] { fName,
@@ -1472,7 +1472,7 @@
traverseAsserts(sibling, schemaDoc, grammar, enclosingCT);
} else {
// a non assert element after assert is an error
- fAttrChecker.returnAttrArray(attrValues, schemaDoc);
+ fAttrChecker.returnAttrArray(attrValues, schemaDoc);
throw new ComplexTypeRecoverableError(
"s4s-elt-invalid-content.1", new Object[] { fName,
DOMUtil.getLocalName(sibling) }, sibling);
@@ -1579,7 +1579,7 @@
}
private void contentRestore() {
- fAssertions = (XSAssertImpl[])fGlobalStore[--fGlobalStorePos];
+ fAssertions = (XSAssertImpl[])fGlobalStore[--fGlobalStorePos];
fOpenContent = (XSOpenContentDecl)fGlobalStore[--fGlobalStorePos];
fAnnotations = (XSAnnotationImpl [])fGlobalStore[--fGlobalStorePos];
fXSSimpleType = (XSSimpleType)fGlobalStore[--fGlobalStorePos];
@@ -1627,7 +1627,7 @@
fAssertions = new XSAssertImpl[1];
}
else {
- XSAssertImpl [] tempArray = new XSAssertImpl[fAssertions.length
+ 1];
+ XSAssertImpl [] tempArray = new XSAssertImpl[fAssertions.length +
1];
System.arraycopy(fAssertions, 0, tempArray, 0, fAssertions.length);
fAssertions = tempArray;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
