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 2010/05/14 21:10:32 UTC
svn commit: r944404 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom:
om/util/ElementHelper.java util/stax/TextFromElementReader.java
Author: veithen
Date: Fri May 14 19:10:32 2010
New Revision: 944404
URL: http://svn.apache.org/viewvc?rev=944404&view=rev
Log:
Break a package dependency cycle.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/TextFromElementReader.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java?rev=944404&r1=944403&r2=944404&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java Fri May 14 19:10:32 2010
@@ -255,8 +255,12 @@ public class ElementHelper {
}
}
// In all other cases, extract the data from the XMLStreamReader
- return new TextFromElementReader(cache ? element.getXMLStreamReader()
- : element.getXMLStreamReaderWithoutCaching());
+ try {
+ return new TextFromElementReader(cache ? element.getXMLStreamReader()
+ : element.getXMLStreamReaderWithoutCaching());
+ } catch (XMLStreamException ex) {
+ throw new OMException(ex);
+ }
}
/**
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/TextFromElementReader.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/TextFromElementReader.java?rev=944404&r1=944403&r2=944404&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/TextFromElementReader.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/TextFromElementReader.java Fri May 14 19:10:32 2010
@@ -69,20 +69,21 @@ public class TextFromElementReader exten
/**
* Constructor.
*
- * @param stream the stream to extract the text nodes from
- * @throws OMException if the stream doesn't start with the expected events
+ * @param stream
+ * the stream to extract the text nodes from
+ * @throws IllegalStateException
+ * if the stream doesn't start with the expected events
+ * @throws XMLStreamException
+ * if there was a parser error when attempting to position the
+ * stream to the right event
*/
- public TextFromElementReader(XMLStreamReader stream) {
+ public TextFromElementReader(XMLStreamReader stream) throws XMLStreamException {
this.stream = stream;
- try {
- if (stream.getEventType() != XMLStreamReader.START_DOCUMENT) {
- throw new OMException("Expected START_DOCUMENT as first event from parser");
- }
- if (stream.next() != XMLStreamReader.START_ELEMENT) {
- throw new OMException("Expected START_ELEMENT event");
- }
- } catch (XMLStreamException ex) {
- throw new OMException(ex);
+ if (stream.getEventType() != XMLStreamReader.START_DOCUMENT) {
+ throw new IllegalStateException("Expected START_DOCUMENT as first event from parser");
+ }
+ if (stream.next() != XMLStreamReader.START_ELEMENT) {
+ throw new IllegalStateException("Expected START_ELEMENT event");
}
}