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/27 19:12:32 UTC
svn commit: r1732661 - in /webservices/axiom/trunk:
aspects/core-aspects/src/main/java/org/apache/axiom/core/
aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/ aspects/o...
Author: veithen
Date: Sat Feb 27 18:12:31 2016
New Revision: 1732661
URL: http://svn.apache.org/viewvc?rev=1732661&view=rev
Log:
Remove the distinction between deferring and non deferring parent nodes.
Removed:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/DeferringParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/NonDeferringParentNode.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/DeferringParentNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/NonDeferringParentNodeSupport.aj
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSUnawareAttribute.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreAttribute.java Sat Feb 27 18:12:31 2016
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.core;
-public interface CoreAttribute extends NonDeferringParentNode, CoreCharacterDataContainingParentNode {
+public interface CoreAttribute extends CoreCharacterDataContainingParentNode {
/**
* Get the owner element of this attribute.
*
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreCDATASection.java Sat Feb 27 18:12:31 2016
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreCDATASection extends CoreChildNode, CoreCharacterDataContainingParentNode, DeferringParentNode {
+public interface CoreCDATASection extends CoreChildNode, CoreCharacterDataContainingParentNode {
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreComment.java Sat Feb 27 18:12:31 2016
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreComment extends CoreChildNode, CoreCharacterDataContainingParentNode, NonDeferringParentNode {
+public interface CoreComment extends CoreChildNode, CoreCharacterDataContainingParentNode {
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreDocumentFragment.java Sat Feb 27 18:12:31 2016
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreDocumentFragment extends CoreMixedContentContainer, NonDeferringParentNode {
+public interface CoreDocumentFragment extends CoreMixedContentContainer {
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreElement.java Sat Feb 27 18:12:31 2016
@@ -20,7 +20,7 @@ package org.apache.axiom.core;
import java.util.Iterator;
-public interface CoreElement extends CoreChildNode, CoreMixedContentContainer, CoreNamedNode, DeferringParentNode {
+public interface CoreElement extends CoreChildNode, CoreMixedContentContainer, CoreNamedNode {
/**
* Get the first attribute of this element.
*
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreProcessingInstruction.java Sat Feb 27 18:12:31 2016
@@ -18,6 +18,6 @@
*/
package org.apache.axiom.core;
-public interface CoreProcessingInstruction extends CoreChildNode, CoreCharacterDataContainingParentNode, NonDeferringParentNode {
+public interface CoreProcessingInstruction extends CoreChildNode, CoreCharacterDataContainingParentNode {
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Sat Feb 27 18:12:31 2016
@@ -48,6 +48,7 @@ import org.apache.axiom.core.stream.Stre
import org.apache.axiom.core.stream.XmlHandler;
public aspect CoreParentNodeSupport {
+ private InputContext CoreParentNode.context;
private Object CoreParentNode.content;
// TODO: rename & make final
@@ -64,6 +65,20 @@ public aspect CoreParentNodeSupport {
}
public void CoreParentNode.forceExpand() {}
+
+ public final Builder CoreParentNode.coreGetBuilder() {
+ forceExpand();
+ return context == null ? null : context.getBuilder();
+ }
+
+ public final InputContext CoreParentNode.coreGetInputContext() {
+ return context;
+ }
+
+ public final void CoreParentNode.coreSetInputContext(InputContext context) {
+ this.context = context;
+ coreSetState(context == null ? COMPLETE : INCOMPLETE);
+ }
final Content CoreParentNode.getContent(boolean create) {
if (getState() == COMPACT) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomDocument.java Sat Feb 27 18:12:31 2016
@@ -19,9 +19,8 @@
package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreDocument;
-import org.apache.axiom.core.DeferringParentNode;
import org.apache.axiom.om.OMDocument;
-public interface AxiomDocument extends OMDocument, AxiomContainer, CoreDocument, DeferringParentNode {
+public interface AxiomDocument extends OMDocument, AxiomContainer, CoreDocument {
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomElement.java Sat Feb 27 18:12:31 2016
@@ -19,11 +19,10 @@
package org.apache.axiom.om.impl.intf;
import org.apache.axiom.core.CoreNSAwareElement;
-import org.apache.axiom.core.DeferringParentNode;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-public interface AxiomElement extends OMElement, AxiomContainer, AxiomChildNode, AxiomNamedInformationItem, CoreNSAwareElement, DeferringParentNode {
+public interface AxiomElement extends OMElement, AxiomContainer, AxiomChildNode, AxiomNamedInformationItem, CoreNSAwareElement {
/**
* Adds a namespace declaration without doing any additional checks. This method is used
* internally by the builder (which can safely assume that the data received from the parser is
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomAttributeSupport.aj Sat Feb 27 18:12:31 2016
@@ -62,4 +62,8 @@ public aspect AxiomAttributeSupport {
public final void AxiomAttribute.setAttributeType(String type) {
coreSetType(type);
}
+
+ public final void AxiomAttribute.build() {
+ // TODO
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomCommentSupport.aj Sat Feb 27 18:12:31 2016
@@ -54,4 +54,8 @@ public aspect AxiomCommentSupport {
public final void AxiomComment.buildWithAttachments() {
}
+
+ public final void AxiomComment.build() {
+ // TODO
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomNamespaceDeclarationSupport.aj Sat Feb 27 18:12:31 2016
@@ -52,4 +52,8 @@ public aspect AxiomNamespaceDeclarationS
this.declaredNamespace = declaredNamespace;
coreSetCharacterData(declaredNamespace.getNamespaceURI(), AxiomSemantics.INSTANCE);
}
+
+ public final void AxiomNamespaceDeclaration.build() {
+ // TODO
+ }
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomProcessingInstructionSupport.aj Sat Feb 27 18:12:31 2016
@@ -57,4 +57,8 @@ public aspect AxiomProcessingInstruction
public final void AxiomProcessingInstruction.buildWithAttachments() {
}
+
+ public final void AxiomProcessingInstruction.build() {
+ // TODO
+ }
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java Sat Feb 27 18:12:31 2016
@@ -22,5 +22,7 @@ package org.apache.axiom.om.impl.dom;
import org.apache.axiom.dom.DOMDocumentFragment;
public class DocumentFragmentImpl extends ParentNode implements DOMDocumentFragment {
-
+ public final void build() {
+ // TODO
+ }
}
Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSUnawareAttribute.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSUnawareAttribute.java?rev=1732661&r1=1732660&r2=1732661&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSUnawareAttribute.java (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSUnawareAttribute.java Sat Feb 27 18:12:31 2016
@@ -21,5 +21,7 @@ package org.apache.axiom.om.impl.dom;
import org.apache.axiom.dom.DOMNSUnawareAttribute;
public class NSUnawareAttribute extends AttrImpl implements DOMNSUnawareAttribute {
-
+ public final void build() {
+ // TODO
+ }
}