+2005-02-16 Mark Wielaard <mark@klomp.org>
+
+ * Makefile.am (gnu_xml_source_files): Removed
+ gnu/xml/dom/DomCDATA.java, gnu/xml/dom/DomEx.java,
+ gnu/xml/dom/DomFragment.java, gnu/xml/dom/DomPI.java and
+ gnu/xml/dom/ls/DomLSEx.java. Replaced by adding
+ gnu/xml/dom/DomCDATASection.java, gnu/xml/dom/DomDOMException.java,
+ gnu/xml/dom/DomDocumentFragment.java,
+ gnu/xml/dom/DomProcessingInstruction.java and
+ gnu/xml/dom/ls/DomLSException.java.
+ * Makefile.in: Regenerated.
+
+2005-02-16 Tom Tromey <tromey@redhat.com>
+
+ * gnu/xml/aelfred2/SAXDriver.java: Ensure that null is returned when
+ attribute index is out of bounds.
+
+2005-02-16 Chris Burdess <dog@gnu.org>
+
+ * gnu/xml/aelfred2/SAXDriver.java: Corrected implementation of
+ isDeclared methods. Improved performance of isSpecified methods.
+
+2005-02-16 Chris Burdess <dog@gnu.org>
+
+ Fixes bug libgcj/19864
+ * gnu/xml/dom/DomAttr.java,
+ gnu/xml/dom/DomCDATA.java,
+ gnu/xml/dom/DomCDATASection.java,
+ gnu/xml/dom/DomCharacterData.java,
+ gnu/xml/dom/DomDOMException.java,
+ gnu/xml/dom/DomDoctype.java,
+ gnu/xml/dom/DomDocument.java,
+ gnu/xml/dom/DomDocumentConfiguration.java,
+ gnu/xml/dom/DomDocumentFragment.java,
+ gnu/xml/dom/DomElement.java,
+ gnu/xml/dom/DomEx.java,
+ gnu/xml/dom/DomFragment.java,
+ gnu/xml/dom/DomImpl.java,
+ gnu/xml/dom/DomIterator.java,
+ gnu/xml/dom/DomNamedNodeMap.java,
+ gnu/xml/dom/DomNode.java,
+ gnu/xml/dom/DomNsNode.java,
+ gnu/xml/dom/DomPI.java,
+ gnu/xml/dom/DomProcessingInstruction.java,
+ gnu/xml/dom/DomText.java,
+ gnu/xml/dom/DomLSEx.java,
+ gnu/xml/dom/DomLSException.java,
+ gnu/xml/dom/DomLSParser.java,
+ gnu/xml/dom/DomLSSerializer.java: Refactoring of exception and DOM
+ implementation class names to conform to Classpath guidelines. Make
+ DomLSException use JDK 1.4+ exception chaining.
+ * gnu/xml/util/SAXNullTransformerFactory.java,
+ gnu/xml/xpath/Predicate.java: Use constants relative to
+ declaring class or interface.
+
2005-02-16 Andrew Haley <aph@redhat.com>
gnu/xml/util/DoParse.java \
gnu/xml/util/XHTMLWriter.java \
gnu/xml/util/SAXNullTransformerFactory.java \
-gnu/xml/dom/DomCDATA.java \
gnu/xml/dom/DomXPathNSResolver.java \
-gnu/xml/dom/ls/DomLSEx.java \
gnu/xml/dom/ls/FilteredSAXEventSink.java \
+gnu/xml/dom/ls/DomLSException.java \
gnu/xml/dom/ls/DomLSSerializer.java \
gnu/xml/dom/ls/DomLSInput.java \
gnu/xml/dom/ls/DomLSOutput.java \
gnu/xml/dom/DomElement.java \
gnu/xml/dom/DomNsNode.java \
gnu/xml/dom/DomAttr.java \
-gnu/xml/dom/DomPI.java \
gnu/xml/dom/DTDAttributeTypeInfo.java \
gnu/xml/dom/DomDocumentBuilder.java \
gnu/xml/dom/DTDElementTypeInfo.java \
-gnu/xml/dom/DomEx.java \
gnu/xml/dom/DomDocument.java \
gnu/xml/dom/DomXPathExpression.java \
gnu/xml/dom/DomDocumentConfiguration.java \
+gnu/xml/dom/DomDocumentFragment.java \
+gnu/xml/dom/DomProcessingInstruction.java \
gnu/xml/dom/Consumer.java \
gnu/xml/dom/DomComment.java \
gnu/xml/dom/DomCharacterData.java \
gnu/xml/dom/DomNotation.java \
gnu/xml/dom/JAXPFactory.java \
gnu/xml/dom/DomIterator.java \
-gnu/xml/dom/DomFragment.java \
gnu/xml/dom/DomEvent.java \
gnu/xml/dom/DomEntity.java \
+gnu/xml/dom/DomCDATASection.java \
+gnu/xml/dom/DomDOMException.java \
gnu/xml/transform/GenerateIdFunction.java \
gnu/xml/transform/FormatNumberFunction.java \
gnu/xml/transform/ValueOfNode.java \
gnu/xml/util/Resolver.java gnu/xml/util/DoParse.java \
gnu/xml/util/XHTMLWriter.java \
gnu/xml/util/SAXNullTransformerFactory.java \
- gnu/xml/dom/DomCDATA.java gnu/xml/dom/DomXPathNSResolver.java \
- gnu/xml/dom/ls/DomLSEx.java \
+ gnu/xml/dom/DomXPathNSResolver.java \
gnu/xml/dom/ls/FilteredSAXEventSink.java \
+ gnu/xml/dom/ls/DomLSException.java \
gnu/xml/dom/ls/DomLSSerializer.java \
gnu/xml/dom/ls/DomLSInput.java gnu/xml/dom/ls/DomLSOutput.java \
gnu/xml/dom/ls/SAXEventSink.java \
gnu/xml/dom/ls/ReaderInputStream.java \
gnu/xml/dom/ls/WriterOutputStream.java \
gnu/xml/dom/DomElement.java gnu/xml/dom/DomNsNode.java \
- gnu/xml/dom/DomAttr.java gnu/xml/dom/DomPI.java \
- gnu/xml/dom/DTDAttributeTypeInfo.java \
+ gnu/xml/dom/DomAttr.java gnu/xml/dom/DTDAttributeTypeInfo.java \
gnu/xml/dom/DomDocumentBuilder.java \
- gnu/xml/dom/DTDElementTypeInfo.java gnu/xml/dom/DomEx.java \
+ gnu/xml/dom/DTDElementTypeInfo.java \
gnu/xml/dom/DomDocument.java \
gnu/xml/dom/DomXPathExpression.java \
gnu/xml/dom/DomDocumentConfiguration.java \
+ gnu/xml/dom/DomDocumentFragment.java \
+ gnu/xml/dom/DomProcessingInstruction.java \
gnu/xml/dom/Consumer.java gnu/xml/dom/DomComment.java \
gnu/xml/dom/DomCharacterData.java gnu/xml/dom/DomExtern.java \
gnu/xml/dom/DomEntityReference.java \
gnu/xml/dom/DomText.java gnu/xml/dom/DomNSResolverContext.java \
gnu/xml/dom/DomNodeIterator.java gnu/xml/dom/DomNotation.java \
gnu/xml/dom/JAXPFactory.java gnu/xml/dom/DomIterator.java \
- gnu/xml/dom/DomFragment.java gnu/xml/dom/DomEvent.java \
- gnu/xml/dom/DomEntity.java \
+ gnu/xml/dom/DomEvent.java gnu/xml/dom/DomEntity.java \
+ gnu/xml/dom/DomCDATASection.java \
+ gnu/xml/dom/DomDOMException.java \
gnu/xml/transform/GenerateIdFunction.java \
gnu/xml/transform/FormatNumberFunction.java \
gnu/xml/transform/ValueOfNode.java \
gnu/xml/util/Resolver.lo gnu/xml/util/DoParse.lo \
gnu/xml/util/XHTMLWriter.lo \
gnu/xml/util/SAXNullTransformerFactory.lo \
- gnu/xml/dom/DomCDATA.lo gnu/xml/dom/DomXPathNSResolver.lo \
- gnu/xml/dom/ls/DomLSEx.lo \
+ gnu/xml/dom/DomXPathNSResolver.lo \
gnu/xml/dom/ls/FilteredSAXEventSink.lo \
+ gnu/xml/dom/ls/DomLSException.lo \
gnu/xml/dom/ls/DomLSSerializer.lo gnu/xml/dom/ls/DomLSInput.lo \
gnu/xml/dom/ls/DomLSOutput.lo gnu/xml/dom/ls/SAXEventSink.lo \
gnu/xml/dom/ls/DomLSParser.lo \
gnu/xml/dom/ls/ReaderInputStream.lo \
gnu/xml/dom/ls/WriterOutputStream.lo gnu/xml/dom/DomElement.lo \
gnu/xml/dom/DomNsNode.lo gnu/xml/dom/DomAttr.lo \
- gnu/xml/dom/DomPI.lo gnu/xml/dom/DTDAttributeTypeInfo.lo \
+ gnu/xml/dom/DTDAttributeTypeInfo.lo \
gnu/xml/dom/DomDocumentBuilder.lo \
- gnu/xml/dom/DTDElementTypeInfo.lo gnu/xml/dom/DomEx.lo \
- gnu/xml/dom/DomDocument.lo gnu/xml/dom/DomXPathExpression.lo \
+ gnu/xml/dom/DTDElementTypeInfo.lo gnu/xml/dom/DomDocument.lo \
+ gnu/xml/dom/DomXPathExpression.lo \
gnu/xml/dom/DomDocumentConfiguration.lo \
+ gnu/xml/dom/DomDocumentFragment.lo \
+ gnu/xml/dom/DomProcessingInstruction.lo \
gnu/xml/dom/Consumer.lo gnu/xml/dom/DomComment.lo \
gnu/xml/dom/DomCharacterData.lo gnu/xml/dom/DomExtern.lo \
gnu/xml/dom/DomEntityReference.lo \
gnu/xml/dom/DomText.lo gnu/xml/dom/DomNSResolverContext.lo \
gnu/xml/dom/DomNodeIterator.lo gnu/xml/dom/DomNotation.lo \
gnu/xml/dom/JAXPFactory.lo gnu/xml/dom/DomIterator.lo \
- gnu/xml/dom/DomFragment.lo gnu/xml/dom/DomEvent.lo \
- gnu/xml/dom/DomEntity.lo \
+ gnu/xml/dom/DomEvent.lo gnu/xml/dom/DomEntity.lo \
+ gnu/xml/dom/DomCDATASection.lo gnu/xml/dom/DomDOMException.lo \
gnu/xml/transform/GenerateIdFunction.lo \
gnu/xml/transform/FormatNumberFunction.lo \
gnu/xml/transform/ValueOfNode.lo \
gnu/xml/util/DoParse.java \
gnu/xml/util/XHTMLWriter.java \
gnu/xml/util/SAXNullTransformerFactory.java \
-gnu/xml/dom/DomCDATA.java \
gnu/xml/dom/DomXPathNSResolver.java \
-gnu/xml/dom/ls/DomLSEx.java \
gnu/xml/dom/ls/FilteredSAXEventSink.java \
+gnu/xml/dom/ls/DomLSException.java \
gnu/xml/dom/ls/DomLSSerializer.java \
gnu/xml/dom/ls/DomLSInput.java \
gnu/xml/dom/ls/DomLSOutput.java \
gnu/xml/dom/DomElement.java \
gnu/xml/dom/DomNsNode.java \
gnu/xml/dom/DomAttr.java \
-gnu/xml/dom/DomPI.java \
gnu/xml/dom/DTDAttributeTypeInfo.java \
gnu/xml/dom/DomDocumentBuilder.java \
gnu/xml/dom/DTDElementTypeInfo.java \
-gnu/xml/dom/DomEx.java \
gnu/xml/dom/DomDocument.java \
gnu/xml/dom/DomXPathExpression.java \
gnu/xml/dom/DomDocumentConfiguration.java \
+gnu/xml/dom/DomDocumentFragment.java \
+gnu/xml/dom/DomProcessingInstruction.java \
gnu/xml/dom/Consumer.java \
gnu/xml/dom/DomComment.java \
gnu/xml/dom/DomCharacterData.java \
gnu/xml/dom/DomNotation.java \
gnu/xml/dom/JAXPFactory.java \
gnu/xml/dom/DomIterator.java \
-gnu/xml/dom/DomFragment.java \
gnu/xml/dom/DomEvent.java \
gnu/xml/dom/DomEntity.java \
+gnu/xml/dom/DomCDATASection.java \
+gnu/xml/dom/DomDOMException.java \
gnu/xml/transform/GenerateIdFunction.java \
gnu/xml/transform/FormatNumberFunction.java \
gnu/xml/transform/ValueOfNode.java \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) gnu/xml/dom/$(DEPDIR)
@: > gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomCDATA.lo: gnu/xml/dom/$(am__dirstamp) \
- gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomXPathNSResolver.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/ls/$(am__dirstamp):
gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) gnu/xml/dom/ls/$(DEPDIR)
@: > gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/ls/DomLSEx.lo: gnu/xml/dom/ls/$(am__dirstamp) \
- gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/ls/FilteredSAXEventSink.lo: \
gnu/xml/dom/ls/$(am__dirstamp) \
gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/ls/DomLSException.lo: gnu/xml/dom/ls/$(am__dirstamp) \
+ gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/ls/DomLSSerializer.lo: gnu/xml/dom/ls/$(am__dirstamp) \
gnu/xml/dom/ls/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/ls/DomLSInput.lo: gnu/xml/dom/ls/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomAttr.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomPI.lo: gnu/xml/dom/$(am__dirstamp) \
- gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DTDAttributeTypeInfo.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomDocumentBuilder.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DTDElementTypeInfo.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomEx.lo: gnu/xml/dom/$(am__dirstamp) \
- gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomDocument.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomXPathExpression.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomDocumentConfiguration.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDocumentFragment.lo: gnu/xml/dom/$(am__dirstamp) \
+ gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomProcessingInstruction.lo: gnu/xml/dom/$(am__dirstamp) \
+ gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/Consumer.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomComment.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomIterator.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
-gnu/xml/dom/DomFragment.lo: gnu/xml/dom/$(am__dirstamp) \
- gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomEvent.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/dom/DomEntity.lo: gnu/xml/dom/$(am__dirstamp) \
gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomCDATASection.lo: gnu/xml/dom/$(am__dirstamp) \
+ gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
+gnu/xml/dom/DomDOMException.lo: gnu/xml/dom/$(am__dirstamp) \
+ gnu/xml/dom/$(DEPDIR)/$(am__dirstamp)
gnu/xml/transform/$(am__dirstamp):
@$(mkdir_p) gnu/xml/transform
@: > gnu/xml/transform/$(am__dirstamp)
-rm -f gnu/xml/dom/DTDElementTypeInfo.lo
-rm -f gnu/xml/dom/DomAttr.$(OBJEXT)
-rm -f gnu/xml/dom/DomAttr.lo
- -rm -f gnu/xml/dom/DomCDATA.$(OBJEXT)
- -rm -f gnu/xml/dom/DomCDATA.lo
+ -rm -f gnu/xml/dom/DomCDATASection.$(OBJEXT)
+ -rm -f gnu/xml/dom/DomCDATASection.lo
-rm -f gnu/xml/dom/DomCharacterData.$(OBJEXT)
-rm -f gnu/xml/dom/DomCharacterData.lo
-rm -f gnu/xml/dom/DomComment.$(OBJEXT)
-rm -f gnu/xml/dom/DomComment.lo
+ -rm -f gnu/xml/dom/DomDOMException.$(OBJEXT)
+ -rm -f gnu/xml/dom/DomDOMException.lo
-rm -f gnu/xml/dom/DomDoctype.$(OBJEXT)
-rm -f gnu/xml/dom/DomDoctype.lo
-rm -f gnu/xml/dom/DomDocument.$(OBJEXT)
-rm -f gnu/xml/dom/DomDocumentBuilderFactory.lo
-rm -f gnu/xml/dom/DomDocumentConfiguration.$(OBJEXT)
-rm -f gnu/xml/dom/DomDocumentConfiguration.lo
+ -rm -f gnu/xml/dom/DomDocumentFragment.$(OBJEXT)
+ -rm -f gnu/xml/dom/DomDocumentFragment.lo
-rm -f gnu/xml/dom/DomElement.$(OBJEXT)
-rm -f gnu/xml/dom/DomElement.lo
-rm -f gnu/xml/dom/DomEntity.$(OBJEXT)
-rm -f gnu/xml/dom/DomEntityReference.lo
-rm -f gnu/xml/dom/DomEvent.$(OBJEXT)
-rm -f gnu/xml/dom/DomEvent.lo
- -rm -f gnu/xml/dom/DomEx.$(OBJEXT)
- -rm -f gnu/xml/dom/DomEx.lo
-rm -f gnu/xml/dom/DomExtern.$(OBJEXT)
-rm -f gnu/xml/dom/DomExtern.lo
- -rm -f gnu/xml/dom/DomFragment.$(OBJEXT)
- -rm -f gnu/xml/dom/DomFragment.lo
-rm -f gnu/xml/dom/DomImpl.$(OBJEXT)
-rm -f gnu/xml/dom/DomImpl.lo
-rm -f gnu/xml/dom/DomIterator.$(OBJEXT)
-rm -f gnu/xml/dom/DomNotation.lo
-rm -f gnu/xml/dom/DomNsNode.$(OBJEXT)
-rm -f gnu/xml/dom/DomNsNode.lo
- -rm -f gnu/xml/dom/DomPI.$(OBJEXT)
- -rm -f gnu/xml/dom/DomPI.lo
+ -rm -f gnu/xml/dom/DomProcessingInstruction.$(OBJEXT)
+ -rm -f gnu/xml/dom/DomProcessingInstruction.lo
-rm -f gnu/xml/dom/DomText.$(OBJEXT)
-rm -f gnu/xml/dom/DomText.lo
-rm -f gnu/xml/dom/DomXPathExpression.$(OBJEXT)
-rm -f gnu/xml/dom/ImplementationSource.lo
-rm -f gnu/xml/dom/JAXPFactory.$(OBJEXT)
-rm -f gnu/xml/dom/JAXPFactory.lo
- -rm -f gnu/xml/dom/ls/DomLSEx.$(OBJEXT)
- -rm -f gnu/xml/dom/ls/DomLSEx.lo
+ -rm -f gnu/xml/dom/ls/DomLSException.$(OBJEXT)
+ -rm -f gnu/xml/dom/ls/DomLSException.lo
-rm -f gnu/xml/dom/ls/DomLSInput.$(OBJEXT)
-rm -f gnu/xml/dom/ls/DomLSInput.lo
-rm -f gnu/xml/dom/ls/DomLSOutput.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DTDAttributeTypeInfo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DTDElementTypeInfo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomAttr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCDATA.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCDATASection.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomCharacterData.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomComment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDOMException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDoctype.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocument.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentBuilder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentBuilderFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentConfiguration.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomDocumentFragment.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomElement.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEntity.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEntityReference.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomEx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomExtern.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomFragment.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomIterator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNSResolverContext.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNodeIterator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNotation.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomNsNode.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomPI.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomProcessingInstruction.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomText.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathExpression.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/DomXPathNSResolver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/ImplementationList.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/ImplementationSource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/$(DEPDIR)/JAXPFactory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSEx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSInput.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSOutput.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/xml/dom/ls/$(DEPDIR)/DomLSParser.Plo@am__quote@
private Stack entityStack;
// one vector (of object/struct): faster, smaller
- private List attributesList = Collections.synchronizedList(new ArrayList());
-
- private boolean attributeSpecified [] = new boolean[10];
- private boolean attributeDeclared [] = new boolean[10];
+ private List attributesList;
private boolean namespaces = true;
private boolean xmlNames = false;
elementName = null;
entityStack = new Stack ();
attributesList = Collections.synchronizedList(new ArrayList());
- attributeSpecified = new boolean[10];
- attributeDeclared = new boolean[10];
attributeCount = 0;
attributes = false;
nsTemp = new String[3];
}
// remember this attribute ...
- if (attributeCount == attributeSpecified.length) { // grow array?
- boolean temp [] = new boolean [attributeSpecified.length + 5];
- System.arraycopy (attributeSpecified, 0, temp, 0, attributeCount);
- attributeSpecified = temp;
- }
- attributeSpecified [attributeCount] = isSpecified;
-
attributeCount++;
// attribute type comes from querying parser's DTD records
- attributesList.add(new Attribute(qname, value));
+ attributesList.add(new Attribute(qname, value, isSpecified));
}
*/
public int getLength ()
{
- return attributesList.size ();
+ return attributesList.size();
}
/**
*/
public String getURI (int index)
{
- return ((Attribute) attributesList.get (index)).nameSpace;
+ if (index < 0 || index >= attributesList.size())
+ {
+ return null;
+ }
+ return ((Attribute) attributesList.get(index)).nameSpace;
}
/**
*/
public String getLocalName (int index)
{
- Attribute attr = (Attribute) attributesList.get (index);
+ if (index < 0 || index >= attributesList.size())
+ {
+ return null;
+ }
+ Attribute attr = (Attribute) attributesList.get(index);
// FIXME attr.localName is sometimes null, why?
if (namespaces && attr.localName == null)
{
attr.localName = (ci == -1) ? attr.name :
attr.name.substring(ci + 1);
}
- return attr.localName;
+ return (attr.localName == null) ? "" : attr.localName;
}
/**
* <b>SAX2 Attributes</b> method (don't invoke on parser);
*/
- public String getQName (int i)
+ public String getQName (int index)
{
- return ((Attribute) attributesList.get (i)).name;
+ if (index < 0 || index >= attributesList.size())
+ {
+ return null;
+ }
+ Attribute attr = (Attribute) attributesList.get(index);
+ return (attr.name == null) ? "" : attr.name;
}
/**
* <b>SAX1 AttributeList</b> method (don't invoke on parser);
*/
- public String getName (int i)
+ public String getName (int index)
{
- return ((Attribute) attributesList.get (i)).name;
+ return getQName(index);
}
/**
* <b>SAX1 AttributeList, SAX2 Attributes</b> method
* (don't invoke on parser);
*/
- public String getType (int i)
+ public String getType (int index)
{
- String type = parser.getAttributeType (elementName, getQName (i));
+ if (index < 0 || index >= attributesList.size())
+ {
+ return null;
+ }
+ String type = parser.getAttributeType(elementName, getQName(index));
if (type == null)
+ {
return "CDATA";
+ }
// ... use DeclHandler.attributeDecl to see enumerations
- if (type == "ENUMERATION")
- return "NMTOKEN";
- return type;
+ if (type == "ENUMERATION")
+ {
+ return "NMTOKEN";
+ }
+ return type;
}
* <b>SAX1 AttributeList, SAX2 Attributes</b> method
* (don't invoke on parser);
*/
- public String getValue (int i)
+ public String getValue (int index)
{
- return ((Attribute) attributesList.get (i)).value;
+ if (index < 0 || index >= attributesList.size())
+ {
+ return null;
+ }
+ return ((Attribute) attributesList.get(index)).value;
}
*/
public int getIndex (String uri, String local)
{
- int length = getLength ();
+ int length = getLength();
- for (int i = 0; i < length; i++) {
- if (!getURI (i).equals (uri))
+ for (int i = 0; i < length; i++)
+ {
+ if (!getURI(i).equals(uri))
+ {
continue;
- if (getLocalName (i).equals (local))
+ }
+ if (getLocalName(i).equals(local))
+ {
return i;
- }
+ }
+ }
return -1;
}
*/
public int getIndex (String xmlName)
{
- int length = getLength ();
+ int length = getLength();
- for (int i = 0; i < length; i++) {
- if (getQName (i).equals (xmlName))
+ for (int i = 0; i < length; i++)
+ {
+ if (getQName(i).equals(xmlName))
+ {
return i;
- }
+ }
+ }
return -1;
}
*/
public String getType (String uri, String local)
{
- int index = getIndex (uri, local);
+ int index = getIndex(uri, local);
if (index < 0)
+ {
return null;
- return getType (index);
+ }
+ return getType(index);
}
*/
public String getType (String xmlName)
{
- int index = getIndex (xmlName);
+ int index = getIndex(xmlName);
if (index < 0)
+ {
return null;
- return getType (index);
+ }
+ return getType(index);
}
*/
public String getValue (String uri, String local)
{
- int index = getIndex (uri, local);
+ int index = getIndex(uri, local);
if (index < 0)
+ {
return null;
- return getValue (index);
+ }
+ return getValue(index);
}
*/
public String getValue (String xmlName)
{
- int index = getIndex (xmlName);
+ int index = getIndex(xmlName);
if (index < 0)
+ {
return null;
- return getValue (index);
+ }
+ return getValue(index);
}
{
if (index < 0 || index >= attributeCount)
throw new ArrayIndexOutOfBoundsException ();
- return attributeDeclared [index];
+ String type = parser.getAttributeType(elementName, getQName(index));
+ return (type != null);
}
/** @return false unless the attribute was declared in the DTD.
* @throws java.lang.IllegalArgumentException
* When the supplied names do not identify an attribute.
*/
- public boolean isDeclared (java.lang.String qName)
+ public boolean isDeclared (String qName)
{
int index = getIndex (qName);
if (index < 0)
throw new IllegalArgumentException ();
- return attributeDeclared [index];
+ String type = parser.getAttributeType(elementName, qName);
+ return (type != null);
}
/** @return false unless the attribute was declared in the DTD.
* @throws java.lang.IllegalArgumentException
* When the supplied names do not identify an attribute.
*/
- public boolean isDeclared (java.lang.String uri, java.lang.String localName)
+ public boolean isDeclared (String uri, String localName)
{
int index = getIndex (uri, localName);
- if (index < 0)
- throw new IllegalArgumentException ();
- return attributeDeclared [index];
+ return isDeclared(index);
}
*/
public boolean isSpecified (int index)
{
- if (index < 0 || index >= attributeCount)
- throw new ArrayIndexOutOfBoundsException ();
- return attributeSpecified [index];
+ return ((Attribute) attributesList.get(index)).specified;
}
/**
public boolean isSpecified (String uri, String local)
{
int index = getIndex (uri, local);
-
- if (index < 0)
- throw new IllegalArgumentException ();
- return attributeSpecified [index];
+ return isSpecified(index);
}
/**
public boolean isSpecified (String xmlName)
{
int index = getIndex (xmlName);
-
- if (index < 0)
- throw new IllegalArgumentException ();
- return attributeSpecified [index];
+ return isSpecified(index);
}
String value;
String nameSpace;
String localName;
+ boolean specified;
- Attribute(String name, String value)
+ Attribute(String name, String value, boolean specified)
{
this.name = name;
this.value = value;
this.nameSpace = "";
+ this.specified = specified;
}
}
package gnu.xml.dom;
import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.TypeInfo;
{
if (readonly)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
if (value == null)
{
{
if (parent != null)
{
- throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
if (!(e instanceof DomElement))
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR);
}
parent = (DomElement) e;
depth = parent.depth + 1;
-/* DomCDATA.java --
+/* DomCDATASection.java --
Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* @author David Brownell
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
*/
-public class DomCDATA
+public class DomCDATASection
extends DomText
implements CDATASection
{
* similarly used in a "Sub-DOM" style layer.
*
*/
- protected DomCDATA(DomDocument owner, String value)
+ protected DomCDATASection(DomDocument owner, String value)
{
super(CDATA_SECTION_NODE, owner, value);
}
- protected DomCDATA(DomDocument owner, char buf [], int off, int len)
+ protected DomCDATASection(DomDocument owner, char buf [], int off, int len)
{
super(CDATA_SECTION_NODE, owner, buf, off, len);
}
*/
final public String getNodeName()
{
- return "#cdata-section";
+ return "#cdata-section";
}
}
package gnu.xml.dom;
import org.w3c.dom.CharacterData;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.events.MutationEvent;
{
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
String value = text + arg;
mutating(value);
{
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
char[] raw = text.toCharArray();
if (offset < 0 || count < 0 || offset > raw.length)
{
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
if ((offset + count) > raw.length)
{
}
catch (IndexOutOfBoundsException x)
{
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
{
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
char[] raw = text.toCharArray();
char[] tmp = arg.toCharArray ();
}
catch (IndexOutOfBoundsException x)
{
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
{
if (readonly)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
char[] raw = text.toCharArray();
// deleteData
if (offset < 0 || count < 0 || offset > raw.length)
{
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
if ((offset + count) > raw.length)
{
}
catch (IndexOutOfBoundsException x)
{
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
{
if (isReadonly())
{
- throw new DomEx (DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
if (value == null)
{
{
return text.substring(offset);
}
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
-/* DomEx.java --
+/* DomDOMException.java --
Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
*
* @author David Brownell
*/
-public class DomEx
+public class DomDOMException
extends DOMException
{
* Constructs an exception, with the diagnostic message
* corresponding to the specified code.
*/
- public DomEx(short code)
+ public DomDOMException(short code)
{
super(code, diagnostic(code));
}
* corresponding to the specified code and additional
* information as provided.
*/
- public DomEx(short code, String data, Node node, int value)
+ public DomDOMException(short code, String data, Node node, int value)
{
super(code, diagnostic(code));
this.data = data;
import java.util.HashMap;
import org.w3c.dom.DocumentType;
+import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Entity;
import org.w3c.dom.NamedNodeMap;
}
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
getEntities();
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
getNotations();
if (newChild.getNodeType() == ELEMENT_NODE
&& getDocumentElement() != null)
{
- throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR,
- "document element already present: " +
- getDocumentElement(), newChild, 0);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
+ "document element already present: " +
+ getDocumentElement(), newChild, 0);
}
if (newChild.getNodeType() == DOCUMENT_TYPE_NODE
&& getDoctype() != null)
{
- throw new DomEx (DomEx.HIERARCHY_REQUEST_ERR,
- "document type already present: " +
- getDoctype(), newChild, 0);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
+ "document type already present: " +
+ getDoctype(), newChild, 0);
}
}
{
if (name == null)
{
- throw new DomEx (DomEx.NAMESPACE_ERR, name, null, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
}
int len = name.length();
if (len == 0)
{
- throw new DomEx (DomEx.NAMESPACE_ERR, name, null, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR, name, null, 0);
}
// dog: rewritten to use the rules for XML 1.0 and 1.1
(c < 0xfdf0 || c > 0xfffd) &&
(c < 0x10000 || c > 0xeffff))
{
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
+ name, null, c);
}
}
else
(c >= 0x20dd && c <= 0x20e0))
{
// Compatibility area and Unicode 2.0 exclusions
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
+ name, null, c);
}
break;
default:
if (c != ':' && c != '_' && (c < 0x02bb || c > 0x02c1) &&
c != 0x0559 && c != 0x06e5 && c != 0x06e6)
{
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
+ name, null, c);
}
}
}
(c < 0x0300 || c > 0x036f) &&
(c < 0x203f || c > 0x2040))
{
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR, name,
+ null, c);
}
}
else
(c >= 0x20dd && c <= 0x20e0))
{
// Compatibility area and Unicode 2.0 exclusions
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
+ name, null, c);
}
break;
default:
c != 0x0387 && (c < 0x02bb || c > 0x02c1) &&
c != 0x0559 && c != 0x06e5 && c != 0x06e6 && c != 0x00b7)
{
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR, name, null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
+ name, null, c);
}
}
}
if (index == 0 || index == (len - 1) ||
name.lastIndexOf(':') != index)
{
- throw new DomEx(DomEx.NAMESPACE_ERR, name, null, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ name, null, 0);
}
}
}
continue;
}
}
- throw new DomEx(DomEx.INVALID_CHARACTER_ERR,
- new String(buf, off, len), null, c);
+ throw new DomDOMException(DOMException.INVALID_CHARACTER_ERR,
+ new String(buf, off, len), null, c);
}
}
if (namespaceURI != null
&& !XMLConstants.XML_NS_URI.equals(namespaceURI))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "xml namespace is always " +
- XMLConstants.XML_NS_URI, this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xml namespace is always " +
+ XMLConstants.XML_NS_URI, this, 0);
}
namespaceURI = XMLConstants.XML_NS_URI;
}
else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
name.startsWith("xmlns:"))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "xmlns is reserved", this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xmlns is reserved", this, 0);
}
else if (namespaceURI == null && name.indexOf(':') != -1)
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "prefixed name '" + name + "' needs a URI", this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "prefixed name '" + name +
+ "' needs a URI", this, 0);
}
Element element = new DomElement(this, namespaceURI, name);
*/
public DocumentFragment createDocumentFragment()
{
- return new DomFragment(this);
+ return new DomDocumentFragment(this);
}
/**
{
checkChar(value, "1.1".equals(version));
}
- return new DomCDATA(this, value);
+ return new DomCDATASection(this, value);
}
/**
{
checkChar(buf, off, len, "1.1".equals(version));
}
- return new DomCDATA(this, buf, off, len);
+ return new DomCDATASection(this, buf, off, len);
}
/**
checkName(target, xml11);
if ("xml".equalsIgnoreCase(target))
{
- throw new DomEx(DomEx.SYNTAX_ERR,
- "illegal PI target name", this, 0);
+ throw new DomDOMException(DOMException.SYNTAX_ERR,
+ "illegal PI target name",
+ this, 0);
}
checkChar(data, xml11);
}
- return new DomPI(this, target, data);
+ return new DomProcessingInstruction(this, target, data);
}
/**
}
else if (!XMLConstants.XML_NS_URI.equals(namespaceURI))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "xml namespace is always " +
- XMLConstants.XML_NS_URI, this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xml namespace is always " +
+ XMLConstants.XML_NS_URI,
+ this, 0);
}
}
else if (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
}
else if (!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "xmlns namespace must be " +
- XMLConstants.XMLNS_ATTRIBUTE_NS_URI, this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xmlns namespace must be " +
+ XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
+ this, 0);
}
}
else if (namespaceURI == null && name.indexOf(':') != -1)
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
"prefixed name needs a URI: " + name, this, 0);
}
return new DomAttr(this, namespaceURI, name);
dst = createEntityReference(src.getNodeName());
break;
case DOCUMENT_FRAGMENT_NODE:
- dst = new DomFragment(this);
+ dst = new DomDocumentFragment(this);
if (deep)
{
for (Node ctx = src.getFirstChild(); ctx != null;
// FALLTHROUGH
// can't import unrecognized or nonstandard nodes
default:
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR, null, src, 0);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, null, src, 0);
}
// FIXME cleanup a bit -- for deep copies, copy those
}
else
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
}
}
{
case DOCUMENT_NODE:
case DOCUMENT_TYPE_NODE:
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
case ENTITY_NODE:
case NOTATION_NODE:
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
if (source instanceof DomNode)
{
DomNsNode src = (DomNsNode) n;
if (src == null)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR);
}
if (src.owner != this)
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR, null, src, 0);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
+ null, src, 0);
}
boolean xml11 = "1.1".equals(version);
checkName(qualifiedName, xml11);
if (XMLConstants.XML_NS_PREFIX.equals(prefix) &&
!XMLConstants.XML_NS_URI.equals(namespaceURI))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
"xml namespace must be " +
XMLConstants.XML_NS_URI, src, 0);
}
XMLConstants.XMLNS_ATTRIBUTE.equals(qualifiedName)) &&
!XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceURI))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
"xmlns namespace must be " +
XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
}
if (XMLConstants.XML_NS_URI.equals(namespaceURI) &&
!XMLConstants.XML_NS_PREFIX.equals(prefix))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
"xml namespace must be " +
XMLConstants.XML_NS_URI, src, 0);
}
!(XMLConstants.XMLNS_ATTRIBUTE.equals(prefix) ||
XMLConstants.XMLNS_ATTRIBUTE.equals(qualifiedName)))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
"xmlns namespace must be " +
XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
}
// DOMElementNameChanged or DOMAttributeNameChanged
return src;
}
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR, null, n, 0);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, null, n, 0);
}
// -- XPathEvaluator --
}
catch (ClassCastException e)
{
- throw new DomEx(DomEx.TYPE_MISMATCH_ERR,
- value.getClass().getName(), null, 0);
+ throw new DomDOMException(DOMException.TYPE_MISMATCH_ERR,
+ value.getClass().getName(), null, 0);
}
}
else if ("namespace-declarations".equals(name))
}
else
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR, name, null, 0);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR,
+ name, null, 0);
}
}
namespaceDeclarations == true &&
comments == true) ? Boolean.TRUE : Boolean.FALSE;
}
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR, name, null, 0);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, name, null, 0);
}
public boolean canSetParameter(String name, Object value)
-/* DomFragment.java --
+/* DomDocumentFragment.java --
Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
* @author David Brownell
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
*/
-public class DomFragment
+public class DomDocumentFragment
extends DomNode
implements DocumentFragment
{
* its createDocumentFragment functionality, or through a subclass which
* is similarly used in a "Sub-DOM" style layer.
*/
- protected DomFragment(DomDocument owner)
+ protected DomDocumentFragment(DomDocument owner)
{
super(DOCUMENT_FRAGMENT_NODE, owner);
}
import javax.xml.XMLConstants;
import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
if (("xmlns".equals (aname) || aname.startsWith ("xmlns:"))
&& !XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals (uri))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
"setting xmlns attribute to illegal value", this, 0);
}
{
attributes.removeNamedItem(name);
}
- catch (DomEx e)
+ catch (DomDOMException e)
{
- if (e.code != DomEx.NOT_FOUND_ERR)
+ if (e.code != DOMException.NOT_FOUND_ERR)
{
throw e;
}
{
if (attributes == null)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR, null, node, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR, null, node, 0);
}
return (Attr) attributes.removeNamedItem(node.getNodeName());
}
{
if (attributes == null)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR, localPart, null, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR, localPart, null, 0);
}
attributes.removeNamedItemNS (namespace, localPart);
}
{
if (readonly)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
if (attr == null || attr.getOwnerElement() != this)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR);
}
if (isId)
{
root = doc.createElementNS(namespaceURI, rootName);
if (rootName.startsWith("xmlns:"))
{
- throw new DomEx(DomEx.NAMESPACE_ERR, "xmlns is reserved", null, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xmlns is reserved", null, 0);
}
}
// Bleech -- L2 seemingly _requires_ omission of xmlns attributes.
import java.util.Vector;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
{
if (!root.isSupported("MutationEvents", "2.0"))
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR,
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR,
"Iterator needs mutation events", root, 0);
}
{
if (done)
{
- throw new DomEx(DomEx.INVALID_STATE_ERR);
+ throw new DomDOMException(DOMException.INVALID_STATE_ERR);
}
right = true;
return walk(true);
{
if (done)
{
- throw new DomEx(DomEx.INVALID_STATE_ERR);
+ throw new DomDOMException(DOMException.INVALID_STATE_ERR);
}
Node previous = reference;
right = false;
package gnu.xml.dom;
+import org.w3c.dom.DOMException;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
{
if (readonly)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
DomNode node = (DomNode) arg;
if (node.owner != owner.owner)
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR);
}
if (node.nodeType != type)
{
- throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR);
}
if (node.nodeType == Node.ATTRIBUTE_NODE)
{
DomNode element = node.parent;
if (element != null && element != owner)
{
- throw new DomEx(DomEx.INUSE_ATTRIBUTE_ERR);
+ throw new DomDOMException(DOMException.INUSE_ATTRIBUTE_ERR);
}
node.parent = owner;
node.depth = owner.depth + 1;
{
if (readonly)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
// report attribute REMOVAL event?
return ctx;
}
}
- throw new DomEx(DomEx.NOT_FOUND_ERR);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR);
}
String getDefaultValue(String name)
{
if (readonly && !owner.building)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR,
- null, this, 0);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR,
+ null, this, 0);
}
for (DomNode ctx = this; ctx != null; ctx = ctx.parent)
{
if (child == ctx)
{
- throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR,
- "can't make ancestor into a child", this, 0);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
+ "can't make ancestor into a child",
+ this, 0);
}
}
// new in DOM L2, this case -- patch it up later, in reparent()
if (!(childNodeType == DOCUMENT_TYPE_NODE && childOwner == null))
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
- null, child, 0);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
+ null, child, 0);
}
}
}
if (owner.checkingWellformedness)
{
- throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR,
- "can't append " + nodeTypeToString(childNodeType) +
- " to node of type " + nodeTypeToString(nodeType),
- this, 0);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
+ "can't append " +
+ nodeTypeToString(childNodeType) +
+ " to node of type " +
+ nodeTypeToString(nodeType),
+ this, 0);
}
}
}
catch (ClassCastException e)
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
- null, newChild, 0);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
+ null, newChild, 0);
}
}
checkMisc(child);
if (ref == null || ref.parent != this)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR,
+ null, ref, 0);
}
if (ref == child)
{
- throw new DomEx(DomEx.HIERARCHY_REQUEST_ERR,
- "can't insert node before itself", ref, 0);
+ throw new DomDOMException(DOMException.HIERARCHY_REQUEST_ERR,
+ "can't insert node before itself",
+ ref, 0);
}
if (child.parent != null)
}
catch (ClassCastException e)
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
- null, newChild, 0);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
+ null, newChild, 0);
}
}
}
if (ref == null || ref.parent != this)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR,
+ null, ref, 0);
}
if (reportMutations)
checkMisc(child);
if (ref == null || ref.parent != this)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR,
+ null, ref, 0);
}
if (reportMutations)
}
catch (ClassCastException e)
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
- null, newChild, 0);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
+ null, newChild, 0);
}
}
if (ref == null || ref.parent != this)
{
- throw new DomEx(DomEx.NOT_FOUND_ERR, null, ref, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR,
+ null, ref, 0);
}
if (readonly && !owner.building)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR,
- null, this, 0);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR,
+ null, this, 0);
}
for (DomNode child = first; child != null; child = child.next)
return ref;
}
}
- throw new DomEx(DomEx.NOT_FOUND_ERR,
- "that's no child of mine", refChild, 0);
+ throw new DomDOMException(DOMException.NOT_FOUND_ERR,
+ "that's no child of mine", refChild, 0);
}
catch (ClassCastException e)
{
- throw new DomEx(DomEx.WRONG_DOCUMENT_ERR,
- null, refChild, 0);
+ throw new DomDOMException(DOMException.WRONG_DOCUMENT_ERR,
+ null, refChild, 0);
}
}
// mouse events
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR,
- eventType, null, 0);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR,
+ eventType, null, 0);
}
/**
package gnu.xml.dom;
import javax.xml.XMLConstants;
+import org.w3c.dom.DOMException;
/**
* <p> Abstract implemention of namespace support. This facilitates
{
if (readonly)
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
if (prefix == null)
}
else if (namespace == null)
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "can't set prefix, node has no namespace URI",
- this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "can't set prefix, node has no namespace URI",
+ this, 0);
}
DomDocument.checkName(prefix, "1.1".equals(owner.getXmlVersion()));
if (prefix.indexOf (':') != -1)
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "illegal prefix " + prefix, this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "illegal prefix " + prefix, this, 0);
}
if (XMLConstants.XML_NS_PREFIX.equals(prefix)
&& !XMLConstants.XML_NS_URI.equals(namespace))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "xml namespace is always " +
- XMLConstants.XML_NS_URI, this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xml namespace is always " +
+ XMLConstants.XML_NS_URI, this, 0);
}
if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix))
{
if (namespace != null || getNodeType() != ATTRIBUTE_NODE)
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "xmlns attribute prefix is reserved", this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "xmlns attribute prefix is reserved",
+ this, 0);
}
}
else if (getNodeType () == ATTRIBUTE_NODE
&& (XMLConstants.XMLNS_ATTRIBUTE.equals(name) ||
name.startsWith("xmlns:")))
{
- throw new DomEx(DomEx.NAMESPACE_ERR,
- "namespace declarations can't change names", this, 0);
+ throw new DomDOMException(DOMException.NAMESPACE_ERR,
+ "namespace declarations can't change names",
+ this, 0);
}
this.prefix = prefix.intern();
-/* DomPI.java --
+/* DomProcessingInstruction.java --
Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
package gnu.xml.dom;
+import org.w3c.dom.DOMException;
import org.w3c.dom.ProcessingInstruction;
/**
* @author David Brownell
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
*/
-public class DomPI
+public class DomProcessingInstruction
extends DomNode
implements ProcessingInstruction
{
* part of its createProcessingInstruction functionality, or through
* a subclass which is similarly used in a "Sub-DOM" style layer.
*/
- protected DomPI(DomDocument owner, String target, String data)
+ protected DomProcessingInstruction(DomDocument owner,
+ String target, String data)
{
super(PROCESSING_INSTRUCTION_NODE, owner);
this.target = target;
{
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
this.data = data;
}
{
if (isReadonly())
{
- throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+ throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
try
{
}
catch (IndexOutOfBoundsException x)
{
- throw new DomEx(DomEx.INDEX_SIZE_ERR);
+ throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
-/* DomLSEx.java --
+/* DomLSException.java --
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
package gnu.xml.dom.ls;
-import java.io.PrintStream;
-import java.io.PrintWriter;
import org.w3c.dom.ls.LSException;
/**
*
* @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
*/
-public class DomLSEx
+public class DomLSException
extends LSException
{
- private final Exception cause2;
-
- public DomLSEx(short type, Exception cause)
+ public DomLSException(short type, Exception cause)
{
- super(type, cause.getMessage());
- cause2 = cause;
+ super(type, (cause == null) ? null : cause.getMessage());
+ initCause(cause);
}
- public void printStackTrace(PrintStream out)
- {
- super.printStackTrace(out);
- out.print("caused by ");
- cause2.printStackTrace(out);
- }
-
- public void printStackTrace(PrintWriter out)
- {
- super.printStackTrace(out);
- out.print("caused by ");
- cause2.printStackTrace(out);
- }
-
}
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import gnu.xml.dom.DomDocument;
-import gnu.xml.dom.DomEx;
+import gnu.xml.dom.DomDOMException;
/**
* Parser implementation for GNU DOM.
async = false;
break;
default:
- throw new DomEx(DOMException.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
}
// TODO schemaType
this.schemaType = schemaType;
{
reader = null;
eventSink = null;
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
catch (IOException e)
{
reader = null;
eventSink = null;
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
// return document
Document ret = eventSink.doc;
}
catch (ParserConfigurationException e)
{
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
catch (SAXException e)
{
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
}
return reader;
}
catch (SAXException e)
{
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
catch (IOException e)
{
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
}
if (source == null)
}
catch (IOException e)
{
- throw new DomLSEx(LSException.PARSE_ERR, e);
+ throw new DomLSException(LSException.PARSE_ERR, e);
}
}
return source;
}
else
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
}
// invalidate reader, a new one will be created
reader = null;
}
else
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
}
}
import org.w3c.dom.ls.LSSerializer;
import org.w3c.dom.ls.LSSerializerFilter;
import org.w3c.dom.traversal.NodeFilter;
-import gnu.xml.dom.DomEx;
+import gnu.xml.dom.DomDOMException;
import gnu.xml.transform.StreamSerializer;
/**
}
catch (IOException e)
{
- throw new DomLSEx(LSException.SERIALIZE_ERR, e);
+ throw new DomLSException(LSException.SERIALIZE_ERR, e);
}
}
}
else
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
}
}
}
else
{
- throw new DomEx(DomEx.NOT_SUPPORTED_ERR);
+ throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR);
}
}
// preserve original namespace prefixes
try
{
- producer.setFeature(handler.FEATURE_URI + "namespace-prefixes",
+ producer.setFeature(EventFilter.FEATURE_URI +
+ "namespace-prefixes",
true);
}
catch (Exception e)
// arrange the output
handler.setResult (out);
- handler.bind (producer, handler);
+ EventFilter.bind (producer, handler);
// then parse ... single element pipeline
producer.parse (input);
// Same as [position() = x]
return ((Double) ret).intValue() == pos;
}
- return expr._boolean(node, expr.evaluate(node, pos, len));
+ return Expr._boolean(node, expr.evaluate(node, pos, len));
}
public Test clone(Object context)
projects / platform / upstream / gcc.git / commitdiff