Imported GNU Classpath 0.20

       * Makefile.am (AM_CPPFLAGS): Add classpath/include.
       * java/nio/charset/spi/CharsetProvider.java: New override file.
       * java/security/Security.java: Likewise.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109831 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 16 deletions

diff --git a/libjava/classpath/gnu/xml/pipeline/DomConsumer.java b/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
index 389e02bb387..bdbf9281880 100644
--- a/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
+++ b/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.pipeline;
 
-import gnu.xml.aelfred2.ContentHandler2;
 import gnu.xml.util.DomParser;
 
 import org.xml.sax.Attributes;
@@ -330,7 +329,7 @@ public class DomConsumer implements EventConsumer
      * accepted illegal input data). </p>
      */
     public static class Handler
-	implements ContentHandler2, LexicalHandler,
+	implements ContentHandler, LexicalHandler,
 	    DTDHandler, DeclHandler
     {
 	protected DomConsumer		consumer;
@@ -430,20 +429,6 @@ public class DomConsumer implements EventConsumer
 	    top = document;
 	}
 
-        // ContentHandler2
-        public void xmlDecl(String version,
-                            String encoding,
-                            boolean standalone,
-                            String inputEncoding)
-          throws SAXException
-        {
-          if (document != null)
-            {
-              document.setXmlVersion(version);
-              document.setXmlStandalone(standalone);
-            }
-        }
-
 	// SAX1
 	public void endDocument ()
 	throws SAXException