[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: SAX fix

[Kaffe CVS]

PatchSet 5521 
Date: 2005/03/11 20:12:31
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: SAX fix

2005-03-11 Dalibor Topic <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-03-10  Chris Burdess  <dog at bluezoo.org>

        * gnu/xml/dom/ls/SAXEventSink.java: Ignore element declarations if
        not currently parsing the DTD.

Members: 
	ChangeLog:1.3695->1.3696 
	libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3695 kaffe/ChangeLog:1.3696
--- kaffe/ChangeLog:1.3695	Fri Mar 11 20:04:43 2005
+++ kaffe/ChangeLog	Fri Mar 11 20:12:31 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2005-03-10  Chris Burdess  <dog at bluezoo.org>
+
+        * gnu/xml/dom/ls/SAXEventSink.java: Ignore element declarations if
+        not currently parsing the DTD.
+
+2005-03-11 Dalibor Topic <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-03-10  Audrius Meskauskas  <audriusa at bluewin.ch>
 
         * javax/swing/text/ChangedCharSetException.java,
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.3 kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.3	Wed Jan  5 17:11:41 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java	Fri Mar 11 20:12:32 2005
@@ -486,6 +486,13 @@
       {
         return;
       }
+    // Ignore fake element declarations generated by ValidationConsumer.
+    // If an element is not really declared in the DTD it will not be
+    // declared in the document model.
+    if (!(ctx instanceof DomDoctype))
+      {
+        return;
+      }
     DomDoctype doctype = (DomDoctype) ctx;
     doctype.elementDecl(name, model);
   }