[multiple changes]
2005-03-26 Chris Burdess <dog@gnu.org> * gnu/xml/dom/DomNode.java (notifyNode): grow listener array as required. 2005-03-13 Michael Koch <konqueror@gmx.de> * gnu/xml/aelfred2/XmlParser.java: Fixed typo. 2005-03-11 Chris Burdess <dog@gnu.org> * gnu/xml/aelfred2/SAXDriver.java: Corrected bug handling URI warnings. 2005-02-27 Chris Burdess <dog@gnu.org> * gnu/xml/aelfred2/JAXPFactory.java, gnu/xml/aelfred2/SAXDriver.java, gnu/xml/aelfred2/XmlParser.java, gnu/xml/aelfred2/XmlReader.java: Applied GNU Classpath source code formatting conventions. Replaced arrays of Object with struct-like classes for easier maintainability. Made SAXDriver.stringInterning package private to allow access from XmlParser inside the loop without a method call overhead. 2005-03-11 Chris Burdess <dog@gnu.org> * gnu/xml/aelfred2/SAXDriver.java: Corrected bug handling URI warnings. From-SVN: r97200
This commit is contained in:
Tom Tromey
parent
1fff69c9a4
commit
8d06274e61
|
|
@ -1,3 +1,33 @@
|
|||
2005-03-26 Chris Burdess <dog@gnu.org>
|
||||
|
||||
* gnu/xml/dom/DomNode.java (notifyNode): grow listener array as
|
||||
required.
|
||||
|
||||
2005-03-13 Michael Koch <konqueror@gmx.de>
|
||||
|
||||
* gnu/xml/aelfred2/XmlParser.java: Fixed typo.
|
||||
|
||||
2005-03-11 Chris Burdess <dog@gnu.org>
|
||||
|
||||
* gnu/xml/aelfred2/SAXDriver.java: Corrected bug handling URI
|
||||
warnings.
|
||||
|
||||
2005-02-27 Chris Burdess <dog@gnu.org>
|
||||
|
||||
* gnu/xml/aelfred2/JAXPFactory.java,
|
||||
gnu/xml/aelfred2/SAXDriver.java,
|
||||
gnu/xml/aelfred2/XmlParser.java,
|
||||
gnu/xml/aelfred2/XmlReader.java: Applied GNU Classpath source code
|
||||
formatting conventions. Replaced arrays of Object with struct-like
|
||||
classes for easier maintainability. Made SAXDriver.stringInterning
|
||||
package private to allow access from XmlParser inside the loop without
|
||||
a method call overhead.
|
||||
|
||||
2005-03-11 Chris Burdess <dog@gnu.org>
|
||||
|
||||
* gnu/xml/aelfred2/SAXDriver.java: Corrected bug handling URI
|
||||
warnings.
|
||||
|
||||
2005-03-28 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* configure.ac: Revert 2005-03-25's patch. Propagate MULTIlib
|
||||
|
|
|
|||
|
|
@ -60,137 +60,172 @@ import javax.xml.parsers.SAXParserFactory;
|
|||
*
|
||||
* @author David Brownell
|
||||
*/
|
||||
public final class JAXPFactory extends SAXParserFactory
|
||||
public final class JAXPFactory
|
||||
extends SAXParserFactory
|
||||
{
|
||||
private Hashtable flags = new Hashtable ();
|
||||
|
||||
private Hashtable flags = new Hashtable();
|
||||
|
||||
/**
|
||||
* Constructs a factory which normally returns a non-validating
|
||||
* parser.
|
||||
*/
|
||||
public JAXPFactory () { }
|
||||
/**
|
||||
* Constructs a factory which normally returns a non-validating
|
||||
* parser.
|
||||
*/
|
||||
public JAXPFactory()
|
||||
{
|
||||
}
|
||||
|
||||
public SAXParser newSAXParser ()
|
||||
public SAXParser newSAXParser()
|
||||
throws ParserConfigurationException, SAXException
|
||||
{
|
||||
JaxpParser jaxp = new JaxpParser ();
|
||||
Enumeration e = flags.keys ();
|
||||
XMLReader parser = jaxp.getXMLReader ();
|
||||
{
|
||||
JaxpParser jaxp = new JaxpParser();
|
||||
Enumeration e = flags.keys();
|
||||
XMLReader parser = jaxp.getXMLReader();
|
||||
|
||||
parser.setFeature (
|
||||
SAXDriver.FEATURE + "namespaces",
|
||||
isNamespaceAware ());
|
||||
parser.setFeature (
|
||||
SAXDriver.FEATURE + "validation",
|
||||
isValidating ());
|
||||
// that makes SAX2 feature flags trump JAXP
|
||||
parser.setFeature(SAXDriver.FEATURE + "namespaces",
|
||||
isNamespaceAware());
|
||||
parser.setFeature(SAXDriver.FEATURE + "validation",
|
||||
isValidating());
|
||||
// that makes SAX2 feature flags trump JAXP
|
||||
|
||||
while (e.hasMoreElements())
|
||||
{
|
||||
String uri = (String) e.nextElement();
|
||||
Boolean value = (Boolean) flags.get(uri);
|
||||
parser.setFeature(uri, value.booleanValue());
|
||||
}
|
||||
|
||||
while (e.hasMoreElements ()) {
|
||||
String uri = (String) e.nextElement ();
|
||||
Boolean value = (Boolean) flags.get (uri);
|
||||
parser.setFeature (uri, value.booleanValue ());
|
||||
}
|
||||
return jaxp;
|
||||
}
|
||||
|
||||
return jaxp;
|
||||
}
|
||||
|
||||
// yes, this "feature transfer" mechanism doesn't play well
|
||||
|
||||
public void setFeature (String name, boolean value)
|
||||
throws
|
||||
ParserConfigurationException,
|
||||
SAXNotRecognizedException,
|
||||
SAXNotSupportedException
|
||||
{
|
||||
try {
|
||||
// force "early" detection of errors where possible
|
||||
// (flags can't necessarily be set before parsing)
|
||||
new JaxpParser ().getXMLReader ().setFeature (name, value);
|
||||
|
||||
flags.put (name, new Boolean (value));
|
||||
} catch (SAXNotRecognizedException e) {
|
||||
throw new SAXNotRecognizedException (name);
|
||||
} catch (SAXNotSupportedException e) {
|
||||
throw new SAXNotSupportedException (name);
|
||||
} catch (Exception e) {
|
||||
throw new ParserConfigurationException (
|
||||
e.getClass ().getName ()
|
||||
+ ": "
|
||||
+ e.getMessage ());
|
||||
}
|
||||
}
|
||||
|
||||
public boolean getFeature (String name)
|
||||
throws
|
||||
ParserConfigurationException,
|
||||
SAXNotRecognizedException,
|
||||
SAXNotSupportedException
|
||||
{
|
||||
Boolean value = (Boolean) flags.get (name);
|
||||
|
||||
if (value != null)
|
||||
return value.booleanValue ();
|
||||
else
|
||||
try {
|
||||
return new JaxpParser ().getXMLReader ().getFeature (name);
|
||||
} catch (SAXNotRecognizedException e) {
|
||||
throw new SAXNotRecognizedException (name);
|
||||
} catch (SAXNotSupportedException e) {
|
||||
throw new SAXNotSupportedException (name);
|
||||
} catch (SAXException e) {
|
||||
throw new ParserConfigurationException (
|
||||
e.getClass ().getName ()
|
||||
+ ": "
|
||||
+ e.getMessage ());
|
||||
}
|
||||
}
|
||||
|
||||
private static class JaxpParser extends SAXParser
|
||||
{
|
||||
private XmlReader ae2 = new XmlReader ();
|
||||
private XMLReaderAdapter parser = null;
|
||||
|
||||
JaxpParser () { }
|
||||
|
||||
public void setProperty (String id, Object value)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{ ae2.setProperty (id, value); }
|
||||
|
||||
public Object getProperty (String id)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{ return ae2.getProperty (id); }
|
||||
|
||||
public Parser getParser ()
|
||||
throws SAXException
|
||||
{
|
||||
if (parser == null)
|
||||
parser = new XMLReaderAdapter (ae2);
|
||||
return parser;
|
||||
}
|
||||
|
||||
public XMLReader getXMLReader ()
|
||||
throws SAXException
|
||||
{ return ae2; }
|
||||
|
||||
public boolean isNamespaceAware ()
|
||||
{
|
||||
try {
|
||||
return ae2.getFeature (SAXDriver.FEATURE + "namespaces");
|
||||
} catch (Exception e) {
|
||||
throw new Error ();
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isValidating ()
|
||||
{
|
||||
try {
|
||||
return ae2.getFeature (SAXDriver.FEATURE + "validation");
|
||||
} catch (Exception e) {
|
||||
throw new Error ();
|
||||
}
|
||||
}
|
||||
|
||||
// TODO isXIncludeAware()
|
||||
// yes, this "feature transfer" mechanism doesn't play well
|
||||
|
||||
public void setFeature(String name, boolean value)
|
||||
throws ParserConfigurationException, SAXNotRecognizedException,
|
||||
SAXNotSupportedException
|
||||
{
|
||||
try
|
||||
{
|
||||
// force "early" detection of errors where possible
|
||||
// (flags can't necessarily be set before parsing)
|
||||
new JaxpParser().getXMLReader().setFeature(name, value);
|
||||
|
||||
flags.put(name, new Boolean(value));
|
||||
}
|
||||
catch (SAXNotRecognizedException e)
|
||||
{
|
||||
throw new SAXNotRecognizedException(name);
|
||||
}
|
||||
catch (SAXNotSupportedException e)
|
||||
{
|
||||
throw new SAXNotSupportedException(name);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new ParserConfigurationException(e.getClass().getName()
|
||||
+ ": "
|
||||
+ e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public boolean getFeature(String name)
|
||||
throws ParserConfigurationException, SAXNotRecognizedException,
|
||||
SAXNotSupportedException
|
||||
{
|
||||
Boolean value = (Boolean) flags.get(name);
|
||||
|
||||
if (value != null)
|
||||
{
|
||||
return value.booleanValue();
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
return new JaxpParser().getXMLReader().getFeature(name);
|
||||
}
|
||||
catch (SAXNotRecognizedException e)
|
||||
{
|
||||
throw new SAXNotRecognizedException(name);
|
||||
}
|
||||
catch (SAXNotSupportedException e)
|
||||
{
|
||||
throw new SAXNotSupportedException(name);
|
||||
}
|
||||
catch (SAXException e)
|
||||
{
|
||||
throw new ParserConfigurationException(e.getClass().getName()
|
||||
+ ": "
|
||||
+ e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class JaxpParser
|
||||
extends SAXParser
|
||||
{
|
||||
|
||||
private XmlReader ae2 = new XmlReader();
|
||||
private XMLReaderAdapter parser = null;
|
||||
|
||||
JaxpParser()
|
||||
{
|
||||
}
|
||||
|
||||
public void setProperty(String id, Object value)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{
|
||||
ae2.setProperty(id, value);
|
||||
}
|
||||
|
||||
public Object getProperty(String id)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{
|
||||
return ae2.getProperty(id);
|
||||
}
|
||||
|
||||
public Parser getParser()
|
||||
throws SAXException
|
||||
{
|
||||
if (parser == null)
|
||||
{
|
||||
parser = new XMLReaderAdapter(ae2);
|
||||
}
|
||||
return parser;
|
||||
}
|
||||
|
||||
public XMLReader getXMLReader ()
|
||||
throws SAXException
|
||||
{
|
||||
return ae2;
|
||||
}
|
||||
|
||||
public boolean isNamespaceAware()
|
||||
{
|
||||
try
|
||||
{
|
||||
return ae2.getFeature(SAXDriver.FEATURE + "namespaces");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new Error();
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isValidating()
|
||||
{
|
||||
try
|
||||
{
|
||||
return ae2.getFeature(SAXDriver.FEATURE + "validation");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new Error();
|
||||
}
|
||||
}
|
||||
|
||||
// TODO isXIncludeAware()
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -70,246 +70,305 @@ import gnu.xml.pipeline.ValidationConsumer;
|
|||
*
|
||||
* @author David Brownell
|
||||
*/
|
||||
public final class XmlReader implements XMLReader
|
||||
public final class XmlReader
|
||||
implements XMLReader
|
||||
{
|
||||
private SAXDriver aelfred2 = new SAXDriver ();
|
||||
private EventFilter filter = new EventFilter ();
|
||||
private boolean isValidating;
|
||||
private boolean active;
|
||||
|
||||
|
||||
/** Constructs a SAX Parser. */
|
||||
public XmlReader ()
|
||||
{ }
|
||||
|
||||
/**
|
||||
* Constructs a SAX Parser, optionally treating validity errors
|
||||
* as if they were fatal errors.
|
||||
*/
|
||||
public XmlReader (boolean invalidIsFatal)
|
||||
static class FatalErrorHandler
|
||||
extends DefaultHandler2
|
||||
{
|
||||
|
||||
public void error(SAXParseException e)
|
||||
throws SAXException
|
||||
{
|
||||
if (invalidIsFatal)
|
||||
setErrorHandler (new DefaultHandler2 () {
|
||||
public void error (SAXParseException e)
|
||||
throws SAXException
|
||||
{ throw e; }
|
||||
});
|
||||
throw e;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private SAXDriver aelfred2 = new SAXDriver();
|
||||
private EventFilter filter = new EventFilter();
|
||||
private boolean isValidating;
|
||||
private boolean active;
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used to report the logical
|
||||
* content of an XML document.
|
||||
*/
|
||||
public ContentHandler getContentHandler ()
|
||||
{ return filter.getContentHandler (); }
|
||||
/**
|
||||
* Constructs a SAX Parser.
|
||||
*/
|
||||
public XmlReader()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Assigns the object used to report the logical
|
||||
* content of an XML document.
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setContentHandler (ContentHandler handler)
|
||||
{
|
||||
if (active)
|
||||
throw new IllegalStateException ("already parsing");
|
||||
filter.setContentHandler (handler);
|
||||
}
|
||||
/**
|
||||
* Constructs a SAX Parser, optionally treating validity errors
|
||||
* as if they were fatal errors.
|
||||
*/
|
||||
public XmlReader(boolean invalidIsFatal)
|
||||
{
|
||||
if (invalidIsFatal)
|
||||
{
|
||||
setErrorHandler(new FatalErrorHandler());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used to report the logical
|
||||
* content of an XML document.
|
||||
*/
|
||||
public ContentHandler getContentHandler()
|
||||
{
|
||||
return filter.getContentHandler();
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used to process declarations related
|
||||
* to notations and unparsed entities.
|
||||
*/
|
||||
public DTDHandler getDTDHandler ()
|
||||
{ return filter.getDTDHandler (); }
|
||||
/**
|
||||
* <b>SAX2</b>: Assigns the object used to report the logical
|
||||
* content of an XML document.
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setContentHandler(ContentHandler handler)
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
throw new IllegalStateException("already parsing");
|
||||
}
|
||||
filter.setContentHandler(handler);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX1</b> Assigns DTD handler
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setDTDHandler (DTDHandler handler)
|
||||
{
|
||||
if (active)
|
||||
throw new IllegalStateException ("already parsing");
|
||||
filter.setDTDHandler (handler);
|
||||
}
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used to process declarations related
|
||||
* to notations and unparsed entities.
|
||||
*/
|
||||
public DTDHandler getDTDHandler()
|
||||
{
|
||||
return filter.getDTDHandler();
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used when resolving external
|
||||
* entities during parsing (both general and parameter entities).
|
||||
*/
|
||||
public EntityResolver getEntityResolver ()
|
||||
{ return aelfred2.getEntityResolver (); }
|
||||
/**
|
||||
* <b>SAX1</b> Assigns DTD handler
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setDTDHandler(DTDHandler handler)
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
throw new IllegalStateException("already parsing");
|
||||
}
|
||||
filter.setDTDHandler(handler);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used when resolving external
|
||||
* entities during parsing (both general and parameter entities).
|
||||
*/
|
||||
public EntityResolver getEntityResolver()
|
||||
{
|
||||
return aelfred2.getEntityResolver();
|
||||
}
|
||||
|
||||
/** <b>SAX1</b> Assigns parser's entity resolver */
|
||||
public void setEntityResolver (EntityResolver handler)
|
||||
{ aelfred2.setEntityResolver (handler); }
|
||||
/**
|
||||
* <b>SAX1</b> Assigns parser's entity resolver
|
||||
*/
|
||||
public void setEntityResolver(EntityResolver handler)
|
||||
{
|
||||
aelfred2.setEntityResolver(handler);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used to receive callbacks for XML
|
||||
* errors of all levels (fatal, nonfatal, warning); this is never null;
|
||||
*/
|
||||
public ErrorHandler getErrorHandler ()
|
||||
{ return aelfred2.getErrorHandler (); }
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the object used to receive callbacks for XML
|
||||
* errors of all levels (fatal, nonfatal, warning); this is never null;
|
||||
*/
|
||||
public ErrorHandler getErrorHandler()
|
||||
{
|
||||
return aelfred2.getErrorHandler();
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX1</b> Assigns error handler
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setErrorHandler (ErrorHandler handler)
|
||||
{
|
||||
if (active)
|
||||
throw new IllegalStateException ("already parsing");
|
||||
aelfred2.setErrorHandler (handler);
|
||||
}
|
||||
/**
|
||||
* <b>SAX1</b> Assigns error handler
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setErrorHandler(ErrorHandler handler)
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
throw new IllegalStateException("already parsing");
|
||||
}
|
||||
aelfred2.setErrorHandler(handler);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Assigns the specified property.
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setProperty (String propertyId, Object value)
|
||||
/**
|
||||
* <b>SAX2</b>: Assigns the specified property.
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
*/
|
||||
public void setProperty(String propertyId, Object value)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{
|
||||
if (active)
|
||||
throw new IllegalStateException ("already parsing");
|
||||
if (getProperty (propertyId) != value)
|
||||
filter.setProperty (propertyId, value);
|
||||
}
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
throw new IllegalStateException("already parsing");
|
||||
}
|
||||
if (getProperty(propertyId) != value)
|
||||
{
|
||||
filter.setProperty(propertyId, value);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the specified property.
|
||||
*/
|
||||
public Object getProperty (String propertyId)
|
||||
/**
|
||||
* <b>SAX2</b>: Returns the specified property.
|
||||
*/
|
||||
public Object getProperty(String propertyId)
|
||||
throws SAXNotRecognizedException
|
||||
{
|
||||
if ((SAXDriver.PROPERTY + "declaration-handler")
|
||||
.equals (propertyId)
|
||||
|| (SAXDriver.PROPERTY + "lexical-handler")
|
||||
.equals (propertyId))
|
||||
return filter.getProperty (propertyId);
|
||||
throw new SAXNotRecognizedException (propertyId);
|
||||
}
|
||||
|
||||
private void forceValidating ()
|
||||
{
|
||||
if ((SAXDriver.PROPERTY + "declaration-handler").equals(propertyId)
|
||||
|| (SAXDriver.PROPERTY + "lexical-handler").equals(propertyId))
|
||||
{
|
||||
return filter.getProperty(propertyId);
|
||||
}
|
||||
throw new SAXNotRecognizedException(propertyId);
|
||||
}
|
||||
|
||||
private void forceValidating()
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{
|
||||
aelfred2.setFeature (
|
||||
SAXDriver.FEATURE + "namespace-prefixes",
|
||||
true);
|
||||
aelfred2.setFeature (
|
||||
SAXDriver.FEATURE + "external-general-entities",
|
||||
true);
|
||||
aelfred2.setFeature (
|
||||
SAXDriver.FEATURE + "external-parameter-entities",
|
||||
true);
|
||||
}
|
||||
{
|
||||
aelfred2.setFeature(SAXDriver.FEATURE + "namespace-prefixes",
|
||||
true);
|
||||
aelfred2.setFeature(SAXDriver.FEATURE + "external-general-entities",
|
||||
true);
|
||||
aelfred2.setFeature(SAXDriver.FEATURE + "external-parameter-entities",
|
||||
true);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Sets the state of features supported in this parser.
|
||||
* Note that this parser requires reporting of namespace prefixes when
|
||||
* validating.
|
||||
*/
|
||||
public void setFeature (String featureId, boolean state)
|
||||
/**
|
||||
* <b>SAX2</b>: Sets the state of features supported in this parser.
|
||||
* Note that this parser requires reporting of namespace prefixes when
|
||||
* validating.
|
||||
*/
|
||||
public void setFeature(String featureId, boolean state)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{
|
||||
boolean value = getFeature (featureId);
|
||||
{
|
||||
boolean value = getFeature(featureId);
|
||||
|
||||
if (state == value)
|
||||
return;
|
||||
if (state == value)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if ((SAXDriver.FEATURE + "validation").equals (featureId)) {
|
||||
if (active)
|
||||
throw new SAXNotSupportedException ("already parsing");
|
||||
if (state)
|
||||
forceValidating ();
|
||||
isValidating = state;
|
||||
} else
|
||||
aelfred2.setFeature (featureId, state);
|
||||
}
|
||||
if ((SAXDriver.FEATURE + "validation").equals(featureId))
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
throw new SAXNotSupportedException("already parsing");
|
||||
}
|
||||
if (state)
|
||||
{
|
||||
forceValidating();
|
||||
}
|
||||
isValidating = state;
|
||||
}
|
||||
else
|
||||
{
|
||||
aelfred2.setFeature(featureId, state);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX2</b>: Tells whether this parser supports the specified feature.
|
||||
* At this time, this directly parallels the underlying SAXDriver,
|
||||
* except that validation is optionally supported.
|
||||
*
|
||||
* @see SAXDriver
|
||||
*/
|
||||
public boolean getFeature (String featureId)
|
||||
/**
|
||||
* <b>SAX2</b>: Tells whether this parser supports the specified feature.
|
||||
* At this time, this directly parallels the underlying SAXDriver,
|
||||
* except that validation is optionally supported.
|
||||
*
|
||||
* @see SAXDriver
|
||||
*/
|
||||
public boolean getFeature(String featureId)
|
||||
throws SAXNotRecognizedException, SAXNotSupportedException
|
||||
{
|
||||
if ((SAXDriver.FEATURE + "validation").equals (featureId))
|
||||
return isValidating;
|
||||
{
|
||||
if ((SAXDriver.FEATURE + "validation").equals(featureId))
|
||||
{
|
||||
return isValidating;
|
||||
}
|
||||
|
||||
return aelfred2.getFeature (featureId);
|
||||
}
|
||||
return aelfred2.getFeature(featureId);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX1</b>: Sets the locale used for diagnostics; currently,
|
||||
* only locales using the English language are supported.
|
||||
* @param locale The locale for which diagnostics will be generated
|
||||
*/
|
||||
public void setLocale (Locale locale)
|
||||
/**
|
||||
* <b>SAX1</b>: Sets the locale used for diagnostics; currently,
|
||||
* only locales using the English language are supported.
|
||||
* @param locale The locale for which diagnostics will be generated
|
||||
*/
|
||||
public void setLocale(Locale locale)
|
||||
throws SAXException
|
||||
{ aelfred2.setLocale (locale); }
|
||||
{
|
||||
aelfred2.setLocale(locale);
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX1</b>: Preferred API to parse an XML document, using a
|
||||
* system identifier (URI).
|
||||
/**
|
||||
* <b>SAX1</b>: Preferred API to parse an XML document, using a
|
||||
* system identifier (URI).
|
||||
*/
|
||||
public void parse (String systemId)
|
||||
public void parse(String systemId)
|
||||
throws SAXException, IOException
|
||||
{
|
||||
parse (new InputSource (systemId));
|
||||
}
|
||||
{
|
||||
parse(new InputSource(systemId));
|
||||
}
|
||||
|
||||
/**
|
||||
* <b>SAX1</b>: Underlying API to parse an XML document, used
|
||||
* directly when no URI is available. When this is invoked,
|
||||
* and the parser is set to validate, some features will be
|
||||
* automatically reset to appropriate values: for reporting
|
||||
* namespace prefixes, and incorporating external entities.
|
||||
*
|
||||
* @param source The XML input source.
|
||||
*
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
* @exception SAXException The handlers may throw any SAXException,
|
||||
* and the parser normally throws SAXParseException objects.
|
||||
* @exception IOException IOExceptions are normally through through
|
||||
* the parser if there are problems reading the source document.
|
||||
*/
|
||||
public void parse (InputSource source)
|
||||
/**
|
||||
* <b>SAX1</b>: Underlying API to parse an XML document, used
|
||||
* directly when no URI is available. When this is invoked,
|
||||
* and the parser is set to validate, some features will be
|
||||
* automatically reset to appropriate values: for reporting
|
||||
* namespace prefixes, and incorporating external entities.
|
||||
*
|
||||
* @param source The XML input source.
|
||||
*
|
||||
* @exception IllegalStateException if called mid-parse
|
||||
* @exception SAXException The handlers may throw any SAXException,
|
||||
* and the parser normally throws SAXParseException objects.
|
||||
* @exception IOException IOExceptions are normally through through
|
||||
* the parser if there are problems reading the source document.
|
||||
*/
|
||||
public void parse(InputSource source)
|
||||
throws SAXException, IOException
|
||||
{
|
||||
EventFilter next;
|
||||
boolean nsdecls;
|
||||
{
|
||||
EventFilter next;
|
||||
boolean nsdecls;
|
||||
|
||||
synchronized (aelfred2) {
|
||||
if (active)
|
||||
throw new IllegalStateException ("already parsing");
|
||||
active = true;
|
||||
}
|
||||
synchronized (aelfred2)
|
||||
{
|
||||
if (active)
|
||||
{
|
||||
throw new IllegalStateException("already parsing");
|
||||
}
|
||||
active = true;
|
||||
}
|
||||
|
||||
// set up the output pipeline
|
||||
if (isValidating) {
|
||||
forceValidating ();
|
||||
next = new ValidationConsumer (filter);
|
||||
} else
|
||||
next = filter;
|
||||
// set up the output pipeline
|
||||
if (isValidating)
|
||||
{
|
||||
forceValidating();
|
||||
next = new ValidationConsumer(filter);
|
||||
}
|
||||
else
|
||||
{
|
||||
next = filter;
|
||||
}
|
||||
|
||||
// connect pipeline and error handler
|
||||
// don't let _this_ call to bind() affect xmlns* attributes
|
||||
nsdecls = aelfred2.getFeature (
|
||||
SAXDriver.FEATURE + "namespace-prefixes");
|
||||
EventFilter.bind (aelfred2, next);
|
||||
if (!nsdecls)
|
||||
aelfred2.setFeature (
|
||||
SAXDriver.FEATURE + "namespace-prefixes",
|
||||
false);
|
||||
// connect pipeline and error handler
|
||||
// don't let _this_ call to bind() affect xmlns* attributes
|
||||
nsdecls = aelfred2.getFeature(SAXDriver.FEATURE + "namespace-prefixes");
|
||||
EventFilter.bind(aelfred2, next);
|
||||
if (!nsdecls)
|
||||
{
|
||||
aelfred2.setFeature(SAXDriver.FEATURE + "namespace-prefixes",
|
||||
false);
|
||||
}
|
||||
|
||||
// parse, clean up
|
||||
try
|
||||
{
|
||||
aelfred2.parse(source);
|
||||
}
|
||||
finally
|
||||
{
|
||||
active = false;
|
||||
}
|
||||
}
|
||||
|
||||
// parse, clean up
|
||||
try {
|
||||
aelfred2.parse (source);
|
||||
} finally {
|
||||
active = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1686,13 +1686,16 @@ public abstract class DomNode
|
|||
{
|
||||
continue;
|
||||
}
|
||||
if (count < notificationSet.length)
|
||||
if (count >= notificationSet.length)
|
||||
{
|
||||
notificationSet[count++] = rec;
|
||||
// very simple growth algorithm
|
||||
int len = Math.max(notificationSet.length, 1);
|
||||
ListenerRecord[] tmp = new ListenerRecord[len * 2];
|
||||
System.arraycopy(notificationSet, 0, tmp, 0,
|
||||
notificationSet.length);
|
||||
notificationSet = tmp;
|
||||
}
|
||||
else
|
||||
// XXX fire up some cheap growth algorithm
|
||||
throw new RuntimeException("Event notification set size exceeded");
|
||||
notificationSet[count++] = rec;
|
||||
}
|
||||
|
||||
// Notify just those listeners
|
||||
|
|
|
|||
Loading…
Reference in New Issue