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 2012/07/09 08:14:15 UTC
svn commit: r1358928 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/impl/
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ axiom-i...
Author: veithen
Date: Mon Jul 9 06:14:14 2012
New Revision: 1358928
URL: http://svn.apache.org/viewvc?rev=1358928&view=rev
Log:
Cleaned up the OMContainerEx interface.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IParentNode.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerHelper.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNodeHelper.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java Mon Jul 9 06:14:14 2012
@@ -31,19 +31,5 @@ public interface OMContainerEx extends O
void discarded();
- void buildNext();
-
- /**
- * forcefully set the first element in this parent element
- * @param omNode
- */
- public void setFirstChild(OMNode omNode);
-
- /**
- * forcefully set the last element in this parent element
- * @param omNode
- */
- public void setLastChild(OMNode omNode);
-
public void addChild(OMNode omNode, boolean fromBuilder);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IContainer.java Mon Jul 9 06:14:14 2012
@@ -22,5 +22,17 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.OMContainerEx;
public interface IContainer extends OMContainerEx, IParentNode {
+ /**
+ * forcefully set the first element in this parent element
+ * @param omNode
+ */
+ public void setFirstChild(OMNode omNode);
+
+ /**
+ * forcefully set the last element in this parent element
+ * @param omNode
+ */
+ public void setLastChild(OMNode omNode);
+
OMNode getLastKnownOMChild();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IParentNode.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IParentNode.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IParentNode.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/IParentNode.java Mon Jul 9 06:14:14 2012
@@ -37,7 +37,6 @@ public interface IParentNode {
OMXMLParserWrapper getBuilder();
int getState();
boolean isComplete();
- void buildNext();
/**
* Get the first child if it is available. The child is available if it is complete or
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerHelper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerHelper.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerHelper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMContainerHelper.java Mon Jul 9 06:14:14 2012
@@ -49,7 +49,7 @@ public final class OMContainerHelper {
if (builder != null && builder instanceof StAXOMBuilder) {
if (!container.isComplete()) {
if (((StAXOMBuilder) builder).isLookahead()) {
- container.buildNext();
+ buildNext(container);
}
}
}
@@ -153,8 +153,8 @@ public final class OMContainerHelper {
}
}
- public static void buildNext(IContainer container) {
- OMXMLParserWrapper builder = container.getBuilder();
+ public static void buildNext(IParentNode that) {
+ OMXMLParserWrapper builder = that.getBuilder();
if (builder != null) {
if (((StAXOMBuilder)builder).isClosed()) {
throw new OMException("The builder has already been closed");
@@ -171,7 +171,7 @@ public final class OMContainerHelper {
public static OMNode getFirstOMChild(IParentNode that) {
OMNode firstChild;
while ((firstChild = that.getFirstOMChildIfAvailable()) == null && !that.isComplete()) {
- that.buildNext();
+ buildNext(that);
}
return firstChild;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNodeHelper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNodeHelper.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNodeHelper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNodeHelper.java Mon Jul 9 06:14:14 2012
@@ -35,7 +35,7 @@ public final class OMNodeHelper {
throw new NodeUnavailableException();
case IParentNode.INCOMPLETE:
do {
- parent.buildNext();
+ OMContainerHelper.buildNext(parent);
} while (parent.getState() == IParentNode.INCOMPLETE
&& (nextSibling = node.getNextOMSiblingIfAvailable()) == null);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java Mon Jul 9 06:14:14 2012
@@ -490,10 +490,6 @@ public class AttrImpl extends RootNode i
// An attribute node doesn't have a builder
}
- public void buildNext() {
- // An attribute node doesn't have a builder
- }
-
public final Node getNextSibling() {
return null;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentFragmentImpl.java Mon Jul 9 06:14:14 2012
@@ -112,10 +112,6 @@ public class DocumentFragmentImpl extend
// A document fragment doesn't have a builder
}
- public final void buildNext() {
- // A document fragment doesn't have a builder
- }
-
public final Node getNextSibling() {
return null;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Mon Jul 9 06:14:14 2012
@@ -622,10 +622,6 @@ public class DocumentImpl extends RootNo
OMContainerHelper.build(this);
}
- public final void buildNext() {
- OMContainerHelper.buildNext(this);
- }
-
public final Node getNextSibling() {
return null;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Mon Jul 9 06:14:14 2012
@@ -1370,10 +1370,6 @@ public class ElementImpl extends ParentN
OMContainerHelper.build(this);
}
- public final void buildNext() {
- OMContainerHelper.buildNext(this);
- }
-
public final OMNode getNextOMSibling() throws OMException {
return OMNodeHelper.getNextOMSibling(this);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java Mon Jul 9 06:14:14 2012
@@ -349,8 +349,4 @@ public class OMDocumentImpl extends OMSe
public void build() {
OMContainerHelper.build(this);
}
-
- public void buildNext() {
- OMContainerHelper.buildNext(this);
- }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Mon Jul 9 06:14:14 2012
@@ -697,10 +697,6 @@ public class OMElementImpl extends OMNod
}
- public void buildNext() {
- OMContainerHelper.buildNext(this);
- }
-
public int getState() {
return state;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1358928&r1=1358927&r2=1358928&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Mon Jul 9 06:14:14 2012
@@ -887,11 +887,6 @@ public class OMSourcedElementImpl extend
return super.getLastKnownOMChild();
}
- public void buildNext() {
- forceExpand();
- super.buildNext();
- }
-
public OMNode detach() throws OMException {
// detach without expanding the tree
boolean complete = isComplete();