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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95114 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 6 deletions

diff --git a/libjava/gnu/xml/dom/DomNamedNodeMap.java b/libjava/gnu/xml/dom/DomNamedNodeMap.java
index af7594249be..2b1106e64c0 100644
--- a/libjava/gnu/xml/dom/DomNamedNodeMap.java
+++ b/libjava/gnu/xml/dom/DomNamedNodeMap.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 package gnu.xml.dom;
 
+import org.w3c.dom.DOMException;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
@@ -166,24 +167,24 @@ public class DomNamedNodeMap
   {
     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;
@@ -302,7 +303,7 @@ public class DomNamedNodeMap
   {
     if (readonly)
       {
-        throw new DomEx(DomEx.NO_MODIFICATION_ALLOWED_ERR);
+        throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
       }
 
     // report attribute REMOVAL event?
@@ -369,7 +370,7 @@ public class DomNamedNodeMap
             return ctx;
           }
       }    
-    throw new DomEx(DomEx.NOT_FOUND_ERR);
+    throw new DomDOMException(DOMException.NOT_FOUND_ERR);
   }
   
   String getDefaultValue(String name)