Author: veithen
Date: Sat May 1 11:59:38 2010
New Revision: 939984
URL: http://svn.apache.org/viewvc?rev=939984&view=rev
Log:
Simplified the generateEvents code (node types have the same value as StAX
event types, except for elements).
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java?rev=939984&r1=939983&r2=939984&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/SwitchingWrapper.java
Sat May 1 11:59:38 2010
@@ -1338,38 +1338,19 @@ class SwitchingWrapper extends AbstractX
* @return Returns int.
*/
private int generateEvents(OMNode node) {
- int returnEvent;
if (node == null) {
if (log.isDebugEnabled()) {
log.debug("Node is null...returning END_DOCUMENT");
}
- returnEvent = END_DOCUMENT;
- return returnEvent;
+ return END_DOCUMENT;
}
int nodeType = node.getType();
- switch (nodeType) {
- case OMNode.ELEMENT_NODE:
- OMElement element = (OMElement) node;
- returnEvent = generateElementEvents(element);
- break;
- case OMNode.TEXT_NODE:
- case OMNode.SPACE_NODE:
- returnEvent = generateTextEvents(node);
- break;
- case OMNode.COMMENT_NODE:
- returnEvent = generateCommentEvents();
- break;
- case OMNode.CDATA_SECTION_NODE:
- returnEvent = generateCdataEvents();
- break;
- case OMNode.PI_NODE:
- returnEvent = PROCESSING_INSTRUCTION;
- break;
- default :
- throw new OMStreamingException("Encountered node with unknown
node type "
- + nodeType);
+ if (nodeType == OMNode.ELEMENT_NODE) {
+ OMElement element = (OMElement) node;
+ return generateElementEvents(element);
+ } else {
+ return nodeType;
}
- return returnEvent;
}
/**
@@ -1392,34 +1373,6 @@ class SwitchingWrapper extends AbstractX
return returnValue;
}
- /**
- * Method generateTextEvents.
- *
- * @return Returns int.
- */
- private int generateTextEvents(OMNode node) {
- return ((OMText)node).getType();
- }
-
- /**
- * Method generateCommentEvents.
- *
- * @return Returns int.
- * @noinspection SameReturnValue
- */
- private int generateCommentEvents() {
- return COMMENT;
- }
-
- /**
- * Method generateCdataEvents.
- *
- * @return Returns int.
- */
- private int generateCdataEvents() {
- return CDATA;
- }
-
/*
* ####################################################################
* Other helper methods
