Author: veithen
Date: Sun Aug 23 13:01:18 2015
New Revision: 1697176
URL: http://svn.apache.org/r1697176
Log:
Rewrite OMContainer#getDescendants.
Removed:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMDescendantsIterator.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj?rev=1697176&r1=1697175&r2=1697176&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
Sun Aug 23 13:01:18 2015
@@ -35,6 +35,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMXMLStreamReader;
@@ -212,7 +213,7 @@ public aspect AxiomContainerSupport {
}
public Iterator AxiomContainer.getDescendants(boolean includeSelf) {
- return new OMDescendantsIterator(this, includeSelf);
+ return coreGetNodes(includeSelf ? Axis.DESCENDANTS_OR_SELF :
Axis.DESCENDANTS, OMSerializable.class, AxiomExceptionTranslator.INSTANCE,
Policies.DETACH_POLICY);
}
public OMElement AxiomContainer.getFirstChildWithName(QName elementQName)
throws OMException {
