Author: dkulp
Date: Mon Jan 5 12:19:51 2009
New Revision: 731686
URL: http://svn.apache.org/viewvc?rev=731686&view=rev
Log:
Merged revisions 731604 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r731604 | seanoc | 2009-01-05 10:58:18 -0500 (Mon, 05 Jan 2009) | 1 line
Removed more uses of NodeList
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 5 12:19:51 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java?rev=731686&r1=731685&r2=731686&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
Mon Jan 5 12:19:51 2009
@@ -37,6 +37,7 @@
import org.apache.cxf.binding.soap.interceptor.CheckFaultInterceptor;
import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
import org.apache.cxf.headers.Header;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.StaxInInterceptor;
import org.apache.cxf.message.Attachment;
import org.junit.Before;
@@ -104,11 +105,10 @@
if (ele.getLocalName().equals("reservation")) {
Element reservation = ele;
List<Element> reservationChilds = new ArrayList<Element>();
- for (int j = 0; j < reservation.getChildNodes().getLength();
j++) {
- if (reservation.getChildNodes().item(j) instanceof
Element) {
- Element element =
(Element)reservation.getChildNodes().item(j);
- reservationChilds.add(element);
- }
+ Element elem = DOMUtils.getFirstElement(reservation);
+ while (elem != null) {
+ reservationChilds.add(elem);
+ elem = DOMUtils.getNextElement(elem);
}
assertEquals(2, reservationChilds.size());
assertEquals("reference",
reservationChilds.get(0).getLocalName());
@@ -122,13 +122,8 @@
if (ele.getLocalName().equals("passenger")) {
Element passenger = ele;
assertNotNull(passenger);
- Element child = null;
- for (int j = 0; j < passenger.getChildNodes().getLength();
j++) {
- if (passenger.getChildNodes().item(j) instanceof Element) {
- child = (Element)passenger.getChildNodes().item(j);
- }
- }
- assertNotNull("passenger should has child element", child);
+ Element child = DOMUtils.getFirstElement(passenger);
+ assertNotNull("passenger should have a child element", child);
assertEquals("name", child.getLocalName());
assertEquals("Bob", child.getTextContent());
}
Modified:
cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java?rev=731686&r1=731685&r2=731686&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
Mon Jan 5 12:19:51 2009
@@ -20,6 +20,8 @@
package org.apache.cxf.javascript;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
import org.w3c.dom.Attr;
import org.w3c.dom.NamedNodeMap;
@@ -38,7 +40,7 @@
private boolean attributesWrapped;
private JsSimpleDomNode previousSibling;
private JsSimpleDomNode nextSibling;
- private JsSimpleDomNode[] children;
+ private List<JsSimpleDomNode> children;
private JsNamedNodeMap attributes;
/**
@@ -79,8 +81,8 @@
public Object jsGet_firstChild() {
establishChildren();
- if (children.length > 0)
- return children[0];
+ if (children.size() > 0)
+ return children.get(0);
else
return null;
}
@@ -116,13 +118,13 @@
return null;
} else {
establishChildren();
- return children[0]; // it is, after all, just a convenience
feature.
+ return children.get(0); // it is, after all, just a convenience
feature.
}
}
public Object[] jsGet_childNodes() {
establishChildren();
- return children;
+ return children.toArray();
}
public Object jsGet_attributes() {
@@ -175,23 +177,23 @@
private void establishChildren() {
if (!childrenWrapped) {
if (wrappedNode.hasChildNodes()) {
- children = new
JsSimpleDomNode[wrappedNode.getChildNodes().getLength()];
+ children = new ArrayList<JsSimpleDomNode>();
Node node = wrappedNode.getFirstChild();
int x = 0;
while (node != null) {
JsSimpleDomNode prev = null;
if (x > 0) {
- prev = (JsSimpleDomNode)children[x - 1];
+ prev = (JsSimpleDomNode)children.get(x - 1);
}
- children[x] = newObject(node, prev);
+ children.add(x, newObject(node, prev));
if (x > 0) {
- children[x - 1].setNext(children[x]);
+ children.get(x - 1).setNext(children.get(x));
}
node = node.getNextSibling();
x++;
}
} else {
- children = new JsSimpleDomNode[0];
+ children = new ArrayList<JsSimpleDomNode>();
}
childrenWrapped = true;
}
Modified:
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=731686&r1=731685&r2=731686&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Mon Jan 5 12:19:51 2009
@@ -248,11 +248,13 @@
Element childEl = (Element)childNode;
if (isJaxbBindingsElement(childEl)) {
+
NodeList nlist = nodeSelector.queryNodes(schemaNode,
childEl.getAttribute("node"));
for (int i = 0; i < nlist.getLength(); i++) {
Node node = nlist.item(i);
copyAllJaxbDeclarations(node, childEl);
- }
+ }
+
} else {
Element cloneNode =
(Element)ProcessorUtil.cloneNode(schemaNode.getOwnerDocument(),
childEl,
true);
@@ -270,9 +272,9 @@
childNode = childNode.getNextSibling();
}
}
-
- if (schemaNode.getChildNodes().getLength() > 0) {
- schemaNode.insertBefore(annotationNode,
schemaNode.getChildNodes().item(0));
+
+ if (schemaNode.getFirstChild() != null) {
+ schemaNode.insertBefore(annotationNode,
schemaNode.getFirstChild());
} else {
schemaNode.appendChild(annotationNode);
}
@@ -370,13 +372,17 @@
}
- for (int i = 0; i < bindings.getChildNodes().getLength(); i++) {
- Node childNode = bindings.getChildNodes().item(i);
- if (childNode.getNodeType() == Element.ELEMENT_NODE
- &&
childNode.getNamespaceURI().equals(ToolConstants.JAXWS_BINDINGS.getNamespaceURI()))
{
- childNode.setPrefix("jaxws");
+
+
+ Element element = DOMUtils.getFirstElement(bindings);
+ while (element != null) {
+ if
(element.getNamespaceURI().equals(ToolConstants.JAXWS_BINDINGS.getNamespaceURI()))
{
+ element.setPrefix("jaxws");
}
+ element = DOMUtils.getNextElement(element);
}
+
+
Node cloneNode = ProcessorUtil.cloneNode(node.getOwnerDocument(),
bindings, true);
Node firstChild = DOMUtils.getChild(node, "jaxws:bindings");
