diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java')
| -rw-r--r-- | libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java | 78 |
1 files changed, 45 insertions, 33 deletions
diff --git a/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java index 164774d8236..5f72e361e52 100644 --- a/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java @@ -1,5 +1,5 @@ /* XMLInputFactoryImpl.java -- - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -89,14 +89,15 @@ public class XMLInputFactoryImpl public XMLStreamReader createXMLStreamReader(Reader reader) throws XMLStreamException { - /* - return new XMLStreamReaderImpl(reader, null, null, - resolver, reporter, - validating, namespaceAware, - coalescing, replacingEntityReferences, - externalEntities, supportDTD); - */ - XMLParser ret = new XMLParser(reader, null, + return createXMLStreamReader(null, reader); + } + + public XMLStreamReader createXMLStreamReader(Source source) + throws XMLStreamException + { + String systemId = source.getSystemId(); + InputStream in = getInputStream(source); + XMLParser ret = new XMLParser(in, systemId, validating, namespaceAware, coalescing, @@ -105,24 +106,30 @@ public class XMLInputFactoryImpl supportDTD, baseAware, stringInterning, + false, reporter, resolver); if (xIncludeAware) - return new XIncludeFilter(ret, null, namespaceAware, validating, + return new XIncludeFilter(ret, systemId, namespaceAware, validating, replacingEntityReferences); return ret; } - public XMLStreamReader createXMLStreamReader(Source source) + public XMLStreamReader createXMLStreamReader(InputStream in) + throws XMLStreamException + { + return createXMLStreamReader(null, in); + } + + public XMLStreamReader createXMLStreamReader(InputStream in, String encoding) + throws XMLStreamException + { + return createXMLStreamReader(in); + } + + public XMLStreamReader createXMLStreamReader(String systemId, InputStream in) throws XMLStreamException { - String systemId = source.getSystemId(); - InputStream in = getInputStream(source); - /*return new XMLStreamReaderImpl(in, null, systemId, - resolver, reporter, - validating, namespaceAware, - coalescing, replacingEntityReferences, - externalEntities, supportDTD);*/ XMLParser ret = new XMLParser(in, systemId, validating, namespaceAware, @@ -132,23 +139,19 @@ public class XMLInputFactoryImpl supportDTD, baseAware, stringInterning, + false, reporter, resolver); if (xIncludeAware) - return new XIncludeFilter(ret, systemId, namespaceAware, validating, + return new XIncludeFilter(ret, null, namespaceAware, validating, replacingEntityReferences); return ret; } - - public XMLStreamReader createXMLStreamReader(InputStream in) + + public XMLStreamReader createXMLStreamReader(String systemId, Reader reader) throws XMLStreamException { - /*return new XMLStreamReaderImpl(in, null, null, - resolver, reporter, - validating, namespaceAware, - coalescing, replacingEntityReferences, - externalEntities, supportDTD);*/ - XMLParser ret = new XMLParser(in, null, + XMLParser ret = new XMLParser(reader, systemId, validating, namespaceAware, coalescing, @@ -157,6 +160,7 @@ public class XMLInputFactoryImpl supportDTD, baseAware, stringInterning, + false, reporter, resolver); if (xIncludeAware) @@ -164,12 +168,6 @@ public class XMLInputFactoryImpl replacingEntityReferences); return ret; } - - public XMLStreamReader createXMLStreamReader(InputStream in, String encoding) - throws XMLStreamException - { - return createXMLStreamReader(in); - } public XMLEventReader createXMLEventReader(Reader reader) throws XMLStreamException @@ -178,6 +176,13 @@ public class XMLInputFactoryImpl return new XMLEventReaderImpl(sr, allocator, null); } + public XMLEventReader createXMLEventReader(String systemId, Reader reader) + throws XMLStreamException + { + XMLStreamReader sr = createXMLStreamReader(systemId, reader); + return new XMLEventReaderImpl(sr, allocator, null); + } + public XMLEventReader createXMLEventReader(XMLStreamReader reader) throws XMLStreamException { @@ -205,6 +210,13 @@ public class XMLInputFactoryImpl return new XMLEventReaderImpl(sr, allocator, null); } + public XMLEventReader createXMLEventReader(String systemId, InputStream in) + throws XMLStreamException + { + XMLStreamReader sr = createXMLStreamReader(systemId, in); + return new XMLEventReaderImpl(sr, allocator, null); + } + public XMLStreamReader createFilteredReader(XMLStreamReader reader, StreamFilter filter) throws XMLStreamException |