[kaffe] CVS kaffe (kaz): libraries/javalib/gnu/xml/aelfred2/SAXDriver.java,

[Kaffe CVS]

PatchSet 4157 
Date: 2003/11/06 22:53:42
Author: kaz
Branch: HEAD
Tag: (none) 
Log:
        libraries/javalib/gnu/xml/aelfred2/SAXDriver.java,
        libraries/javalib/gnu/xml/aelfred2/XmlParser.java:
        Resynced with GNU Classpathx.

Members: 
        ChangeLog:1.1749->1.1750 
        libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.4->1.5 
        libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1749 kaffe/ChangeLog:1.1750
--- kaffe/ChangeLog:1.1749      Tue Nov  4 20:42:39 2003
+++ kaffe/ChangeLog     Thu Nov  6 22:53:42 2003
@@ -1,3 +1,9 @@
+2003-11-06 Ito Kazumitsu <[EMAIL PROTECTED]>
+
+       libraries/javalib/gnu/xml/aelfred2/SAXDriver.java,
+       libraries/javalib/gnu/xml/aelfred2/XmlParser.java:
+       Resynced with GNU Classpathx.
+
 2003-11-04  Guilhem Lavaux <[EMAIL PROTECTED]>
 
        * libraries/clib/net/PlainDatagramSocketImpl.c:
Index: kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java
diff -u kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.4 
kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.5
--- kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java:1.4 Sun Oct 19 02:31:54 
2003
+++ kaffe/libraries/javalib/gnu/xml/aelfred2/SAXDriver.java     Thu Nov  6 22:53:43 
2003
@@ -1,5 +1,5 @@
 /*
- * $Id: SAXDriver.java,v 1.4 2003/10/19 02:31:54 kaz Exp $
+ * $Id: SAXDriver.java,v 1.5 2003/11/06 22:53:43 kaz Exp $
  * Copyright (C) 1999-2001 David Brownell
  * 
  * This file is part of GNU JAXP, a library.
@@ -66,7 +66,7 @@
 import org.xml.sax.helpers.NamespaceSupport;
 
 
-// $Id: SAXDriver.java,v 1.4 2003/10/19 02:31:54 kaz Exp $
+// $Id: SAXDriver.java,v 1.5 2003/11/06 22:53:43 kaz Exp $
 
 /**
  * An enhanced SAX2 version of Microstar's &AElig;lfred XML parser.
@@ -123,7 +123,7 @@
  *
  * @author Written by David Megginson (version 1.2a from Microstar)
  * @author Updated by David Brownell &lt;[EMAIL PROTECTED]&gt;
- * @version $Date: 2003/10/19 02:31:54 $
+ * @version $Date: 2003/11/06 22:53:43 $
  * @see org.xml.sax.Parser
  */
 final public class SAXDriver
@@ -636,8 +636,13 @@
        boolean stackOnly)
     throws SAXException
     {
+       // The following warning was deleted because the application has the
+       // option of not setting systemId. Sun's JAXP or Xerces seems to
+       // ignore this case.
+       /*
        if (systemId == null)
            warn ("URI was not reported to parser for entity " + name);
+       */
        if (!stackOnly)         // spliced [dtd] needs startEntity
            lexicalHandler.startEntity (name);
        entityStack.push (systemId);
Index: kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java
diff -u kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.3 
kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.4
--- kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java:1.3 Sat Sep 13 22:32:02 
2003
+++ kaffe/libraries/javalib/gnu/xml/aelfred2/XmlParser.java     Thu Nov  6 22:53:43 
2003
@@ -1,5 +1,5 @@
 /*
- * $Id: XmlParser.java,v 1.3 2003/09/13 22:32:02 kaz Exp $
+ * $Id: XmlParser.java,v 1.4 2003/11/06 22:53:43 kaz Exp $
  * Copyright (C) 1999-2001 David Brownell
  * 
  * This file is part of GNU JAXP, a library.
@@ -69,7 +69,7 @@
 import org.xml.sax.SAXException;
 
 
-// $Id: XmlParser.java,v 1.3 2003/09/13 22:32:02 kaz Exp $
+// $Id: XmlParser.java,v 1.4 2003/11/06 22:53:43 kaz Exp $
 
 /**
  * Parse XML documents and return parse events through call-backs.
@@ -79,7 +79,7 @@
  * @author Written by David Megginson &lt;[EMAIL PROTECTED]&gt;
  *     (version 1.2a with bugfixes)
  * @author Updated by David Brownell &lt;[EMAIL PROTECTED]&gt;
- * @version $Date: 2003/09/13 22:32:02 $
+ * @version $Date: 2003/11/06 22:53:43 $
  * @see SAXDriver
  */
 final class XmlParser
@@ -3449,10 +3449,15 @@
 
            // we might be using alternate IDs/encoding
            systemId = source.getSystemId ();
+           // The following warning and setting systemId was deleted bcause
+           // the application has the option of not setting systemId
+           // provided that it has set the characte/byte stream.
+           /*
            if (systemId == null) {
                handler.warn ("missing system ID, using " + ids [1]);
                systemId = ids [1];
            }
+           */
        } else {
            // "[document]", or "[dtd]" via getExternalSubset()
            scratch.setCharacterStream (reader);

_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe