svn commit: r1239055 - /incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java

[da...@apache.org]

Author: damian
Date: Wed Feb  1 10:55:06 2012
New Revision: 1239055

URL: http://svn.apache.org/viewvc?rev=1239055&view=rev
Log:
Simplify StAX2SAX. Unclear why it needed to be so complex since all tests pass.

Modified:
    incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java?rev=1239055&r1=1239054&r2=1239055&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/arp/StAX2SAX.java Wed Feb  1 10:55:06 2012
@@ -73,19 +73,16 @@ public class StAX2SAX {
         parse(xef.createXMLEventReader(xmlReader));
     }
     
+    /**
+     * Consumes all StAX events and passes them on to the content handler
+     */
     public void parse(XMLEventReader xmlReader) throws XMLStreamException, SAXException {
-        // We permit nesting, so keep at track of where we are
-        int level = 0;
         while (xmlReader.hasNext()) {
             XMLEvent e = xmlReader.nextEvent();
             if (e.isStartDocument()) handler.startDocument();
             else if (e.isEndDocument()) handler.endDocument();
-            else if (e.isStartElement()) { emitSE(e.asStartElement()); level++; }
-            else if (e.isEndElement()) { 
-                emitEE(e.asEndElement()); 
-                level--;
-                if (level == 0) break;
-            }
+            else if (e.isStartElement()) emitSE(e.asStartElement());
+            else if (e.isEndElement()) emitEE(e.asEndElement()); 
             else if (e.isProcessingInstruction()) emitPi((ProcessingInstruction) e);
             else if (e.isCharacters()) emitChars(e.asCharacters());
             else if (e.isAttribute()) emitAttr((Attribute) e);