1 files changed, 20 insertions, 2 deletions
diff --git a/libjava/classpath/javax/xml/stream/XMLEventReader.java b/libjava/classpath/javax/xml/stream/XMLEventReader.java
index 5d4c1700065..35ad5696eda 100644
--- a/libjava/classpath/javax/xml/stream/XMLEventReader.java
+++ b/libjava/classpath/javax/xml/stream/XMLEventReader.java
@@ -1,5 +1,5 @@
 /* XMLEventReader.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,10 +44,21 @@ import javax.xml.stream.events.XMLEvent;
  * An XML parser.
  */
 public interface XMLEventReader
-  extends XMLIterator
+  extends Iterator
 {
 
   /**
+   * Returns the next XML event.
+   */
+  XMLEvent nextEvent()
+    throws XMLStreamException;
+
+  /**
+   * Indicates whether there are more XML events to be read.
+   */
+  boolean hasNext();
+  
+  /**
    * Looks at the next XML event without advancing the cursor in the stream.
    * Returns <code>null</code> if there are no more events to read.
    */
@@ -80,5 +91,12 @@ public interface XMLEventReader
   Object getProperty(String name)
     throws IllegalArgumentException;
 
+  /**
+   * Free any resources associated with this parser.
+   * This method will not close the underlying input source.
+   */
+  void close()
+    throws XMLStreamException;
+
 }