Author: mukulg
Date: Fri Nov 4 16:34:40 2011
New Revision: 1197636
URL: http://svn.apache.org/viewvc?rev=1197636&view=rev
Log:
another small variable renaming I wanted to do.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.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/traversers/XSDAbstractTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=1197636&r1=1197635&r2=1197636&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Fri Nov 4 16:34:40 2011
@@ -467,7 +467,7 @@ abstract class XSDAbstractTraverser {
// process 'assertion' facet. introduced in XML Schema 1.1
else if (facet.equals(SchemaSymbols.ELT_ASSERTION)) {
attrs = fAttrChecker.checkAttributes(content, false,
schemaDoc);
- String test = (String) attrs[XSAttributeChecker.ATTIDX_XPATH];
+ String testStr = (String)
attrs[XSAttributeChecker.ATTIDX_XPATH];
String xpathDefaultNamespace = (String)
attrs[XSAttributeChecker.ATTIDX_XPATHDEFAULTNS];
if (xpathDefaultNamespace == null) {
if (schemaDoc.fXpathDefaultNamespaceIs2PoundDefault) {
@@ -482,7 +482,7 @@ abstract class XSDAbstractTraverser {
}
}
- if (test != null) {
+ if (testStr != null) {
// get 'annotation'
Element childNode = DOMUtil.getFirstChildElement(content);
XSAnnotationImpl annotation = null;
@@ -519,7 +519,7 @@ abstract class XSDAbstractTraverser {
// create an assertion object
XSAssertImpl assertImpl = new XSAssertImpl(typeDef,
annotations, fSchemaHandler);
- Test testExpr = new Test(test,
schemaDoc.fNamespaceSupport, assertImpl);
+ Test testExpr = new Test(testStr,
schemaDoc.fNamespaceSupport, assertImpl);
assertImpl.setAssertKind(XSConstants.ASSERTION_FACET);
assertImpl.setTest(testExpr, content);
assertImpl.setXPathDefaultNamespace(xpathDefaultNamespace);
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=1197636&r1=1197635&r2=1197636&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
Fri Nov 4 16:34:40 2011
@@ -1689,9 +1689,9 @@ class XSDComplexTypeTraverser extends X
private void traverseAsserts(Element assertElement, XSDocumentInfo
schemaDoc, SchemaGrammar grammar, XSComplexTypeDecl enclosingCT) throws
ComplexTypeRecoverableError {
Object[] attrValues = fAttrChecker.checkAttributes(assertElement,
false, schemaDoc);
- String test = (String) attrValues[XSAttributeChecker.ATTIDX_XPATH];
+ String testStr = (String) attrValues[XSAttributeChecker.ATTIDX_XPATH];
- if (test != null) {
+ if (testStr != null) {
// get 'annotation'
Element childNode = DOMUtil.getFirstChildElement(assertElement);
XSAnnotationImpl annotation = null;
@@ -1729,7 +1729,7 @@ class XSDComplexTypeTraverser extends X
// create an assertion object
XSAssertImpl assertImpl = new XSAssertImpl(enclosingCT,
annotations, fSchemaHandler);
- Test testExpr = new Test(test, schemaDoc.fNamespaceSupport,
assertImpl);
+ Test testExpr = new Test(testStr, schemaDoc.fNamespaceSupport,
assertImpl);
String xpathDefaultNamespace =
getXPathDefaultNamespaceForAssert(assertElement, schemaDoc, attrValues);
assertImpl.setTest(testExpr, assertElement);
assertImpl.setXPathDefaultNamespace(xpathDefaultNamespace);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
