svn commit: r1197636 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers: XSDAbstractTraverser.java XSDComplexTypeTraverser.java
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: commits-unsubscr..
svn commit: r1197621 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl: xpath/ xs/ xs/assertion/ xs/traversers/
Author: mukulg
Date: Fri Nov 4 16:07:45 2011
New Revision: 1197621
URL: http://svn.apache.org/viewvc?rev=1197621&view=rev
Log:
schema 1.1 commit:
it seemed to me that the class XPath20Assert in org.apache.xerces.impl.xpath
was superfluously modeled, and it's functionality could be made available in
class Test (in org.apache.xerces.impl.xs.assertion). this commit makes
improvement in this regard.
Removed:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20Assert.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/Test.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/assertion/XSAssertImpl.java
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/AbstractPsychoPathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java?rev=1197621&r1=1197620&r2=1197621&view=diff
==
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java
Fri Nov 4 16:07:45 2011
@@ -164,10 +164,10 @@ public class AbstractPsychoPathXPath2Imp
} catch (XPathParserException ex) {
// error compiling XPath expression
if
(SchemaSymbols.ASSERT_XPATHEXPR_COMPILE_ERR_MESG_1.equals(ex.getMessage())) {
-fSchemaHandler.reportSchemaWarning("cvc-xpath.3.13.4.2b", new
Object[] {assertImpl.getTest().getXPath().toString(),
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
+fSchemaHandler.reportSchemaWarning("cvc-xpath.3.13.4.2b", new
Object[] {assertImpl.getTest().getXPathStr(),
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
}
else {
-fSchemaHandler.reportSchemaError("cvc-xpath.3.13.4.2a", new
Object[] {assertImpl.getTest().getXPath().toString(),
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
+fSchemaHandler.reportSchemaError("cvc-xpath.3.13.4.2a", new
Object[] {assertImpl.getTest().getXPathStr(),
XSTypeHelper.getSchemaTypeName(assertImpl.getTypeDefinition())},
schemaContextElem);
}
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java?rev=1197621&r1=1197620&r2=1197621&view=diff
==
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Fri Nov 4 16:07:45 2011
@@ -718,12 +718,12 @@ public class XMLAssertPsychopathXPath2Im
else {
if (assertImpl.getAssertKind() == XSConstants.ASSERTION) {
// error for xs:assert component
- fXmlSchemaValidator.reportSchemaError(key, new Object[]
{elemNameAnnotation, assertImpl.getTest().getXPath().toString(), typeNameStr,
mesgSuffix});
+ fXmlSchemaValidator.reportSchemaError(key, new Object[]
{elemNameAnnotation, assertImpl.getTest().getXPathStr(), typeNameStr,
mesgSuffix});
}
else {
// errors for xs:assertion facet
- fXmlSchemaValidator.reportSchemaError("cvc-assertions-valid",
new Object[] {value, assertImpl.getTest().getXPath().toString(),
exceptionMesg});
- fXmlSchemaValidator.reportSchemaError(key, new Object[]
{elemNameAnnotation, assertImpl.getTest().getXPath().toString(), typeNameStr,
mesgSuffix});
+ fXmlSchemaValidator.reportSchemaError("cvc-assertions-valid",
new Object[] {value, assertImpl.getTest().getXPathStr(), exceptionMesg});
+ fXmlSchemaValidator.reportSchemaError(key, new Object[]
{elemNameAnnotation, assertImpl.getTest().getXPathStr(), typeNameStr,
mesgSuffix});
}
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/x
