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 2015/08/15 23:20:59 UTC
svn commit: r1696100 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/
aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/ ...
Author: veithen
Date: Sat Aug 15 21:20:59 2015
New Revision: 1696100
URL: http://svn.apache.org/r1696100
Log:
Simplify the code that updates the node state (complete/incomplete).
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj?rev=1696100&r1=1696099&r2=1696100&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNodeSupport.aj Sat Aug 15 21:20:59 2015
@@ -30,5 +30,6 @@ public aspect DeferringParentNodeSupport
public final void DeferringParentNode.coreSetBuilder(OMXMLParserWrapper builder) {
this.builder = builder;
+ coreSetState(builder == null ? COMPLETE : INCOMPLETE);
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java?rev=1696100&r1=1696099&r2=1696100&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java Sat Aug 15 21:20:59 2015
@@ -250,7 +250,6 @@ public abstract class AbstractOMMetaFact
public final SOAPMessage createSOAPMessage(OMXMLParserWrapper builder) {
AxiomSOAPMessage message = createSOAPMessage();
message.coreSetBuilder(builder);
- message.coreSetState(CoreParentNode.INCOMPLETE);
return message;
}
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj?rev=1696100&r1=1696099&r2=1696100&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AxiomNodeFactorySupport.aj Sat Aug 15 21:20:59 2015
@@ -49,7 +49,6 @@ public aspect AxiomNodeFactorySupport {
public final OMDocument AxiomNodeFactory.createOMDocument(OMXMLParserWrapper builder) {
AxiomDocument document = (AxiomDocument)createDocument();
document.coreSetBuilder(builder);
- document.coreSetState(CoreParentNode.INCOMPLETE);
return document;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj?rev=1696100&r1=1696099&r2=1696100&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj Sat Aug 15 21:20:59 2015
@@ -18,7 +18,6 @@
*/
package org.apache.axiom.soap.impl.common;
-import org.apache.axiom.core.CoreParentNode;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.SOAPMessage;
@@ -28,7 +27,6 @@ public aspect AxiomSOAPFactorySupport {
// Null check for Spring-WS compatibility
if (builder != null) {
message.coreSetBuilder(builder);
- message.coreSetState(CoreParentNode.INCOMPLETE);
}
return message;
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1696100&r1=1696099&r2=1696100&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Sat Aug 15 21:20:59 2015
@@ -56,7 +56,6 @@ public class ElementImpl extends ParentN
super(factory);
internalSetLocalName(localName);
coreSetBuilder(builder);
- coreSetState(builder == null ? COMPLETE : INCOMPLETE);
if (parentNode != null) {
// TODO: dirty hack to get the correct semantics (reordering) if the parent is a SOAP envelope
if (parentNode instanceof AxiomContainer) {
Modified: webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1696100&r1=1696099&r2=1696100&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Sat Aug 15 21:20:59 2015
@@ -55,7 +55,6 @@ public class OMElementImpl extends OMNod
}
internalSetLocalName(localName);
coreSetBuilder(builder);
- coreSetState(builder == null ? COMPLETE : INCOMPLETE);
if (parent != null) {
((AxiomContainer)parent).addChild(this, builder != null);
}
@@ -71,7 +70,6 @@ public class OMElementImpl extends OMNod
public OMElementImpl(QName qname, OMContainer parent, OMFactory factory)
throws OMException {
super(factory);
- coreSetState(COMPLETE);
if (parent != null) {
parent.addChild(this);
}
@@ -86,7 +84,6 @@ public class OMElementImpl extends OMNod
*/
OMElementImpl(OMFactory factory) {
super(factory);
- coreSetState(COMPLETE);
}
/** Method handleNamespace. */