Author: veithen
Date: Sun Jul 6 23:14:30 2014
New Revision: 1608312
URL: http://svn.apache.org/r1608312
Log:
CoreChildNode should not extend OM interfaces.
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java?rev=1608312&r1=1608311&r2=1608312&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/CoreChildNode.java
Sun Jul 6 23:14:30 2014
@@ -18,9 +18,7 @@
*/
package org.apache.axiom.om.impl.common;
-import org.apache.axiom.om.impl.OMNodeEx;
-
-public interface CoreChildNode extends OMNodeEx, ISerializable {
+public interface CoreChildNode {
CoreParentNode coreGetParent();
void coreSetParent(CoreParentNode parent);
CoreChildNode coreGetNextSiblingIfAvailable();
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java?rev=1608312&r1=1608311&r2=1608312&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/INode.java
Sun Jul 6 23:14:30 2014
@@ -21,7 +21,7 @@ package org.apache.axiom.om.impl.common;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMNodeEx;
-public interface INode extends OMNodeEx, CoreChildNode {
+public interface INode extends OMNodeEx, CoreChildNode, ISerializable {
public void setNextOMSibling(OMNode node);
public void setPreviousOMSibling(OMNode previousSibling);
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj?rev=1608312&r1=1608311&r2=1608312&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerSupport.aj
Sun Jul 6 23:14:30 2014
@@ -123,9 +123,9 @@ public aspect OMContainerSupport {
if (coreGetFirstChildIfAvailable() == null) {
coreSetFirstChild(child);
} else {
- CoreChildNode lastChild = coreGetLastKnownChild();
+ INode lastChild = (INode)coreGetLastKnownChild();
child.setPreviousOMSibling(lastChild);
- ((INode)lastChild).setNextOMSibling(child);
+ lastChild.setNextOMSibling(child);
}
coreSetLastChild(child);
@@ -176,8 +176,8 @@ public aspect OMContainerSupport {
boolean updateState;
if (getState() == CoreParentNode.INCOMPLETE && getBuilder() != null) {
CoreChildNode lastKnownChild = coreGetLastKnownChild();
- if (lastKnownChild != null) {
- lastKnownChild.build();
+ if (lastKnownChild instanceof IContainer) {
+ ((IContainer)lastKnownChild).build();
}
((StAXOMBuilder)getBuilder()).discard(this);
updateState = true;
@@ -185,7 +185,7 @@ public aspect OMContainerSupport {
updateState = false;
}
while (child != null) {
- CoreChildNode nextSibling =
(CoreChildNode)child.getNextOMSiblingIfAvailable();
+ CoreChildNode nextSibling = child.coreGetNextSiblingIfAvailable();
((INode)child).setPreviousOMSibling(null);
((INode)child).setNextOMSibling(null);
child.coreSetParent(null);
Modified:
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java?rev=1608312&r1=1608311&r2=1608312&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
(original)
+++
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
Sun Jul 6 23:14:30 2014
@@ -42,8 +42,8 @@ import org.apache.axiom.om.OMOutputForma
import org.apache.axiom.om.OMSerializable;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.common.CoreChildNode;
import org.apache.axiom.om.impl.common.IContainer;
+import org.apache.axiom.om.impl.common.INode;
import org.apache.axiom.om.impl.common.OMDataSourceUtil;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
@@ -267,17 +267,17 @@ public abstract class Serializer {
throw new NodeUnavailableException();
}
if (cache) {
- CoreChildNode child = (CoreChildNode)container.getFirstOMChild();
+ INode child = (INode)container.getFirstOMChild();
while (child != null) {
child.internalSerialize(this, format, true);
- child = (CoreChildNode)child.getNextOMSibling();
+ child = (INode)child.getNextOMSibling();
}
} else {
// First, recursively serialize all child nodes that have already
been created
- CoreChildNode child =
(CoreChildNode)container.getFirstOMChildIfAvailable();
+ INode child = (INode)container.getFirstOMChildIfAvailable();
while (child != null) {
child.internalSerialize(this, format, cache);
- child = (CoreChildNode)child.getNextOMSiblingIfAvailable();
+ child = (INode)child.getNextOMSiblingIfAvailable();
}
// Next, if the container is incomplete, disable caching
(temporarily)
// and serialize the nodes that have not been built yet by copying
the
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java?rev=1608312&r1=1608311&r2=1608312&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPFaultRoleImpl.java
Sun Jul 6 23:14:30 2014
@@ -44,8 +44,8 @@ public abstract class SOAPFaultRoleImpl
}
public void setRoleValue(String uri) {
- if (coreGetFirstChildIfAvailable() != null) {
- coreGetFirstChildIfAvailable().detach();
+ if (getFirstOMChildIfAvailable() != null) {
+ getFirstOMChildIfAvailable().detach();
}
this.setText(uri);
}
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1608312&r1=1608311&r2=1608312&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Sun Jul 6 23:14:30 2014
@@ -137,7 +137,7 @@ public class SOAPEnvelopeImpl extends SO
// body and insert the header. If the body is not found,
// this indicates that it has not been parsed yet...and
// the code will fall through to the super.addChild.
- OMNode node = coreGetLastKnownChild();
+ OMNode node = (OMNode)coreGetLastKnownChild();
while (node != null) {
if (node instanceof SOAPBody) {
node.insertSiblingBefore(child);
