[Classpathx-xml] Move DomNodeIterator.java

[Mark Wielaard]

Hi,

While importing the code into GNU Classpath I first made the gnu dom
implementation work. That required using the GnomeDomNodeIterator. I
asked Chris and he said it would be a good idea if the DomNodeIterator
moved to the gnu.xml.dom package and would be used by libxmlj. This
patch does that.

One new file attached. source/gnu/xml/dom/DomNodeIterator.java
The file source/gnu/xml/libxmlj/dom/GnomeNodeIterator.java should be
removed.

Cheers,

Mark

Index: source/gnu/xml/dom/DomDocument.java
===================================================================
RCS file: /cvsroot/classpathx/jaxp/source/gnu/xml/dom/DomDocument.java,v
retrieving revision 1.39
diff -u -r1.39 DomDocument.java
--- source/gnu/xml/dom/DomDocument.java 8 Dec 2004 20:09:31 -0000       1.39
+++ source/gnu/xml/dom/DomDocument.java 16 Dec 2004 20:31:46 -0000
@@ -69,8 +69,6 @@
 import org.w3c.dom.xpath.XPathExpression;
 import org.w3c.dom.xpath.XPathNSResolver;
 
-import gnu.xml.libxmlj.dom.GnomeNodeIterator;
-
 /**
  * <p> "Document" and "DocumentTraversal" implementation.
  *
@@ -1017,8 +1015,8 @@
                                          NodeFilter filter,
                                          boolean expandEntities)
   {
-    return new GnomeNodeIterator(root, whatToShow, filter, expandEntities,
-                                 false);
+    return new DomNodeIterator(root, whatToShow, filter, expandEntities,
+                               false);
   }
 
   public TreeWalker createTreeWalker(Node root,
@@ -1026,8 +1024,8 @@
                                      NodeFilter filter,
                                      boolean expandEntities)
   {
-    return new GnomeNodeIterator(root, whatToShow, filter, expandEntities,
-                                 true);
+    return new DomNodeIterator(root, whatToShow, filter, expandEntities,
+                               true);
   }
 
   // DOM Level 3 methods
Index: source/gnu/xml/libxmlj/dom/GnomeDocument.java
===================================================================
RCS file: 
/cvsroot/classpathx/jaxp/source/gnu/xml/libxmlj/dom/GnomeDocument.java,v
retrieving revision 1.19
diff -u -r1.19 GnomeDocument.java
--- source/gnu/xml/libxmlj/dom/GnomeDocument.java       18 Nov 2004 17:14:58 
-0000      1.19
+++ source/gnu/xml/libxmlj/dom/GnomeDocument.java       16 Dec 2004 20:31:46 
-0000
@@ -66,6 +66,8 @@
 import org.w3c.dom.xpath.XPathExpression;
 import org.w3c.dom.xpath.XPathNSResolver;
 
+import gnu.xml.dom.DomNodeIterator;
+
 /**
  * A DOM document node implemented in libxml2.
  *
@@ -529,8 +531,8 @@
                                          boolean entityReferenceExpansion)
     throws DOMException
   {
-    return new GnomeNodeIterator(root, whatToShow, filter,
-                                 entityReferenceExpansion, false);
+    return new DomNodeIterator(root, whatToShow, filter,
+                               entityReferenceExpansion, false);
   }
 
   public TreeWalker createTreeWalker(Node root,
@@ -539,8 +541,8 @@
                                     boolean entityReferenceExpansion)
     throws DOMException
   {
-    return new GnomeNodeIterator(root, whatToShow, filter,
-                                 entityReferenceExpansion, true);
+    return new DomNodeIterator(root, whatToShow, filter,
+                               entityReferenceExpansion, true);
   }
 
   // -- Debugging --
Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpathx/jaxp/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- Makefile.am 2 Dec 2004 13:28:03 -0000       1.48
+++ Makefile.am 16 Dec 2004 20:35:01 -0000
@@ -409,6 +409,7 @@
        source/gnu/xml/dom/DomIterator.java \
        source/gnu/xml/dom/DomNamedNodeMap.java \
        source/gnu/xml/dom/DomNode.java \
+       source/gnu/xml/dom/DomNodeIterator.java \
        source/gnu/xml/dom/DomNotation.java \
        source/gnu/xml/dom/DomNsNode.java \
        source/gnu/xml/dom/DomNSResolverContext.java \
@@ -438,7 +439,6 @@
        source/gnu/xml/libxmlj/dom/GnomeEntityReference.java \
        source/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java \
        source/gnu/xml/libxmlj/dom/GnomeNode.java \
-       source/gnu/xml/libxmlj/dom/GnomeNodeIterator.java \
        source/gnu/xml/libxmlj/dom/GnomeNodeList.java \
        source/gnu/xml/libxmlj/dom/GnomeNotation.java \
        source/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java \

signature.asc
Description: This is a digitally signed message part