Optimized the getChildNodes method. This also fixes an issue when that method is used on an Attr instance.
diff --git a/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java b/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
index 780dc29..65ce085 100644
--- a/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
+++ b/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
@@ -30,6 +30,7 @@
}
protected void addTests() {
+ addTest(new org.apache.axiom.ts.dom.attr.TestGetChildNodes(dbf));
addTest(new org.apache.axiom.ts.dom.attr.TestGetFirstChild(dbf));
addTest(new org.apache.axiom.ts.dom.attr.TestGetValueWithMultipleChildren(dbf));
addTest(new org.apache.axiom.ts.dom.attr.TestSetPrefixNotNullWithNamespace(dbf));
diff --git a/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java b/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
new file mode 100644
index 0000000..b3edffc
--- /dev/null
+++ b/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.dom.attr;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.axiom.ts.dom.DOMTestCase;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
+public class TestGetChildNodes extends DOMTestCase {
+ public TestGetChildNodes(DocumentBuilderFactory dbf) {
+ super(dbf);
+ }
+
+ protected void runTest() throws Throwable {
+ Document document = dbf.newDocumentBuilder().newDocument();
+ Attr attr = document.createAttributeNS(null, "name");
+ attr.setValue("value");
+ NodeList children = attr.getChildNodes();
+ assertEquals(1, children.getLength());
+ Node child = children.item(0);
+ assertTrue(child instanceof Text);
+ assertEquals("value", ((Text)child).getData());
+ }
+}
diff --git a/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java b/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
index 9ba8f23..7d922d7 100644
--- a/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
+++ b/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
@@ -53,7 +53,7 @@
import java.util.Iterator;
-public abstract class ParentNode extends NodeImpl {
+public abstract class ParentNode extends NodeImpl implements NodeList {
protected NodeImpl firstChild;
@@ -176,15 +176,32 @@
// /DOM Node methods
// /
- public NodeList getChildNodes() {
- if (!this.done) {
- this.build();
+ public final NodeList getChildNodes() {
+ return this;
+ }
+
+ public final int getLength() {
+ int count = 0;
+ Node child = getFirstChild();
+ while (child != null) {
+ count++;
+ child = child.getNextSibling();
}
- return new NodeListImpl() {
- protected Iterator getIterator() {
- return getChildren();
+ return count;
+ }
+
+ public final Node item(int index) {
+ int count = 0;
+ Node child = getFirstChild();
+ while (child != null) {
+ if (count == index) {
+ return child;
+ } else {
+ child = child.getNextSibling();
}
- };
+ count++;
+ }
+ return null;
}
public Node getFirstChild() {
