You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by rp...@locus.apache.org on 2000/01/07 01:02:29 UTC
cvs commit: xml-xerces/java/samples/dom/traversal IteratorView.java NameNodeFilter.java TreeWalkerView.java
rpfeiffe 00/01/06 16:02:28
Modified: java/samples/dom/traversal IteratorView.java
NameNodeFilter.java TreeWalkerView.java
Log:
Slight mods related to Moving to org.w3c.dom
-rip
Revision Changes Path
1.2 +8 -7 xml-xerces/java/samples/dom/traversal/IteratorView.java
Index: IteratorView.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/traversal/IteratorView.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IteratorView.java 1999/11/09 01:14:08 1.1
+++ IteratorView.java 2000/01/07 00:02:28 1.2
@@ -70,7 +70,7 @@
import org.xml.sax.SAXParseException;
import org.apache.xerces.dom.traversal.NodeIteratorImpl;
-import org.apache.xerces.domx.traversal.*;
+import org.w3c.dom.traversal.*;
import org.apache.xerces.dom.DocumentImpl;
import org.apache.xerces.dom.NodeImpl;
import ui.DOMTreeFull;
@@ -87,7 +87,7 @@
JTextArea messageText;
JScrollPane messageScroll;
DOMTreeFull jtree;
- NodeIteratorImpl iterator;
+ NodeIterator iterator;
NameNodeFilter nameNodeFilter;
JButton nextButton;
@@ -116,6 +116,8 @@
};
JCheckBox expandERs;
+ Hashtable treeNodeMap = new Hashtable();
+
/** main */
public static void main (String args[]) {
@@ -137,8 +139,6 @@
}
}
- Hashtable treeNodeMap = new Hashtable();
-
/** Constructor */
public IteratorView (String filename) {
super("IteratorView: "+filename);
@@ -312,7 +312,7 @@
messageText.append( (String)elements.nextElement());
}
- iterator = (NodeIteratorImpl)document.
+ iterator = document.
createNodeIterator(
document,
NodeFilter.SHOW_ALL,
@@ -353,9 +353,10 @@
nameNodeFilter.setName(nameText);
nameNodeFilter.setMatch(matched);
- document.removeNodeIterators();
+ //((DocumentImpl)document).removeNodeIterators();
+ if (iterator !=null) iterator.detach();
boolean expand = expandERs.isSelected();
- iterator = (NodeIteratorImpl)document.createNodeIterator(
+ iterator = document.createNodeIterator(
node,
(short)mask,
nameNodeFilter,
1.2 +1 -1 xml-xerces/java/samples/dom/traversal/NameNodeFilter.java
Index: NameNodeFilter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/traversal/NameNodeFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NameNodeFilter.java 1999/11/09 01:14:11 1.1
+++ NameNodeFilter.java 2000/01/07 00:02:28 1.2
@@ -57,7 +57,7 @@
package dom.traversal;
-import org.apache.xerces.domx.traversal.*;
+import org.w3c.dom.traversal.*;
import org.w3c.dom.Node;
import org.w3c.dom.Element;
1.2 +5 -5 xml-xerces/java/samples/dom/traversal/TreeWalkerView.java
Index: TreeWalkerView.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/traversal/TreeWalkerView.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TreeWalkerView.java 1999/11/09 01:14:12 1.1
+++ TreeWalkerView.java 2000/01/07 00:02:28 1.2
@@ -69,8 +69,8 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.apache.xerces.dom.traversal.TreeWalkerImpl;
-import org.apache.xerces.domx.traversal.*;
+import org.apache.xerces.dom.traversal.*;
+import org.w3c.dom.traversal.*;
import org.apache.xerces.dom.NodeImpl;
import org.apache.xerces.dom.DocumentImpl;
import ui.DOMTreeFull;
@@ -88,7 +88,7 @@
JTextArea messageText;
JScrollPane messageScroll;
DOMTreeFull jtree;
- TreeWalkerImpl treeWalker;
+ TreeWalker treeWalker;
NameNodeFilter nameNodeFilter;
JButton nextButton;
@@ -364,7 +364,7 @@
}
boolean expand = expandERs.isSelected();
- treeWalker = (TreeWalkerImpl)document.
+ treeWalker = document.
createTreeWalker(
document,
NodeFilter.SHOW_ALL,
@@ -419,7 +419,7 @@
// expand Entity References?
boolean expand = expandERs.isSelected();
- treeWalker = (TreeWalkerImpl)document.
+ treeWalker = document.
createTreeWalker(
node,
mask,