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 ch...@apache.org on 2005/07/14 07:39:19 UTC
svn commit: r218989 - in /webservices/axis/trunk/java/modules/xml:
src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
test/org/apache/axis2/soap/SOAPHeaderBlockTest.java
Author: chinthaka
Date: Wed Jul 13 22:39:17 2005
New Revision: 218989
URL: http://svn.apache.org/viewcvs?rev=218989&view=rev
Log:
removing linked list impl specific stuff from OM builder
Modified:
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPHeaderBlockTest.java
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=218989&r1=218988&r2=218989&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java Wed Jul 13 22:39:17 2005
@@ -23,9 +23,6 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMXMLParserWrapper;
-import org.apache.axis2.om.impl.llom.OMElementImpl;
-import org.apache.axis2.om.impl.llom.OMNodeImpl;
-import org.apache.axis2.om.impl.llom.OMNamespaceImpl;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -186,13 +183,9 @@
* @throws OMException
*/
public void discard(OMElement el) throws OMException {
- OMElementImpl elementImpl = null;
- if (el instanceof OMElementImpl) {
- elementImpl = (OMElementImpl) el;
- } else {
- throw new OMException();
- }
- if (elementImpl.isComplete() || !cache) {
+ OMElement element = null;
+
+ if (element.isComplete() || !cache) {
throw new OMException();
}
try {
@@ -201,12 +194,12 @@
while (parser.next() != XMLStreamConstants.END_ELEMENT) ;
// TODO:
- } while (!parser.getName().equals(elementImpl.getQName()));
- lastNode = (OMNodeImpl) elementImpl.getPreviousSibling();
+ } while (!parser.getName().equals(element.getQName()));
+ lastNode = element.getPreviousSibling();
if (lastNode != null) {
lastNode.setNextSibling(null);
} else {
- OMElement parent = (OMElement) elementImpl.getParent();
+ OMElement parent = (OMElement) element.getParent();
if (parent == null) {
throw new OMException();
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=218989&r1=218988&r2=218989&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Wed Jul 13 22:39:17 2005
@@ -352,7 +352,7 @@
parent.setComplete(true);
lastNode = parent;
} else {
- OMNode e = (OMNode) lastNode;
+ OMNode e = lastNode;
e.setComplete(true);
}
elementLevel--;
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPHeaderBlockTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPHeaderBlockTest.java?rev=218989&r1=218988&r2=218989&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPHeaderBlockTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPHeaderBlockTest.java Wed Jul 13 22:39:17 2005
@@ -16,6 +16,9 @@
package org.apache.axis2.soap;
+import org.apache.axis2.om.OMElement;
+
+import javax.xml.namespace.QName;
import java.util.Iterator;
public class SOAPHeaderBlockTest extends SOAPHeaderTestCase {