diff options
| author | Chris Burdess <dog@gnu.org> | 2007-02-07 18:22:26 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-02-07 18:22:26 +0000 |
| commit | 08452f45531ca2ec479e61b9f7e37d3fadd95a7b (patch) | |
| tree | 6dc3be85930294202aea5c41b9800414ba213f20 /libjava/gnu/xml | |
| parent | 74372bdfc63ac2ba2eaf540f0993b457dca69144 (diff) | |
| download | gcc-08452f45531ca2ec479e61b9f7e37d3fadd95a7b.zip gcc-08452f45531ca2ec479e61b9f7e37d3fadd95a7b.tar.gz gcc-08452f45531ca2ec479e61b9f7e37d3fadd95a7b.tar.bz2 | |
re PR classpath/30718 (TransformerException in XSLURIResolver)
2007-02-07 Chris Burdess <dog@gnu.org>
Fixes PR 30718.
* gnu/xml/dom/ls/SAXEventSink.java: Add public accessor/mutators.
* gnu/xml/transform/XSLURIResolver.java: Add support for custom
SAXSources without a backing URL or stream.
Fixes PR 27710.
* gnu/xml/dom/DomDocumentBuilderFactory.java: Fall back to synchronous
LSParser if implementation does not support asynchronous.
* gnu/xml/stream/XMLParser.java,
gnu/xml/stream/XIncludeFilter.java: Use custom code instead of
java.net.URL to resolve to an an absolute URI, to avoid nonexistent
protocol handler problems.
From-SVN: r121694
Diffstat (limited to 'libjava/gnu/xml')
| -rw-r--r-- | libjava/gnu/xml/dom/ls/SAXEventSink.h | 4 | ||||
| -rw-r--r-- | libjava/gnu/xml/transform/XSLURIResolver.h | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.h b/libjava/gnu/xml/dom/ls/SAXEventSink.h index ec35c66..54f4e5f 100644 --- a/libjava/gnu/xml/dom/ls/SAXEventSink.h +++ b/libjava/gnu/xml/dom/ls/SAXEventSink.h @@ -57,9 +57,9 @@ public: SAXEventSink(); public: // actually package-private virtual void interrupt(); -public: // actually protected - virtual ::org::w3c::dom::Document * getDocument(); public: + virtual ::org::w3c::dom::Document * getDocument(); + virtual void setReader(::org::xml::sax::XMLReader *); virtual void setDocumentLocator(::org::xml::sax::Locator *); virtual void startDocument(); virtual void endDocument(); diff --git a/libjava/gnu/xml/transform/XSLURIResolver.h b/libjava/gnu/xml/transform/XSLURIResolver.h index a7e0aea..394c4c7 100644 --- a/libjava/gnu/xml/transform/XSLURIResolver.h +++ b/libjava/gnu/xml/transform/XSLURIResolver.h @@ -46,6 +46,17 @@ extern "Java" } } } + namespace org + { + namespace xml + { + namespace sax + { + class InputSource; + class XMLReader; + } + } + } } class gnu::xml::transform::XSLURIResolver : public ::java::lang::Object @@ -62,6 +73,7 @@ public: // actually package-private virtual ::javax::xml::transform::dom::DOMSource * resolveDOM(::javax::xml::transform::Source *, ::java::lang::String *, ::java::lang::String *); virtual ::java::net::URL * resolveURL(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); virtual ::javax::xml::parsers::DocumentBuilder * getDocumentBuilder(); + virtual ::javax::xml::transform::dom::DOMSource * parse(::org::xml::sax::InputSource *, ::org::xml::sax::XMLReader *); ::java::util::Map * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastModifiedCache; ::java::util::Map * nodeCache; ::javax::xml::parsers::DocumentBuilder * builder; |