Changeset 9977

Timestamp:

2005-05-26T16:20:45+12:00 (19 years ago)

Author:

kjdon

Message:

added a getNextNode method that doesn't print out stuff to a buffer - why did it do this anyway??

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/xpointer/XPointer.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/xpointer/XPointer.java

@@ -107 +107 @@
       if (!close) {
     to.append(node.getNodeValue());
+    to.append(" ");
       }
     }
@@ -114 +115 @@
     to.append(node.getNodeValue());
     to.append(";");
+    to.append(" ");
       }
     }
@@ -161 +163 @@
   }
 
+    public static Node getNextNode(Node currentNode) {
+    
+    // Try to get the first valid child
+    NodeList children = currentNode.getChildNodes();
+    for (int c = 0; c < children.getLength(); c++) {
+        Node childNode = children.item(c);
+        
+        if (childNode.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE ||
+        childNode.getNodeType() == org.w3c.dom.Node.COMMENT_NODE ||
+        childNode.getNodeType() == org.w3c.dom.Node.TEXT_NODE ||
+        childNode.getNodeType() == org.w3c.dom.Node.ENTITY_NODE) {
+        return childNode;
+        }
+    }   
+    
+    // now try a siblings and parents siblings
+    Node siblingNode = null;
+    do {
+        siblingNode = currentNode.getNextSibling();
+        if (siblingNode != null) {
+        // should we be checking type??
+        return siblingNode;
+        }
+        
+        currentNode = currentNode.getParentNode();
+    } while (currentNode != null);
+    
+    return null;
+    }
+
+    
   public static Node getNextNode(Node currentNode, StringBuffer buffer)
   { Node reply;
@@ -176 +209 @@
       }
     }
-
+    
     // Repeat looking for a sibling & going up until done...
     do {