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 2012/06/05 21:51:31 UTC
svn commit: r1346553 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/
axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/
Author: veithen
Date: Tue Jun 5 19:51:31 2012
New Revision: 1346553
URL: http://svn.apache.org/viewvc?rev=1346553&view=rev
Log:
Optimized the getChildNodes method. This also fixes an issue when that method is used on an Attr instance.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java (with props)
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java?rev=1346553&r1=1346552&r2=1346553&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java Tue Jun 5 19:51:31 2012
@@ -30,6 +30,7 @@ public class DOMTestSuiteBuilder extends
}
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));
Added: webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java?rev=1346553&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java Tue Jun 5 19:51:31 2012
@@ -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());
+ }
+}
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestGetChildNodes.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=1346553&r1=1346552&r2=1346553&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java Tue Jun 5 19:51:31 2012
@@ -53,7 +53,7 @@ import javax.xml.transform.sax.SAXSource
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 @@ public abstract class ParentNode extends
// /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() {