You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/03/18 23:32:42 UTC
svn commit: r755762 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om:
impl/builder/StAXOMBuilder.java util/StAXUtils.java
Author: veithen
Date: Wed Mar 18 22:32:42 2009
New Revision: 755762
URL: http://svn.apache.org/viewvc?rev=755762&view=rev
Log:
Made StAXOMBuilder#getStateString a public method in StAXUtils so that it can be reused.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java?rev=755762&r1=755761&r2=755762&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java Wed Mar 18 22:32:42 2009
@@ -186,8 +186,8 @@
log.debug("WARNING: The current state of the parser is not equal to the " +
"state just received from the parser. The current state in the paser is " +
- getStateString(currentParserToken) + " the state just received is " +
- getStateString(token));
+ StAXUtils.getEventTypeString(currentParserToken) + " the state just received is " +
+ StAXUtils.getEventTypeString(token));
/*
throw new OMException("The current token " + token +
@@ -642,46 +642,4 @@
public boolean isLookahead() {
return lookAheadToken >= 0;
}
-
- private String getStateString(int token) {
- String state = null;
- switch(token) {
- case XMLStreamConstants.START_ELEMENT:
- state = "START_ELEMENT";
- break;
- case XMLStreamConstants.START_DOCUMENT:
- state = "START_DOCUMENT";
- break;
- case XMLStreamConstants.CHARACTERS:
- state = "CHARACTERS";
- break;
- case XMLStreamConstants.CDATA:
- state = "CDATA";
- break;
- case XMLStreamConstants.END_ELEMENT:
- state = "END_ELEMENT";
- break;
- case XMLStreamConstants.END_DOCUMENT:
- state = "END_DOCUMENT";
- break;
- case XMLStreamConstants.SPACE:
- state = "SPACE";
- break;
- case XMLStreamConstants.COMMENT:
- state = "COMMENT";
- break;
- case XMLStreamConstants.DTD:
- state = "DTD";
- break;
- case XMLStreamConstants.PROCESSING_INSTRUCTION:
- state = "PROCESSING_INSTRUCTION";
- break;
- case XMLStreamConstants.ENTITY_REFERENCE:
- state = "ENTITY_REFERENCE";
- break;
- default :
- state = "UNKNOWN_STATE: " + token;
- }
- return state;
- }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java?rev=755762&r1=755761&r2=755762&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java Wed Mar 18 22:32:42 2009
@@ -26,6 +26,7 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLResolver;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -672,4 +673,53 @@
}
}
+ /**
+ * Get the string representation of a given StAX event type. The returned value is the name
+ * of the constant in {@link XMLStreamReader} corresponding to the event type.
+ *
+ * @param event the event type as returned by {@link XMLStreamReader#getEventType()} or
+ * {@link XMLStreamReader#next()}
+ * @return a string representation of the event type
+ */
+ public static String getEventTypeString(int event) {
+ String state = null;
+ switch(event) {
+ case XMLStreamConstants.START_ELEMENT:
+ state = "START_ELEMENT";
+ break;
+ case XMLStreamConstants.START_DOCUMENT:
+ state = "START_DOCUMENT";
+ break;
+ case XMLStreamConstants.CHARACTERS:
+ state = "CHARACTERS";
+ break;
+ case XMLStreamConstants.CDATA:
+ state = "CDATA";
+ break;
+ case XMLStreamConstants.END_ELEMENT:
+ state = "END_ELEMENT";
+ break;
+ case XMLStreamConstants.END_DOCUMENT:
+ state = "END_DOCUMENT";
+ break;
+ case XMLStreamConstants.SPACE:
+ state = "SPACE";
+ break;
+ case XMLStreamConstants.COMMENT:
+ state = "COMMENT";
+ break;
+ case XMLStreamConstants.DTD:
+ state = "DTD";
+ break;
+ case XMLStreamConstants.PROCESSING_INSTRUCTION:
+ state = "PROCESSING_INSTRUCTION";
+ break;
+ case XMLStreamConstants.ENTITY_REFERENCE:
+ state = "ENTITY_REFERENCE";
+ break;
+ default :
+ state = "UNKNOWN_STATE: " + event;
+ }
+ return state;
+ }
}