You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/24 01:48:46 UTC
svn commit: r291222 - in /webservices/axis2/trunk/java/modules:
databinding/src/org/apache/axis2/rpc/ saaj/src/org/apache/axis2/saaj/
xml/src/org/apache/axis2/om/ xml/src/org/apache/axis2/om/impl/
xml/src/org/apache/axis2/om/impl/llom/ xml/src/org/apac...
Author: dims
Date: Fri Sep 23 16:48:35 2005
New Revision: 291222
URL: http://svn.apache.org/viewcvs?rev=291222&view=rev
Log:
fix for AXIS2-241 - AXIOM exposes interface functions that should be implementation details
Added:
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMContainerEx.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java
Modified:
webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/rpc/RPCRequestElement.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP11BuilderHelper.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java
Modified: webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/rpc/RPCRequestElement.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/rpc/RPCRequestElement.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/rpc/RPCRequestElement.java (original)
+++ webservices/axis2/trunk/java/modules/databinding/src/org/apache/axis2/rpc/RPCRequestElement.java Fri Sep 23 16:48:35 2005
@@ -19,6 +19,7 @@
import org.apache.axis2.databinding.SerializationContext;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMContainerEx;
import org.apache.axis2.om.impl.llom.OMElementImpl;
import javax.xml.stream.XMLStreamException;
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java Fri Sep 23 16:48:35 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.util.Dom2OmUtils;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -124,7 +125,7 @@
public void setParentElement(SOAPElement parent) throws SOAPException {
OMElement omParent = ((SOAPElementImpl) parent).getOMElement();
- omNode.setParent(omParent);
+ ((OMNodeEx)omNode).setParent(omParent);
}
/**
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Fri Sep 23 16:48:35 2005
@@ -16,6 +16,7 @@
package org.apache.axis2.saaj;
import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.NodeList;
@@ -162,7 +163,7 @@
//resolved using appropriate namespace declarations within the fragment itself.
org.apache.axis2.om.OMElement omElementToAdd = ((SOAPElementImpl) element).getOMElement();
- omElementToAdd.setParent(omElement);
+ ((OMNodeEx)omElementToAdd).setParent(omElement);
omElement.addChild(omElementToAdd);
return new SOAPElementImpl(omElementToAdd);
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java Fri Sep 23 16:48:35 2005
@@ -17,6 +17,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.w3c.dom.DOMException;
import javax.xml.soap.SOAPElement;
@@ -67,7 +68,7 @@
/*Overridden Method*/
public void setParentElement(SOAPElement parent) throws SOAPException {
OMElement omParent = ((SOAPElementImpl) parent).getOMElement();
- omText.setParent(omParent);
+ ((OMNodeEx)omText).setParent(omParent);
}
/*Overridden Method*/
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMContainer.java Fri Sep 23 16:48:35 2005
@@ -29,13 +29,9 @@
public Iterator getChildren();
- public void setFirstChild(OMNode omNode);
-
public OMNode getFirstChild();
public boolean isComplete();
-
- public void setComplete(boolean state);
public void buildNext();
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/OMNode.java Fri Sep 23 16:48:35 2005
@@ -76,13 +76,6 @@
public OMContainer getParent() throws OMException;
/**
- * Method setParent
- *
- * @param element
- */
- public void setParent(OMContainer element);
-
- /**
* This will give the next sibling. This can be an OMAttribute for OMAttribute or OMText or OMELement for others.
*
* @return
@@ -91,13 +84,6 @@
public OMNode getNextSibling() throws OMException;
/**
- * Method setNextSibling
- *
- * @param node
- */
- public void setNextSibling(OMNode node);
-
- /**
* this will indicate whether parser has parsed this information item completely or not.
* If somethings info are not available in the item, one has to check this attribute to make sure that, this
* item has been parsed completely or not.
@@ -107,13 +93,6 @@
public boolean isComplete();
/**
- * Method setComplete
- *
- * @param state
- */
- public void setComplete(boolean state);
-
- /**
* This will remove this information item and its children, from the model completely.
* Important to note that this method will detach the OMNode once it is fully built.
* Half built nodes are not to be detached!
@@ -155,26 +134,11 @@
public int getType() throws OMException;
/**
- * Method setType
- *
- * @param nodeType
- * @throws OMException
- */
- public void setType(int nodeType) throws OMException;
-
- /**
* get the previous sibling
*
* @return node
*/
public OMNode getPreviousSibling();
-
- /**
- * Set the previous sibling
- *
- * @param previousSibling
- */
- public void setPreviousSibling(OMNode previousSibling);
/**
* Serialize the node with caching
Added: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMContainerEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMContainerEx.java?rev=291222&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMContainerEx.java (added)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMContainerEx.java Fri Sep 23 16:48:35 2005
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed 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.axis2.om.impl;
+
+import org.apache.axis2.om.OMContainer;
+import org.apache.axis2.om.OMNode;
+
+public interface OMContainerEx extends OMContainer {
+ public void setComplete(boolean state);
+
+ public void setFirstChild(OMNode omNode);
+}
Added: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java?rev=291222&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java (added)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMNodeEx.java Fri Sep 23 16:48:35 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed 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.axis2.om.impl;
+
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMContainer;
+import org.apache.axis2.om.OMException;
+
+public interface OMNodeEx extends OMNode {
+ public void setNextSibling(OMNode node);
+
+ public void setPreviousSibling(OMNode previousSibling);
+
+ public void setParent(OMContainer element);
+
+ public void setComplete(boolean state);
+
+ public void setType(int nodeType) throws OMException;
+}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMDocumentImpl.java Fri Sep 23 16:48:35 2005
@@ -22,6 +22,8 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMContainerEx;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
@@ -32,7 +34,7 @@
/**
* Class OMDocumentImpl
*/
-public class OMDocumentImpl implements OMDocument {
+public class OMDocumentImpl implements OMDocument, OMContainerEx {
/**
* Field rootElement
*/
@@ -165,7 +167,7 @@
child.setPreviousSibling(null);
} else {
child.setPreviousSibling(lastChild);
- lastChild.setNextSibling(child);
+ ((OMNodeEx)lastChild).setNextSibling(child);
}
child.setNextSibling(null);
child.setParent(this);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Fri Sep 23 16:48:35 2005
@@ -27,6 +27,8 @@
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMContainerEx;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.traverse.OMChildElementIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenIterator;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenQNameIterator;
@@ -43,7 +45,7 @@
* Class OMElementImpl
*/
public class OMElementImpl extends OMNodeImpl
- implements OMElement, OMConstants {
+ implements OMElement, OMConstants, OMContainerEx {
/**
* Field ns
*/
@@ -235,7 +237,7 @@
child.setPreviousSibling(null);
} else {
child.setPreviousSibling(lastChild);
- lastChild.setNextSibling(child);
+ ((OMNodeEx)lastChild).setNextSibling(child);
}
child.setNextSibling(null);
@@ -494,18 +496,9 @@
*/
public void setFirstChild(OMNode firstChild) {
if (firstChild != null) {
- firstChild.setParent(this);
+ ((OMNodeEx)firstChild).setParent(this);
}
this.firstChild = firstChild;
-//
-// OMNode currentFirstChild = getFirstChild();
-// if (currentFirstChild != null) {
-// currentFirstChild.insertSiblingBefore(firstChild);
-// } else {
-// this.firstChild = firstChild;
-// }
-// if (firstChild != null)
-// firstChild.setParent(this);
}
/**
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNodeImpl.java Fri Sep 23 16:48:35 2005
@@ -21,6 +21,8 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
+import org.apache.axis2.om.impl.OMContainerEx;
+import org.apache.axis2.om.impl.OMNodeEx;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -28,11 +30,11 @@
/**
* Class OMNodeImpl
*/
-public abstract class OMNodeImpl implements OMNode {
+public abstract class OMNodeImpl implements OMNode, OMNodeEx {
/**
* Field parent
*/
- protected OMContainer parent;
+ protected OMContainerEx parent;
/**
* Field nextSibling
@@ -71,7 +73,7 @@
*/
public OMNodeImpl(OMContainer parent) {
if ((parent != null)) {
- this.parent = parent;
+ this.parent = (OMContainerEx)parent;
parent.addChild(this);
}
}
@@ -106,7 +108,7 @@
if (this.parent != null) {
this.detach();
}
- this.parent = element;
+ this.parent = (OMContainerEx)element;
}
/**
@@ -170,7 +172,7 @@
if (previousSibling == null) {
parent.setFirstChild(nextSibling);
} else {
- getPreviousSibling().setNextSibling(nextSibling);
+ ((OMNodeEx)getPreviousSibling()).setNextSibling(nextSibling);
}
if (nextSibling != null) {
nextSibling.setPreviousSibling(getPreviousSibling());
@@ -191,7 +193,7 @@
if (parent == null) {
throw new OMException();
}
- sibling.setParent(parent);
+ ((OMNodeEx)sibling).setParent(parent);
if (sibling instanceof OMNodeImpl) {
OMNodeImpl siblingImpl = (OMNodeImpl) sibling;
if (nextSibling == null) {
@@ -201,7 +203,7 @@
if (nextSibling != null) {
nextSibling.setPreviousSibling(sibling);
}
- sibling.setNextSibling(nextSibling);
+ ((OMNodeEx)sibling).setNextSibling(nextSibling);
nextSibling = siblingImpl;
}
}
@@ -218,7 +220,7 @@
if (parent == null) {
throw new OMException();
}
- sibling.setParent(parent);
+ ((OMNodeEx)sibling).setParent(parent);
if (sibling instanceof OMNodeImpl) {
OMNodeImpl siblingImpl = (OMNodeImpl) sibling;
siblingImpl.setPreviousSibling(previousSibling);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java Fri Sep 23 16:48:35 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMFactory;
import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -58,8 +59,8 @@
} else if (lastNode.isComplete()) {
e = factory.createOMElement(localName, null, lastNode.getParent(),
null);
- lastNode.setNextSibling(e);
- e.setPreviousSibling(lastNode);
+ ((OMNodeEx)lastNode).setNextSibling(e);
+ ((OMNodeEx)e).setPreviousSibling(lastNode);
} else {
OMElement parent = (OMElement) lastNode;
e = factory.createOMElement(localName, null, (OMElement) lastNode,
@@ -119,11 +120,11 @@
throws SAXException {
if (lastNode.isComplete()) {
OMContainer parent = lastNode.getParent();
- parent.setComplete(true);
+ ((OMNodeEx)parent).setComplete(true);
lastNode = (OMNode) parent;
} else {
OMElement e = (OMElement) lastNode;
- e.setComplete(true);
+ ((OMNodeEx)e).setComplete(true);
}
}
@@ -143,8 +144,8 @@
factory.createText((OMElement) lastNode.getParent(),
new String(ch,
start, length));
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
+ ((OMNodeEx)lastNode).setNextSibling(node);
+ ((OMNodeEx)node).setPreviousSibling(lastNode);
} else {
OMElement e = (OMElement) lastNode;
node = factory.createText(e, new String(ch, start, length));
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java Fri Sep 23 16:48:35 2005
@@ -25,6 +25,7 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.impl.OMNodeEx;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -149,10 +150,10 @@
return null;
} else if (!lastNode.isComplete()) {
node = omfactory.createText((OMElement) lastNode, parser.getText());
- node.setType(textType);
+ ((OMNodeEx)node).setType(textType);
} else if (!(lastNode.getParent() instanceof OMDocument)) {
node = omfactory.createText((OMElement)lastNode.getParent(), parser.getText());
- node.setType(textType);
+ ((OMNodeEx)node).setType(textType);
}
return node;
}
@@ -188,7 +189,7 @@
} while (!parser.getName().equals(element.getQName()));
lastNode = element.getPreviousSibling();
if (lastNode != null) {
- lastNode.setNextSibling(null);
+ ((OMNodeEx)lastNode).setNextSibling(null);
} else {
OMElement parent = (OMElement) element.getParent();
if (parent == null) {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Fri Sep 23 16:48:35 2005
@@ -25,6 +25,7 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.llom.OMDocumentImpl;
+import org.apache.axis2.om.impl.OMNodeEx;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -103,8 +104,8 @@
} else if (lastNode.isComplete()) {
node = omfactory.createOMElement(elementName, null,
lastNode.getParent(), this);
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
+ ((OMNodeEx)lastNode).setNextSibling(node);
+ ((OMNodeEx)node).setPreviousSibling(lastNode);
} else {
OMElement e = (OMElement) lastNode;
node = omfactory.createOMElement(elementName, null,
@@ -172,11 +173,11 @@
protected void endElement(){
if (lastNode.isComplete()) {
OMElement parent = (OMElement) lastNode.getParent();
- parent.setComplete(true);
+ ((OMNodeEx)parent).setComplete(true);
lastNode = parent;
} else {
OMElement e = (OMElement) lastNode;
- e.setComplete(true);
+ ((OMNodeEx)e).setComplete(true);
}
//return lastNode;
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java Fri Sep 23 16:48:35 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.MTOMConstants;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.om.impl.llom.OMTextImpl;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
@@ -128,8 +129,8 @@
constructNode((OMElement) lastNode.getParent(),
elementName,
false);
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
+ ((OMNodeEx)lastNode).setNextSibling(node);
+ ((OMNodeEx)node).setPreviousSibling(lastNode);
} else {
OMElement e = (OMElement) lastNode;
node = constructNode((OMElement) lastNode, elementName, false);
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP11BuilderHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP11BuilderHelper.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP11BuilderHelper.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP11BuilderHelper.java Fri Sep 23 16:48:35 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.llom.exception.OMBuilderException;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPFault;
@@ -65,7 +66,7 @@
processAttributes(code);
processText(parser, value);
- code.setComplete(true);
+ ((OMNodeEx)code).setComplete(true);
element = code;
builder.elementLevel--;
@@ -83,7 +84,7 @@
processAttributes(reason);
processText(parser, faultText);
- reason.setComplete(true);
+ ((OMNodeEx)reason).setComplete(true);
element = reason;
builder.elementLevel--;
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/SOAP12BuilderHelper.java Fri Sep 23 16:48:35 2005
@@ -19,6 +19,7 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.llom.exception.OMBuilderException;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPFault;
@@ -220,7 +221,7 @@
element =
factory.createSOAPFaultText(
(SOAPFaultReason) parent, builder);
- element.setComplete(false);
+ ((OMNodeEx)element).setComplete(false);
reasonProcessing = false;
builder.setBooleanProcessingMandatoryFaultElements(false);
} else {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Fri Sep 23 16:48:35 2005
@@ -24,6 +24,7 @@
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.impl.llom.OMDocumentImpl;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPBody;
@@ -200,8 +201,8 @@
constructNode((OMElement) lastNode.getParent(),
elementName,
false);
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
+ ((OMNodeEx)lastNode).setNextSibling(node);
+ ((OMNodeEx)node).setPreviousSibling(lastNode);
} else {
OMElement e = (OMElement) lastNode;
node = constructNode((OMElement) lastNode, elementName, false);
@@ -339,25 +340,11 @@
public void endElement(){
if (lastNode.isComplete()) {
OMElement parent = (OMElement) lastNode.getParent();
-
-// //added
-// /*check whether all mandatory fault elements are present
-// */
-// if (parent.getLocalName().equals(SOAP12Constants.SOAPFAULT_LOCAL_NAME) && processingMandatoryFaultElements) {
-// throw new OMBuilderException("Missing mandatory fault elements");
-// }
-// //added
-// /*finish processing detail element in soap 1.2 builderhelper
-// */
-// if (parser.getLocalName().equals(SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME)) {
-// this.setProcessingDetailElements(false);
-// }
-
- parent.setComplete(true);
+ ((OMNodeEx)parent).setComplete(true);
lastNode = parent;
} else {
OMNode e = lastNode;
- e.setComplete(true);
+ ((OMNodeEx)e).setComplete(true);
}
elementLevel--;
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11HeaderImpl.java Fri Sep 23 16:48:35 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPHeaderBlock;
@@ -64,7 +65,7 @@
} catch (SOAPProcessingException e) {
throw new OMException(e);
}
- soapHeaderBlock.setComplete(true);
+ ((OMNodeEx)soapHeaderBlock).setComplete(true);
return soapHeaderBlock;
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java?rev=291222&r1=291221&r2=291222&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12HeaderImpl.java Fri Sep 23 16:48:35 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
+import org.apache.axis2.om.impl.OMNodeEx;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPHeaderBlock;
@@ -68,7 +69,7 @@
} catch (SOAPProcessingException e) {
throw new OMException(e);
}
- soapHeaderBlock.setComplete(true);
+ ((OMNodeEx)soapHeaderBlock).setComplete(true);
return soapHeaderBlock;
}