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 2013/01/13 17:08:29 UTC
svn commit: r1432650 -
/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Author: veithen
Date: Sun Jan 13 16:08:29 2013
New Revision: 1432650
URL: http://svn.apache.org/viewvc?rev=1432650&view=rev
Log:
Some code simplifications.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.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/SwitchingWrapper.java?rev=1432650&r1=1432649&r2=1432650&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Sun Jan 13 16:08:29 2013
@@ -1268,28 +1268,20 @@ class SwitchingWrapper extends AbstractX
* @return Returns int.
*/
private int generateEvents(OMSerializable node) {
- if (node instanceof OMDocument) {
- return generateContainerEvents((OMDocument)node, true);
- } else {
- int nodeType = ((OMNode)node).getType();
- if (nodeType == OMNode.ELEMENT_NODE) {
- return generateContainerEvents((OMElement)node, false);
+ if (node instanceof OMContainer) {
+ OMContainer container = (OMContainer)node;
+ if (nodeStack == null) {
+ nodeStack = new Stack();
+ }
+ if (!nodeStack.isEmpty() && nodeStack.peek().equals(container)) {
+ nodeStack.pop();
+ return container instanceof OMDocument ? END_DOCUMENT : END_ELEMENT;
} else {
- return nodeType;
+ nodeStack.push(container);
+ return container instanceof OMDocument ? START_DOCUMENT : START_ELEMENT;
}
- }
- }
-
- private int generateContainerEvents(OMContainer container, boolean isDocument) {
- if (nodeStack == null) {
- nodeStack = new Stack();
- }
- if (!nodeStack.isEmpty() && nodeStack.peek().equals(container)) {
- nodeStack.pop();
- return isDocument ? END_DOCUMENT : END_ELEMENT;
} else {
- nodeStack.push(container);
- return isDocument ? START_DOCUMENT : START_ELEMENT;
+ return ((OMNode)node).getType();
}
}