You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2014/06/28 16:28:21 UTC
svn commit: r1606361 [1/2] - in
/webservices/axiom/trunk/modules/axiom-dom/src:
main/java/org/apache/axiom/om/impl/dom/
test/java/org/apache/axiom/om/impl/dom/
Author: veithen
Date: Sat Jun 28 14:28:21 2014
New Revision: 1606361
URL: http://svn.apache.org/r1606361
Log:
Fix the getElementsByTagName and getElementsByTagNameNS methods in DOOM's Document implementation.
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
webservices/axiom/trunk/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/DOMImplementationTest.java
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1606361&r1=1606360&r2=1606361&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Sat Jun 28 14:28:21 2014
@@ -50,7 +50,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.EntityReference;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
@@ -248,16 +247,6 @@ public class DocumentImpl extends RootNo
return null;
}
- public NodeList getElementsByTagName(String tagname) {
- // TODO
- throw new UnsupportedOperationException("TODO");
- }
-
- public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
- // TODO
- throw new UnsupportedOperationException("TODO");
- }
-
public DOMImplementation getImplementation() {
return ((DOMMetaFactory)factory.getMetaFactory()).getDOMImplementation();
}
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1606361&r1=1606360&r2=1606361&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Sat Jun 28 14:28:21 2014
@@ -40,8 +40,6 @@ import org.apache.axiom.om.impl.common.O
import org.apache.axiom.om.impl.common.OMNodeHelper;
import org.apache.axiom.om.impl.common.serializer.push.OutputException;
import org.apache.axiom.om.impl.common.serializer.push.Serializer;
-import org.apache.axiom.om.impl.traverse.OMQNameFilterIterator;
-import org.apache.axiom.om.impl.traverse.OMQualifiedNameFilterIterator;
import org.apache.axiom.om.impl.util.EmptyIterator;
import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.commons.logging.Log;
@@ -52,7 +50,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.TypeInfo;
import javax.xml.XMLConstants;
@@ -459,44 +456,6 @@ public class ElementImpl extends ParentN
return attributes != null && attributes.getLength() > 0;
}
- /*
- * (non-Javadoc)
- *
- * @see org.w3c.dom.Element#getElementsByTagNameNS(java.lang.String,
- * java.lang.String)
- */
- public NodeList getElementsByTagNameNS(String namespaceURI,
- String localName) {
- final QName qname = new QName(namespaceURI, localName);
- return new NodeListImpl() {
- protected Iterator getIterator() {
- return new OMQNameFilterIterator(getDescendants(false), qname);
- }
- };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.w3c.dom.Element#getElementsByTagName(java.lang.String)
- */
- public NodeList getElementsByTagName(final String name) {
- if (name.equals("*")) {
- return new NodeListImpl() {
- protected Iterator getIterator() {
- return getDescendants(false);
- }
- };
- } else {
- return new NodeListImpl() {
- protected Iterator getIterator() {
- return new OMQualifiedNameFilterIterator(
- getDescendants(false), name);
- }
- };
- }
- }
-
// /
// /OmElement methods
// /
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1606361&r1=1606360&r2=1606361&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java Sat Jun 28 14:28:21 2014
@@ -37,6 +37,8 @@ import org.apache.axiom.om.impl.common.O
import org.apache.axiom.om.impl.common.OMDescendantsIterator;
import org.apache.axiom.om.impl.common.serializer.push.sax.XMLReaderImpl;
import org.apache.axiom.om.impl.traverse.OMChildrenIterator;
+import org.apache.axiom.om.impl.traverse.OMQNameFilterIterator;
+import org.apache.axiom.om.impl.traverse.OMQualifiedNameFilterIterator;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -567,4 +569,29 @@ public abstract class ParentNode extends
child = child.getNextOMSibling();
}
}
+
+ public final NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
+ final QName qname = new QName(namespaceURI, localName);
+ return new NodeListImpl() {
+ protected Iterator getIterator() {
+ return new OMQNameFilterIterator(getDescendants(false), qname);
+ }
+ };
+ }
+
+ public final NodeList getElementsByTagName(final String name) {
+ if (name.equals("*")) {
+ return new NodeListImpl() {
+ protected Iterator getIterator() {
+ return getDescendants(false);
+ }
+ };
+ } else {
+ return new NodeListImpl() {
+ protected Iterator getIterator() {
+ return new OMQualifiedNameFilterIterator(getDescendants(false), name);
+ }
+ };
+ }
+ }
}