[kaffe] CVS kaffe (robilad): Resynced with GNU JAXP: Updated version of SAX API to sax2r3 final
Kaffe CVS
cvs-commits at kaffe.org
Wed Dec 15 16:14:34 PST 2004
PatchSet 5646
Date: 2004/12/16 00:09:54
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU JAXP: Updated version of SAX API to sax2r3 final
Members:
ChangeLog:1.3191->1.3192
libraries/javalib/org/xml/sax/AttributeList.java:1.2->1.3
libraries/javalib/org/xml/sax/Attributes.java:1.2->1.3
libraries/javalib/org/xml/sax/ContentHandler.java:1.2->1.3
libraries/javalib/org/xml/sax/DTDHandler.java:1.2->1.3
libraries/javalib/org/xml/sax/DocumentHandler.java:1.2->1.3
libraries/javalib/org/xml/sax/EntityResolver.java:1.2->1.3
libraries/javalib/org/xml/sax/ErrorHandler.java:1.2->1.3
libraries/javalib/org/xml/sax/HandlerBase.java:1.2->1.3
libraries/javalib/org/xml/sax/InputSource.java:1.4->1.5
libraries/javalib/org/xml/sax/Locator.java:1.2->1.3
libraries/javalib/org/xml/sax/Parser.java:1.2->1.3
libraries/javalib/org/xml/sax/SAXException.java:1.2->1.3
libraries/javalib/org/xml/sax/SAXNotRecognizedException.java:1.3->1.4
libraries/javalib/org/xml/sax/SAXNotSupportedException.java:1.3->1.4
libraries/javalib/org/xml/sax/SAXParseException.java:1.2->1.3
libraries/javalib/org/xml/sax/XMLFilter.java:1.2->1.3
libraries/javalib/org/xml/sax/XMLReader.java:1.2->1.3
libraries/javalib/org/xml/sax/package.html:1.2->1.3
libraries/javalib/org/xml/sax/ext/Attributes2.java:1.3->1.4
libraries/javalib/org/xml/sax/ext/Attributes2Impl.java:1.3->1.4
libraries/javalib/org/xml/sax/ext/DeclHandler.java:1.2->1.3
libraries/javalib/org/xml/sax/ext/DefaultHandler2.java:1.4->1.5
libraries/javalib/org/xml/sax/ext/EntityResolver2.java:1.4->1.5
libraries/javalib/org/xml/sax/ext/LexicalHandler.java:1.2->1.3
libraries/javalib/org/xml/sax/ext/Locator2.java:1.2->1.3
libraries/javalib/org/xml/sax/ext/Locator2Impl.java:1.2->1.3
libraries/javalib/org/xml/sax/ext/package.html:1.2->1.3
libraries/javalib/org/xml/sax/helpers/AttributeListImpl.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/AttributesImpl.java:1.2->1.3
libraries/javalib/org/xml/sax/helpers/DefaultHandler.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/LocatorImpl.java:1.2->1.3
libraries/javalib/org/xml/sax/helpers/NamespaceSupport.java:1.3->1.4
libraries/javalib/org/xml/sax/helpers/NewInstance.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/ParserAdapter.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/ParserFactory.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/XMLFilterImpl.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/XMLReaderAdapter.java:1.4->1.5
libraries/javalib/org/xml/sax/helpers/XMLReaderFactory.java:1.5->1.6
libraries/javalib/org/xml/sax/helpers/package.html:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3191 kaffe/ChangeLog:1.3192
--- kaffe/ChangeLog:1.3191 Wed Dec 15 09:16:01 2004
+++ kaffe/ChangeLog Thu Dec 16 00:09:54 2004
@@ -1,3 +1,50 @@
+2004-12-16 Dalibor Topic <robilad at kaffe.org>
+
+ * libraries/javalib/org/xml/sax/AttributeList.java,
+ libraries/javalib/org/xml/sax/Attributes.java,
+ libraries/javalib/org/xml/sax/ContentHandler.java,
+ libraries/javalib/org/xml/sax/DTDHandler.java,
+ libraries/javalib/org/xml/sax/DocumentHandler.java,
+ libraries/javalib/org/xml/sax/EntityResolver.java,
+ libraries/javalib/org/xml/sax/ErrorHandler.java,
+ libraries/javalib/org/xml/sax/HandlerBase.java,
+ libraries/javalib/org/xml/sax/InputSource.java,
+ libraries/javalib/org/xml/sax/Locator.java,
+ libraries/javalib/org/xml/sax/Parser.java,
+ libraries/javalib/org/xml/sax/SAXException.java,
+ libraries/javalib/org/xml/sax/SAXNotRecognizedException.java,
+ libraries/javalib/org/xml/sax/SAXNotSupportedException.java,
+ libraries/javalib/org/xml/sax/SAXParseException.java,
+ libraries/javalib/org/xml/sax/XMLFilter.java,
+ libraries/javalib/org/xml/sax/XMLReader.java,
+ libraries/javalib/org/xml/sax/package.html,
+ libraries/javalib/org/xml/sax/ext/Attributes2.java,
+ libraries/javalib/org/xml/sax/ext/Attributes2Impl.java,
+ libraries/javalib/org/xml/sax/ext/DeclHandler.java,
+ libraries/javalib/org/xml/sax/ext/DefaultHandler2.java,
+ libraries/javalib/org/xml/sax/ext/EntityResolver2.java,
+ libraries/javalib/org/xml/sax/ext/LexicalHandler.java,
+ libraries/javalib/org/xml/sax/ext/Locator2.java,
+ libraries/javalib/org/xml/sax/ext/Locator2Impl.java,
+ libraries/javalib/org/xml/sax/ext/package.html,
+ libraries/javalib/org/xml/sax/helpers/AttributeListImpl.java,
+ libraries/javalib/org/xml/sax/helpers/AttributesImpl.java,
+ libraries/javalib/org/xml/sax/helpers/DefaultHandler.java,
+ libraries/javalib/org/xml/sax/helpers/LocatorImpl.java,
+ libraries/javalib/org/xml/sax/helpers/NamespaceSupport.java,
+ libraries/javalib/org/xml/sax/helpers/NewInstance.java,
+ libraries/javalib/org/xml/sax/helpers/ParserAdapter.java,
+ libraries/javalib/org/xml/sax/helpers/ParserFactory.java,
+ libraries/javalib/org/xml/sax/helpers/XMLFilterImpl.java,
+ libraries/javalib/org/xml/sax/helpers/XMLReaderAdapter.java,
+ libraries/javalib/org/xml/sax/helpers/XMLReaderFactory.java,
+ libraries/javalib/org/xml/sax/helpers/package.html:
+ Resynced with GNU JAXP.
+
+ 004-12-10 Chris Burdess <dog at gnu.org>
+
+ * org/xml/sax: Updated version of SAX API to sax2r3 final.
+
2004-12-15 Michael Koch <konqueror at gmx.de>
* libraries/javalib/javax/swing/JComponent.java
Index: kaffe/libraries/javalib/org/xml/sax/AttributeList.java
diff -u kaffe/libraries/javalib/org/xml/sax/AttributeList.java:1.2 kaffe/libraries/javalib/org/xml/sax/AttributeList.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/AttributeList.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/AttributeList.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX Attribute List Interface.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: AttributeList.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -180,7 +181,7 @@
* <p>If the attribute name has a namespace prefix in the document,
* the application must include the prefix here.</p>
*
- * @param i The index of the attribute in the list.
+ * @param name the name of the attribute to return
* @return The attribute value as a string, or null if
* no such attribute exists.
* @see #getValue(int)
Index: kaffe/libraries/javalib/org/xml/sax/Attributes.java
diff -u kaffe/libraries/javalib/org/xml/sax/Attributes.java:1.2 kaffe/libraries/javalib/org/xml/sax/Attributes.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/Attributes.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/Attributes.java Thu Dec 16 00:09:58 2004
@@ -2,6 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// NO WARRANTY! This class is in the public domain.
+// $Id: Attributes.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -31,18 +32,25 @@
* the <code>http://xml.org/sax/features/namespace-prefixes</code>
* feature is set to <var>true</var> (it is <var>false</var> by
* default).
- * Because SAX2 conforms to the "Namespaces in XML" specification,
- * it does not give namespace declaration attributes a namespace URI.
- * Some other W3C specifications are in conflict with that, expecting
- * these declarations to be in a namespace.
- * Handler code may need to resolve that conflict.
+ * Because SAX2 conforms to the original "Namespaces in XML"
+ * recommendation, it normally does not
+ * give namespace declaration attributes a namespace URI.
* </p>
*
- * <p>If the namespace-prefixes feature (see above) is <var>false</var>,
- * access by qualified name may not be available; if the
- * <code>http://xml.org/sax/features/namespaces</code>
- * feature is <var>false</var>, access by Namespace-qualified names
- * may not be available.</p>
+ * <p>Some SAX2 parsers may support using an optional feature flag
+ * (<code>http://xml.org/sax/features/xmlns-uris</code>) to request
+ * that those attributes be given URIs, conforming to a later
+ * backwards-incompatible revision of that recommendation. (The
+ * attribute's "local name" will be the prefix, or "xmlns" when
+ * defining a default element namespace.) For portability, handler
+ * code should always resolve that conflict, rather than requiring
+ * parsers that can change the setting of that feature flag. </p>
+ *
+ * <p>If the namespace-prefixes feature (see above) is
+ * <var>false</var>, access by qualified name may not be available; if
+ * the <code>http://xml.org/sax/features/namespaces</code> feature is
+ * <var>false</var>, access by Namespace-qualified names may not be
+ * available.</p>
*
* <p>This interface replaces the now-deprecated SAX1 {@link
* org.xml.sax.AttributeList AttributeList} interface, which does not
@@ -108,10 +116,10 @@
/**
- * Look up an attribute's XML 1.0 qualified name by index.
+ * Look up an attribute's XML qualified (prefixed) name by index.
*
* @param index The attribute index (zero-based).
- * @return The XML 1.0 qualified name, or the empty string
+ * @return The XML qualified name, or the empty string
* if none is available, or null if the index
* is out of range.
* @see #getLength
@@ -128,7 +136,7 @@
*
* <p>If the parser has not read a declaration for the attribute,
* or if the parser does not report attribute types, then it must
- * return the value "CDATA" as stated in the XML 1.0 Recommentation
+ * return the value "CDATA" as stated in the XML 1.0 Recommendation
* (clause 3.3.3, "Attribute-Value Normalization").</p>
*
* <p>For an enumerated attribute that is not a notation, the
@@ -177,7 +185,7 @@
/**
- * Look up the index of an attribute by XML 1.0 qualified name.
+ * Look up the index of an attribute by XML qualified (prefixed) name.
*
* @param qName The qualified (prefixed) name.
* @return The index of the attribute, or -1 if it does not
@@ -203,12 +211,12 @@
/**
- * Look up an attribute's type by XML 1.0 qualified name.
+ * Look up an attribute's type by XML qualified (prefixed) name.
*
* <p>See {@link #getType(int) getType(int)} for a description
* of the possible types.</p>
*
- * @param qName The XML 1.0 qualified name.
+ * @param qName The XML qualified name.
* @return The attribute type as a string, or null if the
* attribute is not in the list or if qualified names
* are not available.
@@ -232,12 +240,12 @@
/**
- * Look up an attribute's value by XML 1.0 qualified name.
+ * Look up an attribute's value by XML qualified (prefixed) name.
*
* <p>See {@link #getValue(int) getValue(int)} for a description
* of the possible values.</p>
*
- * @param qName The XML 1.0 qualified name.
+ * @param qName The XML qualified name.
* @return The attribute value as a string, or null if the
* attribute is not in the list or if qualified names
* are not available.
Index: kaffe/libraries/javalib/org/xml/sax/ContentHandler.java
diff -u kaffe/libraries/javalib/org/xml/sax/ContentHandler.java:1.2 kaffe/libraries/javalib/org/xml/sax/ContentHandler.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/ContentHandler.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/ContentHandler.java Thu Dec 16 00:09:58 2004
@@ -2,6 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// NO WARRANTY! This class is in the public domain.
+// $Id: ContentHandler.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -35,14 +36,13 @@
* and for reporting skipped entities (in non-validating XML
* processors).</p>
*
- * <p>Implementors should note that there is also a Java class
- * {@link java.net.ContentHandler ContentHandler} in the java.net
+ * <p>Implementors should note that there is also a
+ * <code>ContentHandler</code> class in the <code>java.net</code>
* package; that means that it's probably a bad idea to do</p>
*
- * <blockquote>
- * import java.net.*;
+ * <pre>import java.net.*;
* import org.xml.sax.*;
- * </blockquote>
+ * </pre>
*
* <p>In fact, "import ...*" is usually a sign of sloppy programming
* anyway, so the user should consider this a feature rather than a
@@ -50,7 +50,7 @@
*
* @since SAX 2.0
* @author David Megginson
- * @version 2.0.1 (sax2r2)
+ * @version 2.0.1+ (sax2r3pre1)
* @see org.xml.sax.XMLReader
* @see org.xml.sax.DTDHandler
* @see org.xml.sax.ErrorHandler
@@ -76,11 +76,13 @@
* is probably not sufficient for use with a search engine.</p>
*
* <p>Note that the locator will return correct information only
- * during the invocation of the events in this interface. The
+ * during the invocation SAX event callbacks after
+ * {@link #startDocument startDocument} returns and before
+ * {@link #endDocument endDocument} is called. The
* application should not attempt to use it at any other time.</p>
*
- * @param locator An object that can return the location of
- * any SAX document event.
+ * @param locator an object that can return the location of
+ * any SAX document event
* @see org.xml.sax.Locator
*/
public void setDocumentLocator (Locator locator);
@@ -93,8 +95,8 @@
* other event callbacks (except for {@link #setDocumentLocator
* setDocumentLocator}).</p>
*
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
* @see #endDocument
*/
public void startDocument ()
@@ -104,14 +106,22 @@
/**
* Receive notification of the end of a document.
*
+ * <p><strong>There is an apparent contradiction between the
+ * documentation for this method and the documentation for {@link
+ * org.xml.sax.ErrorHandler#fatalError}. Until this ambiguity is
+ * resolved in a future major release, clients should make no
+ * assumptions about whether endDocument() will or will not be
+ * invoked when the parser has reported a fatalError() or thrown
+ * an exception.</strong></p>
+ *
* <p>The SAX parser will invoke this method only once, and it will
* be the last method invoked during the parse. The parser shall
* not invoke this method until it has either abandoned parsing
* (because of an unrecoverable error) or reached the end of
* input.</p>
*
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
* @see #startDocument
*/
public void endDocument()
@@ -147,12 +157,12 @@
* <p>There should never be start/endPrefixMapping events for the
* "xml" prefix, since it is predeclared and immutable.</p>
*
- * @param prefix The Namespace prefix being declared.
+ * @param prefix the Namespace prefix being declared.
* An empty string is used for the default element namespace,
* which has no prefix.
- * @param uri The Namespace URI the prefix is mapped to.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
+ * @param uri the Namespace URI the prefix is mapped to
+ * @throws org.xml.sax.SAXException the client may throw
+ * an exception during processing
* @see #endPrefixMapping
* @see #startElement
*/
@@ -169,10 +179,10 @@
* {@link #endPrefixMapping endPrefixMapping} events is not otherwise
* guaranteed.</p>
*
- * @param prefix The prefix that was being mapped.
+ * @param prefix the prefix that was being mapped.
* This is the empty string when a default mapping scope ends.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
+ * @throws org.xml.sax.SAXException the client may throw
+ * an exception during processing
* @see #startPrefixMapping
* @see #endElement
*/
@@ -226,21 +236,23 @@
* <p>Like {@link #characters characters()}, attribute values may have
* characters that need more than one <code>char</code> value. </p>
*
- * @param uri The Namespace URI, or the empty string if the
+ * @param uri the Namespace URI, or the empty string if the
* element has no Namespace URI or if Namespace
- * processing is not being performed.
- * @param localName The local name (without prefix), or the
+ * processing is not being performed
+ * @param localName the local name (without prefix), or the
* empty string if Namespace processing is not being
- * performed.
- * @param qName The qualified name (with prefix), or the
- * empty string if qualified names are not available.
- * @param atts The attributes attached to the element. If
+ * performed
+ * @param qName the qualified name (with prefix), or the
+ * empty string if qualified names are not available
+ * @param atts the attributes attached to the element. If
* there are no attributes, it shall be an empty
- * Attributes object.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * Attributes object. The value of this object after
+ * startElement returns is undefined
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
* @see #endElement
* @see org.xml.sax.Attributes
+ * @see org.xml.sax.helpers.AttributesImpl
*/
public void startElement (String uri, String localName,
String qName, Attributes atts)
@@ -257,16 +269,16 @@
*
* <p>For information on the names, see startElement.</p>
*
- * @param uri The Namespace URI, or the empty string if the
+ * @param uri the Namespace URI, or the empty string if the
* element has no Namespace URI or if Namespace
- * processing is not being performed.
- * @param localName The local name (without prefix), or the
+ * processing is not being performed
+ * @param localName the local name (without prefix), or the
* empty string if Namespace processing is not being
- * performed.
- * @param qName The qualified XML 1.0 name (with prefix), or the
- * empty string if qualified names are not available.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * performed
+ * @param qName the qualified XML name (with prefix), or the
+ * empty string if qualified names are not available
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
*/
public void endElement (String uri, String localName,
String qName)
@@ -308,11 +320,11 @@
* method rather than this one (validating parsers <em>must</em>
* do so).</p>
*
- * @param ch The characters from the XML document.
- * @param start The start position in the array.
- * @param length The number of characters to read from the array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * @param ch the characters from the XML document
+ * @param start the start position in the array
+ * @param length the number of characters to read from the array
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
* @see #ignorableWhitespace
* @see org.xml.sax.Locator
*/
@@ -324,9 +336,10 @@
* Receive notification of ignorable whitespace in element content.
*
* <p>Validating Parsers must use this method to report each chunk
- * of whitespace in element content (see the W3C XML 1.0 recommendation,
- * section 2.10): non-validating parsers may also use this method
- * if they are capable of parsing and using content models.</p>
+ * of whitespace in element content (see the W3C XML 1.0
+ * recommendation, section 2.10): non-validating parsers may also
+ * use this method if they are capable of parsing and using
+ * content models.</p>
*
* <p>SAX parsers may return all contiguous whitespace in a single
* chunk, or they may split it into several chunks; however, all of
@@ -337,11 +350,11 @@
* <p>The application must not attempt to read from the array
* outside of the specified range.</p>
*
- * @param ch The characters from the XML document.
- * @param start The start position in the array.
- * @param length The number of characters to read from the array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * @param ch the characters from the XML document
+ * @param start the start position in the array
+ * @param length the number of characters to read from the array
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
* @see #characters
*/
public void ignorableWhitespace (char ch[], int start, int length)
@@ -363,12 +376,12 @@
* data may have characters that need more than one <code>char</code>
* value. </p>
*
- * @param target The processing instruction target.
- * @param data The processing instruction data, or null if
+ * @param target the processing instruction target
+ * @param data the processing instruction data, or null if
* none was supplied. The data does not include any
- * whitespace separating it from the target.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * whitespace separating it from the target
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
*/
public void processingInstruction (String target, String data)
throws SAXException;
@@ -392,12 +405,12 @@
* <code>http://xml.org/sax/features/external-parameter-entities</code>
* properties.</p>
*
- * @param name The name of the skipped entity. If it is a
+ * @param name the name of the skipped entity. If it is a
* parameter entity, the name will begin with '%', and if
* it is the external DTD subset, it will be the string
- * "[dtd]".
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
+ * "[dtd]"
+ * @throws org.xml.sax.SAXException any SAX exception, possibly
+ * wrapping another exception
*/
public void skippedEntity (String name)
throws SAXException;
Index: kaffe/libraries/javalib/org/xml/sax/DTDHandler.java
diff -u kaffe/libraries/javalib/org/xml/sax/DTDHandler.java:1.2 kaffe/libraries/javalib/org/xml/sax/DTDHandler.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/DTDHandler.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/DTDHandler.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX DTD handler.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: DTDHandler.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/DocumentHandler.java
diff -u kaffe/libraries/javalib/org/xml/sax/DocumentHandler.java:1.2 kaffe/libraries/javalib/org/xml/sax/DocumentHandler.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/DocumentHandler.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/DocumentHandler.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX document handler.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: DocumentHandler.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/EntityResolver.java
diff -u kaffe/libraries/javalib/org/xml/sax/EntityResolver.java:1.2 kaffe/libraries/javalib/org/xml/sax/EntityResolver.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/EntityResolver.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/EntityResolver.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX entity resolver.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: EntityResolver.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/ErrorHandler.java
diff -u kaffe/libraries/javalib/org/xml/sax/ErrorHandler.java:1.2 kaffe/libraries/javalib/org/xml/sax/ErrorHandler.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/ErrorHandler.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/ErrorHandler.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX error handler.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: ErrorHandler.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -23,20 +24,25 @@
* through this interface.</p>
*
* <p><strong>WARNING:</strong> If an application does <em>not</em>
- * register an ErrorHandler, XML parsing errors will go unreported
- * and bizarre behaviour may result.</p>
+ * register an ErrorHandler, XML parsing errors will go unreported,
+ * except that <em>SAXParseException</em>s will be thrown for fatal errors.
+ * In order to detect validity errors, an ErrorHandler that does something
+ * with {@link #error error()} calls must be registered.</p>
*
* <p>For XML processing errors, a SAX driver must use this interface
- * instead of throwing an exception: it is up to the application
+ * in preference to throwing an exception: it is up to the application
* to decide whether to throw an exception for different types of
* errors and warnings. Note, however, that there is no requirement that
- * the parser continue to provide useful information after a call to
- * {@link #fatalError fatalError} (in other words, a SAX driver class
- * could catch an exception and report a fatalError).</p>
+ * the parser continue to report additional errors after a call to
+ * {@link #fatalError fatalError}. In other words, a SAX driver class
+ * may throw an exception after reporting any fatalError.
+ * Also parsers may throw appropriate exceptions for non-XML errors.
+ * For example, {@link XMLReader#parse XMLReader.parse()} would throw
+ * an IOException for errors accessing entities or the document.</p>
*
* @since SAX 1.0
* @author David Megginson
- * @version 2.0.1 (sax2r2)
+ * @version 2.0.1+ (sax2r3pre1)
* @see org.xml.sax.XMLReader#setErrorHandler
* @see org.xml.sax.SAXParseException
*/
@@ -47,8 +53,9 @@
* Receive notification of a warning.
*
* <p>SAX parsers will use this method to report conditions that
- * are not errors or fatal errors as defined by the XML 1.0
- * recommendation. The default behaviour is to take no action.</p>
+ * are not errors or fatal errors as defined by the XML
+ * recommendation. The default behaviour is to take no
+ * action.</p>
*
* <p>The SAX parser must continue to provide normal parsing events
* after invoking this method: it should still be possible for the
@@ -76,12 +83,12 @@
* validity constraint. The default behaviour is to take no
* action.</p>
*
- * <p>The SAX parser must continue to provide normal parsing events
- * after invoking this method: it should still be possible for the
- * application to process the document through to the end. If the
- * application cannot do so, then the parser should report a fatal
- * error even if the XML 1.0 recommendation does not require it to
- * do so.</p>
+ * <p>The SAX parser must continue to provide normal parsing
+ * events after invoking this method: it should still be possible
+ * for the application to process the document through to the end.
+ * If the application cannot do so, then the parser should report
+ * a fatal error even if the XML recommendation does not require
+ * it to do so.</p>
*
* <p>Filters may use this method to report other, non-XML errors
* as well.</p>
@@ -99,6 +106,14 @@
/**
* Receive notification of a non-recoverable error.
*
+ * <p><strong>There is an apparent contradiction between the
+ * documentation for this method and the documentation for {@link
+ * org.xml.sax.ContentHandler#endDocument}. Until this ambiguity
+ * is resolved in a future major release, clients should make no
+ * assumptions about whether endDocument() will or will not be
+ * invoked when the parser has reported a fatalError() or thrown
+ * an exception.</strong></p>
+ *
* <p>This corresponds to the definition of "fatal error" in
* section 1.2 of the W3C XML 1.0 Recommendation. For example, a
* parser would use this callback to report the violation of a
@@ -106,7 +121,7 @@
*
* <p>The application must assume that the document is unusable
* after the parser has invoked this method, and should continue
- * (if at all) only for the sake of collecting addition error
+ * (if at all) only for the sake of collecting additional error
* messages: in fact, SAX parsers are free to stop reporting any
* other events once this method has been invoked.</p>
*
Index: kaffe/libraries/javalib/org/xml/sax/HandlerBase.java
diff -u kaffe/libraries/javalib/org/xml/sax/HandlerBase.java:1.2 kaffe/libraries/javalib/org/xml/sax/HandlerBase.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/HandlerBase.java:1.2 Tue Dec 2 21:38:05 2003
+++ kaffe/libraries/javalib/org/xml/sax/HandlerBase.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX default handler base class.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: HandlerBase.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -212,8 +213,7 @@
* each element (such as finalising a tree node or writing
* output to a file).</p>
*
- * @param name The element type name.
- * @param attributes The specified or defaulted attributes.
+ * @param name the element name
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @see org.xml.sax.DocumentHandler#endElement
Index: kaffe/libraries/javalib/org/xml/sax/InputSource.java
diff -u kaffe/libraries/javalib/org/xml/sax/InputSource.java:1.4 kaffe/libraries/javalib/org/xml/sax/InputSource.java:1.5
--- kaffe/libraries/javalib/org/xml/sax/InputSource.java:1.4 Wed May 19 17:28:12 2004
+++ kaffe/libraries/javalib/org/xml/sax/InputSource.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX input source.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: InputSource.java,v 1.5 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/Locator.java
diff -u kaffe/libraries/javalib/org/xml/sax/Locator.java:1.2 kaffe/libraries/javalib/org/xml/sax/Locator.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/Locator.java:1.2 Tue Dec 2 21:38:06 2003
+++ kaffe/libraries/javalib/org/xml/sax/Locator.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX locator interface for document events.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: Locator.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/Parser.java
diff -u kaffe/libraries/javalib/org/xml/sax/Parser.java:1.2 kaffe/libraries/javalib/org/xml/sax/Parser.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/Parser.java:1.2 Tue Dec 2 21:38:06 2003
+++ kaffe/libraries/javalib/org/xml/sax/Parser.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX parser interface.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: Parser.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/SAXException.java
diff -u kaffe/libraries/javalib/org/xml/sax/SAXException.java:1.2 kaffe/libraries/javalib/org/xml/sax/SAXException.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/SAXException.java:1.2 Tue Dec 2 21:38:06 2003
+++ kaffe/libraries/javalib/org/xml/sax/SAXException.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX exception class.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: SAXException.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/SAXNotRecognizedException.java
diff -u kaffe/libraries/javalib/org/xml/sax/SAXNotRecognizedException.java:1.3 kaffe/libraries/javalib/org/xml/sax/SAXNotRecognizedException.java:1.4
--- kaffe/libraries/javalib/org/xml/sax/SAXNotRecognizedException.java:1.3 Mon Oct 18 20:19:48 2004
+++ kaffe/libraries/javalib/org/xml/sax/SAXNotRecognizedException.java Thu Dec 16 00:09:58 2004
@@ -2,6 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// NO WARRANTY! This class is in the Public Domain.
+// $Id: SAXNotRecognizedException.java,v 1.4 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -33,7 +34,7 @@
*/
public SAXNotRecognizedException ()
{
- super((String) null);
+ super();
}
Index: kaffe/libraries/javalib/org/xml/sax/SAXNotSupportedException.java
diff -u kaffe/libraries/javalib/org/xml/sax/SAXNotSupportedException.java:1.3 kaffe/libraries/javalib/org/xml/sax/SAXNotSupportedException.java:1.4
--- kaffe/libraries/javalib/org/xml/sax/SAXNotSupportedException.java:1.3 Mon Oct 18 20:19:48 2004
+++ kaffe/libraries/javalib/org/xml/sax/SAXNotSupportedException.java Thu Dec 16 00:09:58 2004
@@ -2,6 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// NO WARRANTY! This class is in the Public Domain.
+// $Id: SAXNotSupportedException.java,v 1.4 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -33,7 +34,7 @@
*/
public SAXNotSupportedException ()
{
- super((String) null);
+ super();
}
Index: kaffe/libraries/javalib/org/xml/sax/SAXParseException.java
diff -u kaffe/libraries/javalib/org/xml/sax/SAXParseException.java:1.2 kaffe/libraries/javalib/org/xml/sax/SAXParseException.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/SAXParseException.java:1.2 Tue Dec 2 21:38:06 2003
+++ kaffe/libraries/javalib/org/xml/sax/SAXParseException.java Thu Dec 16 00:09:58 2004
@@ -1,6 +1,7 @@
// SAX exception class.
// http://www.saxproject.org
// No warranty; no copyright -- use this as you will.
+// $Id: SAXParseException.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -103,9 +104,9 @@
*
*
* @param message The error or warning message.
- * @param publicId The public identifer of the entity that generated
+ * @param publicId The public identifier of the entity that generated
* the error or warning.
- * @param systemId The system identifer of the entity that generated
+ * @param systemId The system identifier of the entity that generated
* the error or warning.
* @param lineNumber The line number of the end of the text that
* caused the error or warning.
@@ -134,9 +135,9 @@
*
* @param message The error or warning message, or null to use
* the message from the embedded exception.
- * @param publicId The public identifer of the entity that generated
+ * @param publicId The public identifier of the entity that generated
* the error or warning.
- * @param systemId The system identifer of the entity that generated
+ * @param systemId The system identifier of the entity that generated
* the error or warning.
* @param lineNumber The line number of the end of the text that
* caused the error or warning.
@@ -229,7 +230,6 @@
{
return this.columnNumber;
}
-
//////////////////////////////////////////////////////////////////////
Index: kaffe/libraries/javalib/org/xml/sax/XMLFilter.java
diff -u kaffe/libraries/javalib/org/xml/sax/XMLFilter.java:1.2 kaffe/libraries/javalib/org/xml/sax/XMLFilter.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/XMLFilter.java:1.2 Tue Dec 2 21:38:06 2003
+++ kaffe/libraries/javalib/org/xml/sax/XMLFilter.java Thu Dec 16 00:09:58 2004
@@ -2,6 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// NO WARRANTY! This class is in the Public Domain.
+// $Id: XMLFilter.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
Index: kaffe/libraries/javalib/org/xml/sax/XMLReader.java
diff -u kaffe/libraries/javalib/org/xml/sax/XMLReader.java:1.2 kaffe/libraries/javalib/org/xml/sax/XMLReader.java:1.3
--- kaffe/libraries/javalib/org/xml/sax/XMLReader.java:1.2 Tue Dec 2 21:38:06 2003
+++ kaffe/libraries/javalib/org/xml/sax/XMLReader.java Thu Dec 16 00:09:58 2004
@@ -2,6 +2,7 @@
// http://www.saxproject.org
// Written by David Megginson
// NO WARRANTY! This class is in the Public Domain.
+// $Id: XMLReader.java,v 1.3 2004/12/16 00:09:58 robilad Exp $
package org.xml.sax;
@@ -51,7 +52,7 @@
*
* @since SAX 2.0
* @author David Megginson
- * @version 2.0.1 (sax2r2)
+ * @version 2.0.1+ (sax2r3pre1)
* @see org.xml.sax.XMLFilter
* @see org.xml.sax.helpers.ParserAdapter
* @see org.xml.sax.helpers.XMLReaderAdapter
@@ -340,7 +341,14 @@
* progress (they should create a new XMLReader instead for each
* nested XML document). Once a parse is complete, an
* application may reuse the same XMLReader object, possibly with a
- * different input source.</p>
+ * different input source.
+ * Configuration of the XMLReader object (such as handler bindings and
+ * values established for feature flags and properties) is unchanged
+ * by completion of a parse, unless the definition of that aspect of
+ * the configuration explicitly specifies other behavior.
+ * (For example, feature flags or properties exposing
+ * characteristics of the document being parsed.)
+ * </p>
*
* <p>During the parse, the XMLReader will provide information
* about the XML document through the registered event
@@ -350,7 +358,7 @@
* has ended. If a client application wants to terminate
* parsing early, it should throw an exception.</p>
*
- * @param source The input source for the top-level of the
+ * @param input The input source for the top-level of the
* XML document.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
Index: kaffe/libraries/javalib/org/xml/sax/package.html
diff -u kaffe/libraries/javalib/org/xml/sax/package.html:1.2 kaffe/libraries/javalib/org/xml/sax/package.html:1.3
--- kaffe/libraries/javalib/org/xml/sax/package.html:1.2 Wed May 19 17:28:12 2004
+++ kaffe/libraries/javalib/org/xml/sax/package.html Thu Dec 16 00:09:58 2004
@@ -1,10 +1,11 @@
<html><head>
+<!-- $Id: package.html,v 1.3 2004/12/16 00:09:58 robilad Exp $ -->
</head><body>
<p> This package provides the core SAX APIs.
Some SAX1 APIs are deprecated to encourage integration of
namespace-awareness into designs of new applications
-and into maintainance of existing infrastructure. </p>
+and into maintenance of existing infrastructure. </p>
<p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a>
for more information about SAX.</p>
@@ -26,58 +27,70 @@
<table border="1" cellpadding="3" cellspacing="0" width="100%">
<tr align="center" bgcolor="#ccccff">
<th>Feature ID</th>
+ <th>Access</th>
<th>Default</th>
<th>Description</th>
</tr>
<tr>
<td>external-general-entities</td>
+ <td><em>read/write</em></td>
<td><em>unspecified</em></td>
<td> Reports whether this parser processes external
- general entities; always true if validating</td>
+ general entities; always true if validating.
+ </td>
</tr>
<tr>
<td>external-parameter-entities</td>
+ <td><em>read/write</em></td>
<td><em>unspecified</em></td>
<td> Reports whether this parser processes external
- parameter entities; always true if validating</td>
+ parameter entities; always true if validating.
+ </td>
</tr>
<tr>
<td>is-standalone</td>
- <td><em>none</em></td>
+ <td>(parsing) <em>read-only</em>, (not parsing) <em>none</em></td>
+ <td>not applicable</td>
<td> May be examined only during a parse, after the
- <em>startDocument()</em> callback has been made; read-only.
- The value is true if the document specified the
- "standalone" flag in its XML declaration,
- and otherwise is false. </td>
+ <em>startDocument()</em> callback has been completed; read-only.
+ The value is true if the document specified standalone="yes" in
+ its XML declaration, and otherwise is false.
+ </td>
</tr>
<tr>
<td>lexical-handler/parameter-entities</td>
+ <td><em>read/write</em></td>
<td><em>unspecified</em></td>
- <td> true indicates that the LexicalHandler will report the
- beginning and end of parameter entities
- </td>
+ <td> A value of "true" indicates that the LexicalHandler will report
+ the beginning and end of parameter entities.
+ </td>
</tr>
<tr>
<td>namespaces</td>
+ <td><em>read/write</em></td>
<td>true</td>
- <td> true indicates namespace URIs and unprefixed local names
- for element and attribute names will be available </td>
+ <td> A value of "true" indicates namespace URIs and unprefixed local names
+ for element and attribute names will be available.
+ </td>
</tr>
<tr>
<td>namespace-prefixes</td>
+ <td><em>read/write</em></td>
<td>false</td>
- <td> true indicates XML 1.0 names (with prefixes) and attributes
- (including <em>xmlns*</em> attributes) will be available </td>
+ <td> A value of "true" indicates that XML qualified names (with prefixes) and
+ attributes (including <em>xmlns*</em> attributes) will be available.
+ </td>
</tr>
<tr>
<td>resolve-dtd-uris</td>
+ <td><em>read/write</em></td>
<td><em>true</em></td>
<td> A value of "true" indicates that system IDs in declarations will
be absolutized (relative to their base URIs) before reporting.
@@ -99,62 +112,109 @@
<tr>
<td>string-interning</td>
+ <td><em>read/write</em></td>
<td><em>unspecified</em></td>
- <td> true if all XML names (for elements, prefixes, attributes,
- entities, notations, and local names),
+ <td> Has a value of "true" if all XML names (for elements, prefixes,
+ attributes, entities, notations, and local names),
as well as Namespace URIs, will have been interned
using <em>java.lang.String.intern</em>. This supports fast
- testing of equality/inequality against string constants.</td>
+ testing of equality/inequality against string constants,
+ rather than forcing slower calls to <em>String.equals()</em>.
+ </td>
</tr>
<tr>
+ <td>unicode-normalization-checking</td>
+ <td><em>read/write</em></td>
+ <td><em>false</em></td>
+ <td> Controls whether the parser reports Unicode normalization
+ errors as described in section 2.13 and Appendix B of the
+ XML 1.1 Recommendation. If true, Unicode normalization
+ errors are reported using the ErrorHandler.error() callback.
+ Such errors are not fatal in themselves (though, obviously,
+ other Unicode-related encoding errors may be).
+ </td>
+ </tr>
+
+ <tr>
<td>use-attributes2</td>
- <td><em>unspecified</em></td>
- <td> Returns true if the <em>Attributes</em> objects passed by
+ <td><em>read-only</em></td>
+ <td>not applicable</td>
+ <td> Returns "true" if the <em>Attributes</em> objects passed by
this parser in <em>ContentHandler.startElement()</em>
implement the <a href="ext/Attributes2.html"
><em>org.xml.sax.ext.Attributes2</em></a> interface.
- That interface exposes additional information,
+ That interface exposes additional DTD-related information,
such as whether the attribute was specified in the
source text rather than defaulted.
- </td>
+ </td>
*** Patch too long, truncated ***
More information about the kaffe
mailing list