diff options
| author | Chris Burdess <dog@bluezoo.org> | 2006-03-03 12:30:59 +0000 |
|---|---|---|
| committer | Chris Burdess <dog@bluezoo.org> | 2006-03-03 12:30:59 +0000 |
| commit | 85b35b1bda7ca489cbe770303289ed28c2a49363 (patch) | |
| tree | 6ad41665c318feeebd7793a292b9f53d3bf3c52d /gnu/xml/stream/XMLEventReaderImpl.java | |
| parent | 6ecf858745c60dcbf2b5ffac9da4e07ec15862d4 (diff) | |
| download | classpath-85b35b1bda7ca489cbe770303289ed28c2a49363.tar.gz | |
2006-03-03 Chris Burdess <dog@gnu.org>
Fixes PR 26503
* gnu/xml/stream/EntityReferenceImpl.java,
gnu/xml/stream/FilteredEventReader.java,
gnu/xml/stream/SAXParser.java,
gnu/xml/stream/XIncludeFilter.java,
gnu/xml/stream/XMLEventAllocatorImpl.java,
gnu/xml/stream/XMLEventFactoryImpl.java,
gnu/xml/stream/XMLEventImpl.java,
gnu/xml/stream/XMLEventReaderImpl.java,
gnu/xml/stream/XMLEventWriterImpl.java,
gnu/xml/stream/XMLInputFactoryImpl.java,
gnu/xml/stream/XMLOutputFactoryImpl.java,
gnu/xml/stream/XMLParser.java,
javax/xml/stream/EventFilter.java,
javax/xml/stream/Location.java,
javax/xml/stream/StreamFilter.java,
javax/xml/stream/XMLEventFactory.java,
javax/xml/stream/XMLEventReader.java,
javax/xml/stream/XMLEventWriter.java,
javax/xml/stream/XMLInputFactory.java,
javax/xml/stream/XMLOutputFactory.java,
javax/xml/stream/XMLReporter.java,
javax/xml/stream/XMLResolver.java,
javax/xml/stream/XMLStreamConstants.java,
javax/xml/stream/XMLStreamReader.java,
javax/xml/stream/events/EntityDeclaration.java,
javax/xml/stream/events/EntityReference.java,
javax/xml/stream/events/XMLEvent.java,
javax/xml/stream/util/EventReaderDelegate.java,
javax/xml/stream/util/ReaderDelegate.java: Updated to final version of
StAX API as specified in JWSDP 2.0.
* gnu/xml/stream/EndEntityImpl.java,
gnu/xml/stream/LocationImpl.java,
gnu/xml/stream/StartEntityImpl.java,
gnu/xml/stream/XMLStreamReaderImpl.java,
javax/xml/stream/XMLFilter.java,
javax/xml/stream/XMLIterator.java,
javax/xml/stream/events/EndEntity.java,
javax/xml/stream/events/StartEntity.java: Removed legacy files.
Diffstat (limited to 'gnu/xml/stream/XMLEventReaderImpl.java')
| -rw-r--r-- | gnu/xml/stream/XMLEventReaderImpl.java | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/gnu/xml/stream/XMLEventReaderImpl.java b/gnu/xml/stream/XMLEventReaderImpl.java index 70481d7c4..bb64b1e3f 100644 --- a/gnu/xml/stream/XMLEventReaderImpl.java +++ b/gnu/xml/stream/XMLEventReaderImpl.java @@ -67,7 +67,7 @@ public class XMLEventReaderImpl this.systemId = systemId; } - public XMLEvent next() + public XMLEvent nextEvent() throws XMLStreamException { XMLEvent ret = peek(); @@ -75,10 +75,32 @@ public class XMLEventReaderImpl return ret; } + public Object next() + { + try + { + return nextEvent(); + } + catch (XMLStreamException e) + { + RuntimeException e2 = new RuntimeException(); + e2.initCause(e); + throw e2; + } + } + public boolean hasNext() - throws XMLStreamException { - return peekEvent != null || reader.hasNext(); + if (peekEvent != null) + return true; + try + { + return reader.hasNext(); + } + catch (XMLStreamException e) + { + return false; + } } public XMLEvent peek() @@ -121,5 +143,16 @@ public class XMLEventReaderImpl return reader.getProperty(name); } + public void close() + throws XMLStreamException + { + reader.close(); + } + + public void remove() + { + throw new UnsupportedOperationException(); + } + } |