diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-11-12 09:20:55 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2003-11-12 09:20:55 +0000 |
| commit | 81075c29c2cd0bbd577cce8f0426f8626ccf269e (patch) | |
| tree | 882d3a93f8929c5d126862f1cfe1dc9dc81112d4 /external | |
| parent | 1c34546f23846747d2d7825d7b6df33e1fe2e7bf (diff) | |
| download | classpath-81075c29c2cd0bbd577cce8f0426f8626ccf269e.tar.gz | |
2003-11-12 Michael Koch <konqueror@gmx.de>
* external/jaxp/source/gnu/xml/pipeline/XIncludeFilter.java
(Scrubber.Scrubber): Call methods of super class.
* external/jaxp/source/org/xml/sax/helpers/XMLReaderFactory.java
(createXMLReader): Catch RuntimeException not Exception.
Diffstat (limited to 'external')
| -rw-r--r-- | external/jaxp/source/gnu/xml/pipeline/XIncludeFilter.java | 14 | ||||
| -rwxr-xr-x | external/jaxp/source/org/xml/sax/helpers/XMLReaderFactory.java | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/external/jaxp/source/gnu/xml/pipeline/XIncludeFilter.java b/external/jaxp/source/gnu/xml/pipeline/XIncludeFilter.java index e629542de..6b354c39b 100644 --- a/external/jaxp/source/gnu/xml/pipeline/XIncludeFilter.java +++ b/external/jaxp/source/gnu/xml/pipeline/XIncludeFilter.java @@ -1,5 +1,5 @@ /* - * $Id: XIncludeFilter.java,v 1.1 2003-02-01 02:10:22 cbj Exp $ + * $Id: XIncludeFilter.java,v 1.2 2003-11-12 09:20:55 mkoch Exp $ * Copyright (C) 2001-2002 David Brownell * * This file is part of GNU JAXP, a library. @@ -50,7 +50,7 @@ import gnu.xml.util.Resolver; -// $Id: XIncludeFilter.java,v 1.1 2003-02-01 02:10:22 cbj Exp $ +// $Id: XIncludeFilter.java,v 1.2 2003-11-12 09:20:55 mkoch Exp $ /** * Filter to process an XPointer-free subset of @@ -91,7 +91,7 @@ import gnu.xml.util.Resolver; * <p>TBD: "IURI" handling. * * @author David Brownell - * @version $Date: 2003-02-01 02:10:22 $ + * @version $Date: 2003-11-12 09:20:55 $ */ public class XIncludeFilter extends EventFilter implements Locator { @@ -457,12 +457,12 @@ public class XIncludeFilter extends EventFilter implements Locator super (f); // process all content events - setContentHandler (this); - setProperty (LEXICAL_HANDLER, this); + super.setContentHandler (this); + super.setProperty (LEXICAL_HANDLER, this); // drop all DTD events - setDTDHandler (null); - setProperty (DECL_HANDLER, null); + super.setDTDHandler (null); + super.setProperty (DECL_HANDLER, null); } // maintain proxy locator diff --git a/external/jaxp/source/org/xml/sax/helpers/XMLReaderFactory.java b/external/jaxp/source/org/xml/sax/helpers/XMLReaderFactory.java index 82d2dcfe3..744620bdb 100755 --- a/external/jaxp/source/org/xml/sax/helpers/XMLReaderFactory.java +++ b/external/jaxp/source/org/xml/sax/helpers/XMLReaderFactory.java @@ -3,7 +3,7 @@ // Written by David Megginson // and by David Brownell // NO WARRANTY! This class is in the Public Domain. -// $Id: XMLReaderFactory.java,v 1.1 2003-02-01 02:10:48 cbj Exp $ +// $Id: XMLReaderFactory.java,v 1.2 2003-11-12 09:20:55 mkoch Exp $ package org.xml.sax.helpers; import java.io.BufferedReader; @@ -109,7 +109,7 @@ final public class XMLReaderFactory // 1. try the JVM-instance-wide system property try { className = System.getProperty (property); } - catch (Exception e) { /* normally fails for applets */ } + catch (RuntimeException e) { /* normally fails for applets */ } // 2. if that fails, try META-INF/services/ if (className == null) { |