[multiple changes]

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.

From-SVN: r95114
This commit is contained in:
Mark Wielaard 2005-02-16 19:25:06 +00:00
parent 3bd09563e1
commit 7526f35528
25 changed files with 400 additions and 302 deletions

View file

@ -38,6 +38,7 @@ exception statement from your version. */
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;
@ -82,7 +83,7 @@ public abstract class DomCharacterData
{
if (isReadonly())
{
throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
String value = text + arg;
mutating(value);
@ -98,12 +99,12 @@ public abstract class DomCharacterData
{
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)
{
@ -125,7 +126,7 @@ public abstract class DomCharacterData
}
catch (IndexOutOfBoundsException x)
{
throw new DomEx(DomEx.INDEX_SIZE_ERR);
throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
@ -164,7 +165,7 @@ public abstract class DomCharacterData
{
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 ();
@ -182,7 +183,7 @@ public abstract class DomCharacterData
}
catch (IndexOutOfBoundsException x)
{
throw new DomEx(DomEx.INDEX_SIZE_ERR);
throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
@ -195,14 +196,14 @@ public abstract class DomCharacterData
{
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)
{
@ -228,7 +229,7 @@ public abstract class DomCharacterData
}
catch (IndexOutOfBoundsException x)
{
throw new DomEx(DomEx.INDEX_SIZE_ERR);
throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}
@ -241,7 +242,7 @@ public abstract class DomCharacterData
{
if (isReadonly())
{
throw new DomEx (DomEx.NO_MODIFICATION_ALLOWED_ERR);
throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
}
if (value == null)
{
@ -276,7 +277,7 @@ public abstract class DomCharacterData
{
return text.substring(offset);
}
throw new DomEx(DomEx.INDEX_SIZE_ERR);
throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
}
}