You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by ed...@apache.org on 2002/05/14 00:36:44 UTC
cvs commit: xml-commons/java/external/src/org/xml/sax COPYING.txt COPYING package.html XMLReader.java XMLFilter.java SAXParseException.java SAXNotSupportedException.java SAXNotRecognizedException.java SAXException.java Parser.java Locator.java InputSource.java HandlerBase.java ErrorHandler.java EntityResolver.java DocumentHandler.java DTDHandler.java ContentHandler.java Attributes.java AttributeList.java
edwingo 02/05/13 15:36:44
Modified: java/external/src/org/xml/sax/helpers Tag: jdk-ri-branch
package.html XMLReaderFactory.java
XMLReaderAdapter.java XMLFilterImpl.java
ParserFactory.java ParserAdapter.java
NewInstance.java NamespaceSupport.java
LocatorImpl.java DefaultHandler.java
AttributesImpl.java AttributeListImpl.java
java/external/src/org/xml/sax/ext Tag: jdk-ri-branch
package.html LexicalHandler.java DeclHandler.java
java/external/src/org/xml/sax Tag: jdk-ri-branch
package.html XMLReader.java XMLFilter.java
SAXParseException.java
SAXNotSupportedException.java
SAXNotRecognizedException.java SAXException.java
Parser.java Locator.java InputSource.java
HandlerBase.java ErrorHandler.java
EntityResolver.java DocumentHandler.java
DTDHandler.java ContentHandler.java Attributes.java
AttributeList.java
Added: java/external/src/org/xml/sax Tag: jdk-ri-branch COPYING.txt
COPYING
Log:
Check in code from Sun's JDK reference implementation. This is the exact
source code used in JDK 1.4 (AKA J2SE 1.4). Chronologically, this code is
an earlier version of the code at the branch point so the branch point has
no significance. This commit is beinging done at the request of Scott
Boag, who has more info.
Revision Changes Path
No revision
No revision
1.1.4.1 +11 -17 xml-commons/java/external/src/org/xml/sax/helpers/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/package.html,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- package.html 20 May 2001 03:12:58 -0000 1.1
+++ package.html 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,23 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
<head>
-<title>SAX 2.0 r2 prerelease helper interfaces</title>
</head>
+<body bgcolor="white">
-<body>
-<h1>SAX 2.0 r2 prerelease helper interfaces</h1>
-
-<blockquote>
-<p class="copyright">This document is in the <strong>PUBLIC
-DOMAIN</strong> and comes with <strong>NO WARRANTY</strong> of any
-kind.</p>
-</blockquote>
-
-<p>This is a prerelease of a bugfix release for SAX2, the second
-generation of the Simple API for XML. For information, see
-docs/index.html.</p>
+Provides helper classes for the Simple API for XML (SAX) which is a
+component of the <a href="http://java.sun.com/xml">Java API for XML
+Processing</a>. SAX, the Simple API for XML, is a standard interface for
+event-based XML parsing, developed collaboratively by the members of the
+XML-DEV mailing list, currently hosted by <a
+href="http://www.oasis-open.org">OASIS</a>. See the following link for
+more information on <a href="http://www.megginson.com/SAX/">SAX</a>.
+@since JDK1.4
</body>
</html>
1.1.4.1 +8 -5 xml-commons/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java
Index: XMLReaderFactory.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/XMLReaderFactory.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XMLReaderFactory.java 20 May 2001 03:12:58 -0000 1.1
+++ XMLReaderFactory.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the Public Domain.
-// $Id: XMLReaderFactory.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: XMLReaderFactory.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
import org.xml.sax.Parser;
@@ -42,7 +42,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.XMLReader
*/
final public class XMLReaderFactory
@@ -75,7 +75,7 @@
* or if the class cannot be loaded and instantiated.
* @see #createXMLReader(java.lang.String)
*/
- public static synchronized XMLReader createXMLReader ()
+ public static XMLReader createXMLReader ()
throws SAXException
{
String className = System.getProperty("org.xml.sax.driver");
@@ -109,11 +109,14 @@
* loaded, instantiated, and cast to XMLReader.
* @see #createXMLReader()
*/
- public static synchronized XMLReader createXMLReader (String className)
+ public static XMLReader createXMLReader (String className)
throws SAXException
{
try {
- return (XMLReader)(Class.forName(className).newInstance());
+ // Original SAX code
+ // return (XMLReader)(Class.forName(className).newInstance());
+
+ return (XMLReader) NewInstance.newInstance(className);
} catch (ClassNotFoundException e1) {
throw new SAXException("SAX2 driver class " + className +
" not found", e1);
1.1.4.1 +11 -20 xml-commons/java/external/src/org/xml/sax/helpers/XMLReaderAdapter.java
Index: XMLReaderAdapter.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/XMLReaderAdapter.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XMLReaderAdapter.java 20 May 2001 03:12:58 -0000 1.1
+++ XMLReaderAdapter.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the public domain.
-// $Id: XMLReaderAdapter.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: XMLReaderAdapter.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -44,7 +44,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser
* @see org.xml.sax.XMLReader
*/
@@ -255,8 +255,7 @@
*/
public void setDocumentLocator (Locator locator)
{
- if (documentHandler != null)
- documentHandler.setDocumentLocator(locator);
+ documentHandler.setDocumentLocator(locator);
}
@@ -270,8 +269,7 @@
public void startDocument ()
throws SAXException
{
- if (documentHandler != null)
- documentHandler.startDocument();
+ documentHandler.startDocument();
}
@@ -285,8 +283,7 @@
public void endDocument ()
throws SAXException
{
- if (documentHandler != null)
- documentHandler.endDocument();
+ documentHandler.endDocument();
}
@@ -328,10 +325,8 @@
String qName, Attributes atts)
throws SAXException
{
- if (documentHandler != null) {
- qAtts.setAttributes(atts);
- documentHandler.startElement(qName, qAtts);
- }
+ qAtts.setAttributes(atts);
+ documentHandler.startElement(qName, qAtts);
}
@@ -349,8 +344,7 @@
String qName)
throws SAXException
{
- if (documentHandler != null)
- documentHandler.endElement(qName);
+ documentHandler.endElement(qName);
}
@@ -367,8 +361,7 @@
public void characters (char ch[], int start, int length)
throws SAXException
{
- if (documentHandler != null)
- documentHandler.characters(ch, start, length);
+ documentHandler.characters(ch, start, length);
}
@@ -385,8 +378,7 @@
public void ignorableWhitespace (char ch[], int start, int length)
throws SAXException
{
- if (documentHandler != null)
- documentHandler.ignorableWhitespace(ch, start, length);
+ documentHandler.ignorableWhitespace(ch, start, length);
}
@@ -402,8 +394,7 @@
public void processingInstruction (String target, String data)
throws SAXException
{
- if (documentHandler != null)
- documentHandler.processingInstruction(target, data);
+ documentHandler.processingInstruction(target, data);
}
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/helpers/XMLFilterImpl.java
Index: XMLFilterImpl.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/XMLFilterImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XMLFilterImpl.java 20 May 2001 03:12:58 -0000 1.1
+++ XMLFilterImpl.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the Public Domain.
-// $Id: XMLFilterImpl.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: XMLFilterImpl.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -41,7 +41,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.XMLFilter
* @see org.xml.sax.XMLReader
* @see org.xml.sax.EntityResolver
1.1.4.1 +6 -3 xml-commons/java/external/src/org/xml/sax/helpers/ParserFactory.java
Index: ParserFactory.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/ParserFactory.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ParserFactory.java 20 May 2001 03:12:58 -0000 1.1
+++ ParserFactory.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX parser factory.
// No warranty; no copyright -- use this as you will.
-// $Id: ParserFactory.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: ParserFactory.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -42,7 +42,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser
* @see java.lang.Class
*/
@@ -121,7 +121,10 @@
InstantiationException,
ClassCastException
{
- return (Parser)(Class.forName(className).newInstance());
+ // Original SAX code
+ // return (Parser)(Class.forName(className).newInstance());
+
+ return (Parser) NewInstance.newInstance(className);
}
}
1.1.4.1 +15 -42 xml-commons/java/external/src/org/xml/sax/helpers/ParserAdapter.java
Index: ParserAdapter.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/ParserAdapter.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ParserAdapter.java 20 May 2001 03:12:58 -0000 1.1
+++ ParserAdapter.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -2,13 +2,12 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the public domain.
-// $Id: ParserAdapter.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: ParserAdapter.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Vector;
import org.xml.sax.Parser; // deprecated
import org.xml.sax.InputSource;
@@ -48,7 +47,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.helpers.XMLReaderAdapter
* @see org.xml.sax.XMLReader
* @see org.xml.sax.Parser
@@ -500,12 +499,6 @@
public void startElement (String qName, AttributeList qAtts)
throws SAXException
{
- // These are exceptions from the
- // first pass; they should be
- // ignored if there's a second pass,
- // but reported otherwise.
- Vector exceptions = null;
-
// If we're not doing Namespace
// processing, dispatch this quickly.
if (!namespaces) {
@@ -558,16 +551,9 @@
// This isn't a declaration.
} else {
- try {
- String attName[] = processName(attQName, true, true);
- atts.addAttribute(attName[0], attName[1], attName[2],
- type, value);
- } catch (SAXException e) {
- if (exceptions == null)
- exceptions = new Vector();
- exceptions.add(e);
- atts.addAttribute("", attQName, attQName, type, value);
- }
+ String attName[] = processName(attQName, true);
+ atts.addAttribute(attName[0], attName[1], attName[2],
+ type, value);
}
}
@@ -581,19 +567,16 @@
for (int i = 0; i < length; i++) {
String attQName = atts.getQName(i);
if (!attQName.startsWith("xmlns")) {
- String attName[] = processName(attQName, true, false);
+ String attName[] = processName(attQName, true);
atts.setURI(i, attName[0]);
atts.setLocalName(i, attName[1]);
}
}
- } else if (exceptions != null && errorHandler != null) {
- for (int i = 0; i < exceptions.size(); i++)
- errorHandler.error((SAXParseException)(exceptions.get(i)));
}
// OK, finally report the event.
if (contentHandler != null) {
- String name[] = processName(qName, false, false);
+ String name[] = processName(qName, false);
contentHandler.startElement(name[0], name[1], name[2], atts);
}
}
@@ -620,7 +603,7 @@
}
// Split the name.
- String names[] = processName(qName, false, false);
+ String names[] = processName(qName, false);
if (contentHandler != null) {
contentHandler.endElement(names[0], names[1], names[2]);
Enumeration prefixes = nsSupport.getDeclaredPrefixes();
@@ -729,8 +712,7 @@
* @exception org.xml.sax.SAXException The client may throw
* an exception if there is an error callback.
*/
- private String [] processName (String qName, boolean isAttribute,
- boolean useException)
+ private String [] processName (String qName, boolean isAttribute)
throws SAXException
{
String parts[] = nsSupport.processName(qName, nameParts,
@@ -738,8 +720,6 @@
if (parts == null) {
parts = new String[3];
parts[2] = qName.intern();
- if (useException)
- throw makeException("Undeclared prefix: " + qName);
reportError("Undeclared prefix: " + qName);
}
return parts;
@@ -756,24 +736,17 @@
void reportError (String message)
throws SAXException
{
- if (errorHandler != null)
- errorHandler.error(makeException(message));
- }
+ if (errorHandler == null) {
+ return;
+ }
-
- /**
- * Construct an exception for the current context.
- *
- * @param message The error message.
- */
- private SAXParseException makeException (String message)
- {
SAXParseException e;
if (locator != null) {
- return new SAXParseException(message, locator);
+ e = new SAXParseException(message, locator);
} else {
- return new SAXParseException(message, null, null, -1, -1);
+ e = new SAXParseException(message, null, null, -1, -1);
}
+ errorHandler.error(e);
}
1.1.4.1 +34 -53 xml-commons/java/external/src/org/xml/sax/helpers/NewInstance.java
Index: NewInstance.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/NewInstance.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- NewInstance.java 27 Feb 2002 16:04:55 -0000 1.1
+++ NewInstance.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,48 +1,40 @@
-// NewInstance.java - create a new instance of a class by name.
-// http://www.saxproject.org
-// Written by Edwin Goei, edwingo@apache.org
-// and by David Brownell, dbrownell@users.sourceforge.net
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: NewInstance.java,v 1.1 2002/02/27 16:04:55 dims Exp $
-
package org.xml.sax.helpers;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
/**
- * Create a new instance of a class by name.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a>
- * for further information.
- * </blockquote>
- *
- * <p>This class contains a static method for creating an instance of a
- * class from an explicit class name. It tries to use the thread's context
- * ClassLoader if possible and falls back to using
- * Class.forName(String).</p>
- *
- * <p>This code is designed to compile and run on JDK version 1.1 and later
- * including versions of Java 2.</p>
- *
- * @author Edwin Goei, David Brownell
- * @version 2.0.1 (sax2r2)
+ * This code is designed to run on JDK version 1.1 and later including JVMs
+ * that perform early linking like the Microsoft JVM in IE 5. Note however
+ * that it must be compiled on a JDK version 1.2 or later system since it
+ * calls Thread#getContextClassLoader(). The code also runs both as part
+ * of an unbundled jar file and when bundled as part of the JDK.
*/
class NewInstance {
-
/**
* Creates a new instance of the specified class name
*
* Package private so this code is not exposed at the API level.
*/
- static Object newInstance (ClassLoader classLoader, String className)
+ static Object newInstance(String className)
throws ClassNotFoundException, IllegalAccessException,
InstantiationException
{
+ ClassLoader classLoader;
+ try {
+ // Construct the name of the concrete class to instantiate
+ Class clazz = Class.forName(NewInstance.class.getName()
+ + "$ClassLoaderFinderConcrete");
+ ClassLoaderFinder clf = (ClassLoaderFinder) clazz.newInstance();
+ classLoader = clf.getContextClassLoader();
+ } catch (LinkageError le) {
+ // Assume that we are running JDK 1.1, use the current ClassLoader
+ classLoader = NewInstance.class.getClassLoader();
+ } catch (ClassNotFoundException x) {
+ // This case should not normally happen. MS IE can throw this
+ // instead of a LinkageError the second time Class.forName() is
+ // called so assume that we are running JDK 1.1 and use the
+ // current ClassLoader
+ classLoader = NewInstance.class.getClassLoader();
+ }
+
Class driverClass;
if (classLoader == null) {
driverClass = Class.forName(className);
@@ -52,29 +44,18 @@
return driverClass.newInstance();
}
- /**
- * Figure out which ClassLoader to use. For JDK 1.2 and later use
- * the context ClassLoader.
- */
- static ClassLoader getClassLoader ()
- {
- Method m = null;
+ /*
+ * The following nested classes allow getContextClassLoader() to be
+ * called only on JDK 1.2 and yet run in older JDK 1.1 JVMs
+ */
- try {
- m = Thread.class.getMethod("getContextClassLoader", null);
- } catch (NoSuchMethodException e) {
- // Assume that we are running JDK 1.1, use the current ClassLoader
- return NewInstance.class.getClassLoader();
- }
+ private static abstract class ClassLoaderFinder {
+ abstract ClassLoader getContextClassLoader();
+ }
- try {
- return (ClassLoader) m.invoke(Thread.currentThread(), null);
- } catch (IllegalAccessException e) {
- // assert(false)
- throw new UnknownError(e.getMessage());
- } catch (InvocationTargetException e) {
- // assert(e.getTargetException() instanceof SecurityException)
- throw new UnknownError(e.getMessage());
+ static class ClassLoaderFinderConcrete extends ClassLoaderFinder {
+ ClassLoader getContextClassLoader() {
+ return Thread.currentThread().getContextClassLoader();
}
}
}
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/helpers/NamespaceSupport.java
Index: NamespaceSupport.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/NamespaceSupport.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- NamespaceSupport.java 20 May 2001 03:12:58 -0000 1.1
+++ NamespaceSupport.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// This class is in the Public Domain. NO WARRANTY!
-// $Id: NamespaceSupport.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: NamespaceSupport.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -60,7 +60,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
*/
public class NamespaceSupport
{
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/helpers/LocatorImpl.java
Index: LocatorImpl.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/LocatorImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- LocatorImpl.java 20 May 2001 03:12:58 -0000 1.1
+++ LocatorImpl.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX default implementation for Locator.
// No warranty; no copyright -- use this as you will.
-// $Id: LocatorImpl.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: LocatorImpl.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -44,7 +44,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Locator Locator
*/
public class LocatorImpl implements Locator
1.1.4.1 +3 -7 xml-commons/java/external/src/org/xml/sax/helpers/DefaultHandler.java
Index: DefaultHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/DefaultHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- DefaultHandler.java 20 May 2001 03:12:58 -0000 1.1
+++ DefaultHandler.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -2,12 +2,10 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the public domain.
-// $Id: DefaultHandler.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: DefaultHandler.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
-import java.io.IOException;
-
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.Attributes;
@@ -49,7 +47,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.EntityResolver
* @see org.xml.sax.DTDHandler
* @see org.xml.sax.ContentHandler
@@ -79,14 +77,12 @@
* document.
* @return The new input source, or null to require the
* default behaviour.
- * @exception java.io.IOException If there is an error setting
- * up the new input source.
* @exception org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @see org.xml.sax.EntityResolver#resolveEntity
*/
public InputSource resolveEntity (String publicId, String systemId)
- throws IOException, SAXException
+ throws SAXException
{
return null;
}
1.1.2.1 +34 -36 xml-commons/java/external/src/org/xml/sax/helpers/AttributesImpl.java
Index: AttributesImpl.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/AttributesImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- AttributesImpl.java 20 May 2001 03:12:58 -0000 1.1
+++ AttributesImpl.java 13 May 2002 22:36:43 -0000 1.1.2.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the public domain.
-// $Id: AttributesImpl.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: AttributesImpl.java,v 1.1.2.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -41,7 +41,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
*/
public class AttributesImpl implements Attributes
{
@@ -340,17 +340,15 @@
*/
public void setAttributes (Attributes atts)
{
- clear();
- length = atts.getLength();
- if (length > 0) {
- data = new String[length*5];
- for (int i = 0; i < length; i++) {
- data[i*5] = atts.getURI(i);
- data[i*5+1] = atts.getLocalName(i);
- data[i*5+2] = atts.getQName(i);
- data[i*5+3] = atts.getType(i);
- data[i*5+4] = atts.getValue(i);
- }
+ clear();
+ length = atts.getLength();
+ data = new String[length*5];
+ for (int i = 0; i < length; i++) {
+ data[i*5] = atts.getURI(i);
+ data[i*5+1] = atts.getLocalName(i);
+ data[i*5+2] = atts.getQName(i);
+ data[i*5+3] = atts.getType(i);
+ data[i*5+4] = atts.getValue(i);
}
}
@@ -432,6 +430,11 @@
public void removeAttribute (int index)
{
if (index >= 0 && index < length) {
+ data[index*5] = null;
+ data[index*5+1] = null;
+ data[index*5+2] = null;
+ data[index*5+3] = null;
+ data[index*5+4] = null;
if (index < length - 1) {
System.arraycopy(data, (index+1)*5, data, index*5,
(length-index)*5);
@@ -553,29 +556,24 @@
* @param n The minimum number of attributes that the array must
* be able to hold.
*/
- private void ensureCapacity (int n) {
- if (n <= 0) {
- return;
- }
- int max;
- if (data == null || data.length == 0) {
- max = 25;
- }
- else if (data.length >= n * 5) {
- return;
- }
- else {
- max = data.length;
- }
- while (max < n * 5) {
- max *= 2;
- }
-
- String newData[] = new String[max];
- if (length > 0) {
- System.arraycopy(data, 0, newData, 0, length*5);
- }
- data = newData;
+ private void ensureCapacity (int n)
+ {
+ if (n > 0 && data == null) {
+ data = new String[25];
+ }
+
+ int max = data.length;
+ if (max >= n * 5) {
+ return;
+ }
+
+
+ while (max < n * 5) {
+ max *= 2;
+ }
+ String newData[] = new String[max];
+ System.arraycopy(data, 0, newData, 0, length*5);
+ data = newData;
}
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/helpers/AttributeListImpl.java
Index: AttributeListImpl.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/helpers/AttributeListImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- AttributeListImpl.java 20 May 2001 03:12:58 -0000 1.1
+++ AttributeListImpl.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX default implementation for AttributeList.
// No warranty; no copyright -- use this as you will.
-// $Id: AttributeListImpl.java,v 1.1 2001/05/20 03:12:58 curcuru Exp $
+// $Id: AttributeListImpl.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.helpers;
@@ -57,7 +57,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.AttributeList
* @see org.xml.sax.DocumentHandler#startElement
*/
No revision
No revision
1.1.4.1 +11 -108 xml-commons/java/external/src/org/xml/sax/ext/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/ext/package.html,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- package.html 20 May 2001 03:12:57 -0000 1.1
+++ package.html 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,114 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
<head>
-<title>SAX2-ext: SAX2 Extension Handlers 1.0</title>
</head>
+<body bgcolor="white">
-<body>
-<h1>SAX2-ext: SAX2 Extension Handlers 1.0</h1>
-
-<blockquote>
-<p class="copyright">This document is in the <strong>PUBLIC
-DOMAIN</strong> and comes with <strong>NO WARRANTY</strong> of any
-kind.</p>
-</blockquote>
-
-<p>This package, SAX2-ext, is an extension package for SAX2. It is
-designed both to allow SAX drivers to pass certain types of none-core
-information to applications and to serve as a simple model for other
-SAX2 extension packages.</p>
-
-<p><strong>NOTE:</strong> this package alone does add any
-functionality; it simply provides optional interfaces for SAX2 drivers
-to use. You must find a SAX2 driver that supports these interfaces if
-you actually want to have access to lexical and declaration
-information.</p>
-
-<p>The SAX2-ext package currently contains two extension handlers for
-SAX2:</p>
-
-<ol>
-
-<li><a href="javadoc/org/xml/sax/ext/LexicalHandler.html"
->LexicalHandler</a>, which reports comments, the DOCTYPE declaration,
-CDATA sections, and (some) entity boundaries; and</li>
-
-<li><a href="javadoc/org/xml/sax/ext/DeclHandler.html"
->DeclHandler</a>, which reports element, attribute, and entity
-declarations.</li>
-
-</ol>
-
-<p>This package is independent of the SAX2 core, and that independence
-has several consequences:</p>
-
-<ul>
-
-<li>SAX2 drivers are <em>not</em> required to support these handlers,
-and you cannot assume that the classes will be present in every SAX2
-installation.</li>
-
-<li>This package may be updated independently of SAX2 (i.e. new
-handlers may be added without updating SAX2 itself).</li>
-
-<li>The handlers are not supported explicitly by the SAX2
-<var>XMLFilter</var> interface (i.e. events are not passed on by
-default); you can subclass XMLFilter if you need such behaviour.</li>
-
-<li>The handlers need to be registered differently than regular SAX2
-handlers.</li>
-
-</ul>
-
-<p>To set a LexicalHandler, for example, you need to do something like
-this:</p>
-
-<blockquote><pre xml:space="preserve">
-LexicalHandler lh = new MyLexicalHandler();
-try {
- xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler",
- lh);
-} catch (SAXException e) {
- System.out.println("LexicalHandler not supported by this SAX2 driver.");
-}
-</pre></blockquote>
-
-
-<div>
-<h2>SAX2-ext Properties</h2>
-
-<p>Here is a full definition of the two new SAX2 properties introduced
-in this version of SAX2-ext:</p>
-
-<dl>
-
-<dt><code>http://xml.org/sax/properties/lexical-handler</code></dt>
-<dd><strong>data type:</strong>
-<code>org.xml.sax.ext.LexicalHandler</code></dd>
-<dd><strong>description:</strong> An optional extension handler for
-lexical events like comments.</dd>
-<dd><strong>access:</strong> read/write</dd>
-
-<dt><code>http://xml.org/sax/properties/declaration-handler</code></dt>
-<dd><strong>data type:</strong>
-<code>org.xml.sax.ext.DeclHandler</code></dd>
-<dd><strong>description:</strong> An optional extension handler for
-DTD-related events other than notations and unparsed entities.</dd>
-<dd><strong>access:</strong> read/write</dd>
-
-</dl>
-
-<p><strong>See also:</strong> the package's <a
-href="javadoc/index.html">JavaDoc</a> documentation.</p>
-
-<!-- end of "SAX2-ext Properties" -->
-</div>
-
-<hr />
-
-<address>$Id: package.html,v 1.1 2001/05/20 03:12:57 curcuru Exp $</address>
+Provides extension classes and interfaces for the Simple API for XML (SAX)
+which is a component of the <a href="http://java.sun.com/xml">Java API for
+XML Processing</a>. SAX, the Simple API for XML, is a standard interface
+for event-based XML parsing, developed collaboratively by the members of
+the XML-DEV mailing list, currently hosted by <a
+href="http://www.oasis-open.org">OASIS</a>. See the following link for
+more information on <a href="http://www.megginson.com/SAX/">SAX</a>.
+@since JDK1.4
</body>
</html>
1.1.4.1 +1 -1 xml-commons/java/external/src/org/xml/sax/ext/LexicalHandler.java
Index: LexicalHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/ext/LexicalHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- LexicalHandler.java 20 May 2001 03:12:57 -0000 1.1
+++ LexicalHandler.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// LexicalHandler.java - optional handler for lexical parse events.
// Public Domain: no warranty.
-// $Id: LexicalHandler.java,v 1.1 2001/05/20 03:12:57 curcuru Exp $
+// $Id: LexicalHandler.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.ext;
1.1.4.1 +1 -1 xml-commons/java/external/src/org/xml/sax/ext/DeclHandler.java
Index: DeclHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/ext/DeclHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- DeclHandler.java 20 May 2001 03:12:57 -0000 1.1
+++ DeclHandler.java 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// DeclHandler.java - Optional handler for DTD declaration events.
// Public Domain: no warranty.
-// $Id: DeclHandler.java,v 1.1 2001/05/20 03:12:57 curcuru Exp $
+// $Id: DeclHandler.java,v 1.1.4.1 2002/05/13 22:36:43 edwingo Exp $
package org.xml.sax.ext;
No revision
No revision
1.1.4.1 +11 -17 xml-commons/java/external/src/org/xml/sax/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/package.html,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- package.html 20 May 2001 03:12:56 -0000 1.1
+++ package.html 13 May 2002 22:36:43 -0000 1.1.4.1
@@ -1,23 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
<head>
-<title>SAX 2.0 r2 prerelease interfaces</title>
</head>
+<body bgcolor="white">
-<body>
-<h1>SAX 2.0 r2 prerelease interfaces</h1>
-
-<blockquote>
-<p class="copyright">This document is in the <strong>PUBLIC
-DOMAIN</strong> and comes with <strong>NO WARRANTY</strong> of any
-kind.</p>
-</blockquote>
-
-<p>This is a prerelease of a bugfix release for SAX2, the second
-generation of the Simple API for XML. For information, see
-docs/index.html.</p>
+Provides the classes and interfaces for the Simple API for XML (SAX) which
+is a component of the <a href="http://java.sun.com/xml">Java API for XML
+Processing</a>. SAX, the Simple API for XML, is a standard interface for
+event-based XML parsing, developed collaboratively by the members of the
+XML-DEV mailing list, currently hosted by <a
+href="http://www.oasis-open.org">OASIS</a>. See the following link for
+more information on <a href="http://www.megginson.com/SAX/">SAX</a>.
+@since JDK1.4
</body>
</html>
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/XMLReader.java
Index: XMLReader.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/XMLReader.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XMLReader.java 20 May 2001 03:12:56 -0000 1.1
+++ XMLReader.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the Public Domain.
-// $Id: XMLReader.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: XMLReader.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -51,7 +51,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.XMLFilter
* @see org.xml.sax.helpers.ParserAdapter
* @see org.xml.sax.helpers.XMLReaderAdapter
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/XMLFilter.java
Index: XMLFilter.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/XMLFilter.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XMLFilter.java 20 May 2001 03:12:56 -0000 1.1
+++ XMLFilter.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the Public Domain.
-// $Id: XMLFilter.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: XMLFilter.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -30,7 +30,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.helpers.XMLFilterImpl
*/
public interface XMLFilter extends XMLReader
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/SAXParseException.java
Index: SAXParseException.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/SAXParseException.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- SAXParseException.java 20 May 2001 03:12:56 -0000 1.1
+++ SAXParseException.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX exception class.
// No warranty; no copyright -- use this as you will.
-// $Id: SAXParseException.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: SAXParseException.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -26,7 +26,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.SAXException
* @see org.xml.sax.Locator
* @see org.xml.sax.ErrorHandler
1.1.4.1 +2 -11 xml-commons/java/external/src/org/xml/sax/SAXNotSupportedException.java
Index: SAXNotSupportedException.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/SAXNotSupportedException.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- SAXNotSupportedException.java 20 May 2001 03:12:56 -0000 1.1
+++ SAXNotSupportedException.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the Public Domain.
-// $Id: SAXNotSupportedException.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: SAXNotSupportedException.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -23,20 +23,11 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.SAXNotRecognizedException
*/
public class SAXNotSupportedException extends SAXException
{
-
- /**
- * Construct a new exception with no message.
- */
- public SAXNotSupportedException ()
- {
- super();
- }
-
/**
* Construct a new exception with the given message.
1.1.4.1 +2 -11 xml-commons/java/external/src/org/xml/sax/SAXNotRecognizedException.java
Index: SAXNotRecognizedException.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/SAXNotRecognizedException.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- SAXNotRecognizedException.java 20 May 2001 03:12:56 -0000 1.1
+++ SAXNotRecognizedException.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the Public Domain.
-// $Id: SAXNotRecognizedException.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: SAXNotRecognizedException.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -23,20 +23,11 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.SAXNotSupportedException
*/
public class SAXNotRecognizedException extends SAXException
{
-
- /**
- * Default constructor.
- */
- public SAXNotRecognizedException ()
- {
- super();
- }
-
/**
* Construct a new exception with the given message.
1.1.4.1 +2 -12 xml-commons/java/external/src/org/xml/sax/SAXException.java
Index: SAXException.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/SAXException.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- SAXException.java 20 May 2001 03:12:56 -0000 1.1
+++ SAXException.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX exception class.
// No warranty; no copyright -- use this as you will.
-// $Id: SAXException.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: SAXException.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -29,20 +29,10 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.SAXParseException
*/
public class SAXException extends Exception {
-
-
- /**
- * Create a new SAXException.
- */
- public SAXException ()
- {
- super();
- this.exception = null;
- }
/**
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/Parser.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- Parser.java 20 May 2001 03:12:56 -0000 1.1
+++ Parser.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX parser interface.
// No warranty; no copyright -- use this as you will.
-// $Id: Parser.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: Parser.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -39,7 +39,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.EntityResolver
* @see org.xml.sax.DTDHandler
* @see org.xml.sax.DocumentHandler
1.1.4.1 +2 -6 xml-commons/java/external/src/org/xml/sax/Locator.java
Index: Locator.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/Locator.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- Locator.java 20 May 2001 03:12:56 -0000 1.1
+++ Locator.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX locator interface for document events.
// No warranty; no copyright -- use this as you will.
-// $Id: Locator.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: Locator.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -37,7 +37,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.ContentHandler#setDocumentLocator
*/
public interface Locator {
@@ -107,10 +107,6 @@
* <p>The return value is an approximation of the column number
* in the document entity or external parsed entity where the
* markup triggering the event appears.</p>
- *
- * <p>If possible, the SAX driver should provide the line position
- * of the first character after the text associated with the document
- * event.</p>
*
* <p>If possible, the SAX driver should provide the line position
* of the first character after the text associated with the document
1.1.4.1 +3 -3 xml-commons/java/external/src/org/xml/sax/InputSource.java
Index: InputSource.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/InputSource.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- InputSource.java 20 May 2001 03:12:56 -0000 1.1
+++ InputSource.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX input source.
// No warranty; no copyright -- use this as you will.
-// $Id: InputSource.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: InputSource.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -40,7 +40,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser#parse
* @see org.xml.sax.EntityResolver#resolveEntity
* @see java.io.InputStream
@@ -191,7 +191,7 @@
*
* <p>If the system ID is a URL, it will be fully resolved.</p>
*
- * @return The system identifier, or null if none was supplied.
+ * @return The system identifier.
* @see #setSystemId
* @see #getEncoding
*/
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/HandlerBase.java
Index: HandlerBase.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/HandlerBase.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- HandlerBase.java 20 May 2001 03:12:56 -0000 1.1
+++ HandlerBase.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX default handler base class.
// No warranty; no copyright -- use this as you will.
-// $Id: HandlerBase.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: HandlerBase.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -34,7 +34,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.EntityResolver
* @see org.xml.sax.DTDHandler
* @see org.xml.sax.DocumentHandler
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/ErrorHandler.java
Index: ErrorHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/ErrorHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ErrorHandler.java 20 May 2001 03:12:56 -0000 1.1
+++ ErrorHandler.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX error handler.
// No warranty; no copyright -- use this as you will.
-// $Id: ErrorHandler.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: ErrorHandler.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -35,7 +35,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser#setErrorHandler
* @see org.xml.sax.SAXParseException
*/
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/EntityResolver.java
Index: EntityResolver.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/EntityResolver.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- EntityResolver.java 20 May 2001 03:12:56 -0000 1.1
+++ EntityResolver.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX entity resolver.
// No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: EntityResolver.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -60,7 +60,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser#setEntityResolver
* @see org.xml.sax.InputSource
*/
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/DocumentHandler.java
Index: DocumentHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/DocumentHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- DocumentHandler.java 20 May 2001 03:12:56 -0000 1.1
+++ DocumentHandler.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX document handler.
// No warranty; no copyright -- use this as you will.
-// $Id: DocumentHandler.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: DocumentHandler.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -37,7 +37,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser#setDocumentHandler
* @see org.xml.sax.Locator
* @see org.xml.sax.HandlerBase
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/DTDHandler.java
Index: DTDHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/DTDHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- DTDHandler.java 20 May 2001 03:12:56 -0000 1.1
+++ DTDHandler.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX DTD handler.
// No warranty; no copyright -- use this as you will.
-// $Id: DTDHandler.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: DTDHandler.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -39,7 +39,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.Parser#setDTDHandler
* @see org.xml.sax.HandlerBase
*/
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/ContentHandler.java
Index: ContentHandler.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/ContentHandler.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ContentHandler.java 20 May 2001 03:12:56 -0000 1.1
+++ ContentHandler.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the public domain.
-// $Id: ContentHandler.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: ContentHandler.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -50,7 +50,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.XMLReader
* @see org.xml.sax.DTDHandler
* @see org.xml.sax.ErrorHandler
1.1.4.1 +3 -3 xml-commons/java/external/src/org/xml/sax/Attributes.java
Index: Attributes.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/Attributes.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- Attributes.java 20 May 2001 03:12:56 -0000 1.1
+++ Attributes.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -2,7 +2,7 @@
// Written by David Megginson, sax@megginson.com
// NO WARRANTY! This class is in the public domain.
-// $Id: Attributes.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: Attributes.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -49,7 +49,7 @@
* @since SAX 2.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.helpers.AttributeListImpl
*/
public interface Attributes
@@ -167,7 +167,7 @@
* @return The index of the attribute, or -1 if it does not
* appear in the list.
*/
- public int getIndex (String uri, String localName);
+ public int getIndex (String uri, String localPart);
/**
1.1.4.1 +2 -2 xml-commons/java/external/src/org/xml/sax/AttributeList.java
Index: AttributeList.java
===================================================================
RCS file: /home/cvs/xml-commons/java/external/src/org/xml/sax/AttributeList.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- AttributeList.java 20 May 2001 03:12:56 -0000 1.1
+++ AttributeList.java 13 May 2002 22:36:44 -0000 1.1.4.1
@@ -1,6 +1,6 @@
// SAX Attribute List Interface.
// No warranty; no copyright -- use this as you will.
-// $Id: AttributeList.java,v 1.1 2001/05/20 03:12:56 curcuru Exp $
+// $Id: AttributeList.java,v 1.1.4.1 2002/05/13 22:36:44 edwingo Exp $
package org.xml.sax;
@@ -63,7 +63,7 @@
* @since SAX 1.0
* @author David Megginson,
* <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0r2pre
+ * @version 2.0
* @see org.xml.sax.DocumentHandler#startElement startElement
* @see org.xml.sax.helpers.AttributeListImpl AttributeListImpl
*/
No revision
No revision
1.1.2.1 +39 -0 xml-commons/java/external/src/org/xml/sax/Attic/COPYING.txt
1.1.2.1 +12 -0 xml-commons/java/external/src/org/xml/sax/Attic/COPYING