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 2016/02/20 11:00:50 UTC
svn commit: r1731357 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/
aspects/om-aspects/src/main/java/org/apache/axiom/om...
Author: veithen
Date: Sat Feb 20 10:00:49 2016
New Revision: 1731357
URL: http://svn.apache.org/viewvc?rev=1731357&view=rev
Log:
Clean up the addChild method.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java Sat Feb 20 10:00:49 2016
@@ -140,10 +140,10 @@ public final class BuilderHandler implem
if (pendingCharacterData != null) {
AxiomCharacterDataNode cdataNode = nodeFactory.createNode(AxiomCharacterDataNode.class);
cdataNode.coreSetCharacterData(pendingCharacterData);
- target.addChild(cdataNode, true);
+ target.coreAppendChild(cdataNode, true);
pendingCharacterData = null;
}
- target.addChild(node, true);
+ target.coreAppendChild(node, true);
if (!(node instanceof CoreCharacterDataNode)) {
nodeAdded(node);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Sat Feb 20 10:00:49 2016
@@ -98,7 +98,7 @@ public class OMFactoryImpl implements OM
node.coreSetSystemId(systemId);
node.coreSetInternalSubset(internalSubset);
if (parent != null) {
- ((AxiomContainer)parent).addChild(node, false);
+ ((AxiomContainer)parent).addChild(node);
}
return node;
}
@@ -124,7 +124,7 @@ public class OMFactoryImpl implements OM
throw new IllegalArgumentException("Invalid node type");
}
if (parent != null) {
- ((AxiomContainer)parent).addChild(node, false);
+ ((AxiomContainer)parent).addChild(node);
}
node.coreSetCharacterData(content, AxiomSemantics.INSTANCE);
return node;
@@ -193,7 +193,7 @@ public class OMFactoryImpl implements OM
node.coreSetTarget(piTarget);
node.coreSetCharacterData(piData, AxiomSemantics.INSTANCE);
if (parent != null) {
- ((AxiomContainer)parent).addChild(node, false);
+ ((AxiomContainer)parent).addChild(node);
}
return node;
}
@@ -202,7 +202,7 @@ public class OMFactoryImpl implements OM
AxiomEntityReference node = createNode(AxiomEntityReference.class);
node.coreSetName(name);
if (parent != null) {
- ((AxiomContainer)parent).addChild(node, false);
+ ((AxiomContainer)parent).addChild(node);
}
return node;
}
@@ -211,7 +211,7 @@ public class OMFactoryImpl implements OM
AxiomComment node = createNode(AxiomComment.class);
node.coreSetCharacterData(content, AxiomSemantics.INSTANCE);
if (parent != null) {
- ((AxiomContainer)parent).addChild(node, false);
+ ((AxiomContainer)parent).addChild(node);
}
return node;
}
@@ -224,7 +224,7 @@ public class OMFactoryImpl implements OM
OMContainer parent, String localName, OMNamespace ns) {
T element = createNode(type);
if (parent != null) {
- ((AxiomContainer)parent).addChild(element, false);
+ ((AxiomContainer)parent).addChild(element);
}
element.initName(localName, ns, true);
return element;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomContainer.java Sat Feb 20 10:00:49 2016
@@ -25,8 +25,6 @@ import org.apache.axiom.om.OMNode;
public interface AxiomContainer extends OMContainer, AxiomCoreParentNode {
void discarded();
- void addChild(OMNode omNode, boolean fromBuilder);
-
/**
* Check if the node can be added as a child of this container.
*
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj Sat Feb 20 10:00:49 2016
@@ -122,10 +122,6 @@ public aspect AxiomContainerSupport {
return reader;
}
- public void AxiomContainer.addChild(OMNode omNode) {
- addChild(omNode, false);
- }
-
public final AxiomChildNode AxiomContainer.prepareNewChild(OMNode omNode) {
AxiomChildNode child;
// Careful here: if the child was created by another Axiom implementation, it doesn't
@@ -139,17 +135,10 @@ public aspect AxiomContainerSupport {
return child;
}
- public void AxiomContainer.addChild(OMNode omNode, boolean fromBuilder) {
- AxiomChildNode child;
- if (fromBuilder) {
- // If the new child was provided by the builder, we know that it was created by
- // the same factory
- child = (AxiomChildNode)omNode;
- } else {
- child = prepareNewChild(omNode);
- }
+ public void AxiomContainer.addChild(OMNode omNode) {
+ AxiomChildNode child = prepareNewChild(omNode);
- coreAppendChild(child, fromBuilder);
+ coreAppendChild(child, false);
// For a normal OMNode, the incomplete status is
// propogated up the tree.
@@ -158,7 +147,7 @@ public aspect AxiomContainerSupport {
// So only propogate the incomplete setting if this
// is a normal OMNode
// TODO: this is crap and needs to be reviewed
- if (!fromBuilder && !child.isComplete() &&
+ if (!child.isComplete() &&
!(child instanceof OMSourcedElement)) {
setComplete(false);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java Sat Feb 20 10:00:49 2016
@@ -68,7 +68,7 @@ public abstract class SOAPFactoryImpl ex
T element = createNode(type);
if (parent != null) {
element.checkParent(parent);
- ((AxiomContainer)parent).addChild(element, false);
+ ((AxiomContainer)parent).addChild(element);
}
if (qname.getNamespaceURI().length() == 0) {
element.initName(qname.getLocalPart(), null, true);
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java Sat Feb 20 10:00:49 2016
@@ -37,7 +37,7 @@ import org.w3c.dom.Node;
public abstract class SOAPEnvelopeImpl extends SOAPElement implements AxiomSOAPEnvelope,
OMConstants {
- public void addChild(OMNode child, boolean fromBuilder) {
+ public void addChild(OMNode child) {
internalCheckChild(child);
if (child instanceof SOAPHeader) {
@@ -70,7 +70,7 @@ public abstract class SOAPEnvelopeImpl e
}
}
}
- super.addChild(child, fromBuilder);
+ super.addChild(child);
}
public Node insertBefore(Node newChild, Node refChild) throws DOMException {
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Sat Feb 20 10:00:49 2016
@@ -44,7 +44,7 @@ public abstract class SOAPEnvelopeImpl e
* Add a SOAPHeader or SOAPBody object
* @param child an OMNode to add - must be either a SOAPHeader or a SOAPBody
*/
- public void addChild(OMNode child, boolean fromBuilder) {
+ public void addChild(OMNode child) {
internalCheckChild(child);
if (child instanceof SOAPHeader) {
@@ -77,7 +77,7 @@ public abstract class SOAPEnvelopeImpl e
}
}
}
- super.addChild(child, fromBuilder);
+ super.addChild(child);
}
/**
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java?rev=1731357&r1=1731356&r2=1731357&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java Sat Feb 20 10:00:49 2016
@@ -152,7 +152,7 @@ public abstract class SOAPHeaderImpl ext
}
- public void addChild(OMNode child, boolean fromBuilder) {
+ public void addChild(OMNode child) {
// Make sure a proper element is added. The children of a SOAPHeader should be
// SOAPHeaderBlock objects.
@@ -167,7 +167,7 @@ public abstract class SOAPHeaderImpl ext
log.debug(exceptionToString(e));
}
}
- super.addChild(child, fromBuilder);
+ super.addChild(child);
}
public static String exceptionToString(Throwable e) {