Author: mukulg
Date: Mon Apr 25 15:41:13 2011
New Revision: 1096502
URL: http://svn.apache.org/viewvc?rev=1096502&view=rev
Log:
simplifying schema 1.1 CTA xpath evaluation logic a bit, involving psychopath
engine. and clarifying bit more, related comments.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java?rev=1096502&r1=1096501&r2=1096502&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java
Mon Apr 25 15:41:13 2011
@@ -28,8 +28,6 @@ import org.apache.xerces.util.NamespaceS
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLAttributes;
import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.DynamicError;
-import org.eclipse.wst.xml.xpath2.processor.StaticError;
import org.eclipse.wst.xml.xpath2.processor.ast.XPath;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -119,10 +117,8 @@ public class Test extends AbstractPsycho
boolean evaluationResult = false;
- try {
- // construct a DOM document (used by psychopath engine for XPath
XDM instance).
- // A PSVI DOM is constructed to comply to PsychoPath engine
design. This doesn't seem to affect CTA psychopath evaluations.
- // CTA spec doesn't require a typed XDM tree. REVISIT ...
+ try {
+ // an untyped PSVI DOM tree is constructed, to provide to
PsychoPath engine for evaluation.
Document document = new PSVIDocumentImpl();
Element elem = document.createElementNS(element.uri,
element.rawname);
for (int attrIndx = 0; attrIndx < attributes.getLength();
attrIndx++) {
@@ -141,12 +137,6 @@ public class Test extends AbstractPsycho
}
evaluationResult = evaluateXPathExpr(fXPathPsychoPath, elem);
}
- catch (StaticError ex) {
- evaluationResult = false;
- }
- catch(DynamicError ex) {
- evaluationResult = false;
- }
catch(Exception ex) {
evaluationResult = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
