Author: veithen
Date: Mon Jun 22 18:32:24 2015
New Revision: 1686914
URL: http://svn.apache.org/r1686914
Log:
Remove some legacy methods.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
(original)
+++
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNode.java
Mon Jun 22 18:32:24 2015
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.core;
+import org.apache.axiom.om.OMNode;
+
public interface CoreChildNode extends CoreNode {
/**
* Get the parent element of this node.
@@ -26,4 +28,16 @@ public interface CoreChildNode extends C
* the parent is not an element
*/
CoreElement coreGetParentElement();
+
+ /**
+ * Get the next sibling if it is available. The sibling is available if it
is complete or
+ * if the builder has started building the node. In the latter case,
+ * {@link OMNode#isComplete()} may return <code>false</code> when called
on the sibling.
+ * In contrast to {@link OMNode#getNextOMSibling()}, this method will
never modify
+ * the state of the underlying parser.
+ *
+ * @return the next sibling or <code>null</code> if the node has no next
sibling or
+ * the builder has not yet started to build the next sibling
+ */
+ CoreChildNode coreGetNextSiblingIfAvailable();
}
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomChildNodeSupport.aj
Mon Jun 22 18:32:24 2015
@@ -31,10 +31,6 @@ public aspect AxiomChildNodeSupport {
return parent instanceof OMContainer ? (OMContainer)parent : null;
}
- public final OMNode AxiomChildNode.getNextOMSiblingIfAvailable() {
- return (OMNode)coreGetNextSiblingIfAvailable();
- }
-
public final OMNode AxiomChildNode.getNextOMSibling() {
return (OMNode)coreGetNextSibling();
}
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
Mon Jun 22 18:32:24 2015
@@ -168,10 +168,6 @@ public aspect AxiomContainerSupport {
}
}
- public OMNode AxiomContainer.getFirstOMChildIfAvailable() {
- return (OMNode)coreGetFirstChildIfAvailable();
- }
-
public OMNode AxiomContainer.getFirstOMChild() {
return (OMNode)coreGetFirstChild();
}
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Mon Jun 22 18:32:24 2015
@@ -52,9 +52,9 @@ import org.apache.axiom.om.OMSerializabl
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.impl.common.AxiomChildNode;
import org.apache.axiom.om.impl.common.AxiomContainer;
import org.apache.axiom.om.impl.common.OMDataSourceUtil;
import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
@@ -549,7 +549,7 @@ final class Navigator extends PullSerial
return true;
} else if (node instanceof OMContainer && !visited) {
AxiomContainer current = (AxiomContainer)node;
- OMNode firstChild = cache ? current.getFirstOMChild() :
current.getFirstOMChildIfAvailable();
+ OMNode firstChild = cache ? current.getFirstOMChild() :
(OMNode)current.coreGetFirstChildIfAvailable();
if (firstChild != null) {
node = firstChild;
visited = false;
@@ -566,8 +566,8 @@ final class Navigator extends PullSerial
visited = true;
return true;
} else {
- OMNodeEx current = (OMNodeEx)node;
- OMNode nextSibling = cache ? current.getNextOMSibling() :
current.getNextOMSiblingIfAvailable();
+ AxiomChildNode current = (AxiomChildNode)node;
+ AxiomChildNode nextSibling = (AxiomChildNode)(cache ?
current.coreGetNextSibling() : current.coreGetNextSiblingIfAvailable());
if (nextSibling != null) {
node = nextSibling;
visited = false;
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/Serializer.java
Mon Jun 22 18:32:24 2015
@@ -274,10 +274,10 @@ public abstract class Serializer {
}
} else {
// First, recursively serialize all child nodes that have already
been created
- AxiomChildNode child =
(AxiomChildNode)container.getFirstOMChildIfAvailable();
+ AxiomChildNode child =
(AxiomChildNode)container.coreGetFirstChildIfAvailable();
while (child != null) {
child.internalSerialize(this, format, cache);
- child = (AxiomChildNode)child.getNextOMSiblingIfAvailable();
+ child = (AxiomChildNode)child.coreGetNextSiblingIfAvailable();
}
// 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/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
(original)
+++
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
Mon Jun 22 18:32:24 2015
@@ -27,16 +27,4 @@ import org.apache.axiom.om.OMNode;
*/
public interface OMNodeEx extends OMNode {
public void setComplete(boolean state);
-
- /**
- * Get the next sibling if it is available. The sibling is available if it
is complete or
- * if the builder has started building the node. In the latter case,
- * {@link OMNode#isComplete()} may return <code>false</code> when called
on the sibling.
- * In contrast to {@link OMNode#getNextOMSibling()}, this method will
never modify
- * the state of the underlying parser.
- *
- * @return the next sibling or <code>null</code> if the node has no next
sibling or
- * the builder has not yet started to build the next sibling
- */
- public OMNode getNextOMSiblingIfAvailable();
}
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=1686914&r1=1686913&r2=1686914&view=diff
==============================================================================
---
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
(original)
+++
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
Mon Jun 22 18:32:24 2015
@@ -562,33 +562,6 @@ public class OMSerializerUtil {
}
/**
- * @deprecated This is an internal method that is no longer used.
- */
- public static void serializeChildren(OMContainer container,
XMLStreamWriter writer,
- boolean cache) throws XMLStreamException {
- if (cache) {
- OMNode child = container.getFirstOMChild();
- while (child != null) {
- child.serialize(writer, true);
- child = child.getNextOMSibling();
- }
- } else {
- OMNode child = (OMNodeEx)container.getFirstOMChild();
- while (child != null) {
- if ((!(child instanceof OMElement)) || child.isComplete() ||
- ((OMElement)child).getBuilder() == null) {
- child.serialize(writer, false);
- } else {
- OMElement element = (OMElement) child;
- element.getBuilder().setCache(false);
- serializeByPullStream(element, writer, cache);
- }
- child = ((OMNodeEx)child).getNextOMSiblingIfAvailable();
- }
- }
- }
-
- /**
* Get the next prefix name
* @return next prefix name
*/
