venu 2003/11/17 05:38:11
Modified: java/samples/dom DOM3.java
java/samples/xs QueryXS.java
Log:
DOM3LS CR changes bug #24742 . Submitted by Ramesh Mandava
Revision Changes Path
1.8 +14 -14 xml-xerces/java/samples/dom/DOM3.java
Index: DOM3.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/DOM3.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOM3.java 13 Nov 2003 22:49:55 -0000 1.7
+++ DOM3.java 17 Nov 2003 13:38:11 -0000 1.8
@@ -64,12 +64,12 @@
import org.w3c.dom.Node;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
import org.w3c.dom.Document;
-import org.w3c.dom.ls.DOMParser;
-import org.w3c.dom.ls.DOMParserFilter;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSParserFilter;
import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.DOMSerializer;
+import org.w3c.dom.ls.LSSerializer;
import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.ls.DOMOutput;
+import org.w3c.dom.ls.LSOutput;
import org.apache.xerces.dom.DOMOutputImpl;
/**
@@ -77,7 +77,7 @@
* DOMBuilder, DOMBuilderFilter DOMWriter and other DOM L3 functionality
* to preparse, revalidate and safe document.
*/
-public class DOM3 implements DOMErrorHandler, DOMParserFilter {
+public class DOM3 implements DOMErrorHandler, LSParserFilter {
/** Default namespaces support (true). */
protected static final boolean DEFAULT_NAMESPACES = true;
@@ -88,7 +88,7 @@
/** Default Schema validation support (false). */
protected static final boolean DEFAULT_SCHEMA_VALIDATION = false;
- static DOMParser builder;
+ static LSParser builder;
public static void main( String[] argv) {
if (argv.length == 0) {
@@ -108,7 +108,7 @@
(DOMImplementationLS)registry.getDOMImplementation("LS");
// create DOMBuilder
- builder = impl.createDOMParser(DOMImplementationLS.MODE_SYNCHRONOUS,
null);
+ builder = impl.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS,
null);
DOMConfiguration config = builder.getConfig();
@@ -116,7 +116,7 @@
DOMErrorHandler errorHandler = new DOM3();
// create filter
- DOMParserFilter filter = new DOM3();
+ LSParserFilter filter = new DOM3();
builder.setFilter(filter);
@@ -159,7 +159,7 @@
// create DOMWriter
- DOMSerializer domWriter = impl.createDOMSerializer();
+ LSSerializer domWriter = impl.createLSSerializer();
System.out.println("Serializing document... ");
config = domWriter.getConfig();
@@ -168,7 +168,7 @@
// serialize document to standard output
//domWriter.writeNode(System.out, doc);
- DOMOutput dOut = new DOMOutputImpl();
+ LSOutput dOut = new DOMOutputImpl();
dOut.setByteStream(System.out);
domWriter.write(doc,dOut);
@@ -200,24 +200,24 @@
}
/**
- * @see org.w3c.dom.ls.DOMParserFilter#acceptNode(Node)
+ * @see org.w3c.dom.ls.LSParserFilter#acceptNode(Node)
*/
public short acceptNode(Node enode) {
return NodeFilter.FILTER_ACCEPT;
}
/**
- * @see org.w3c.dom.ls.DOMParserFilter#getWhatToShow()
+ * @see org.w3c.dom.ls.LSParserFilter#getWhatToShow()
*/
public int getWhatToShow() {
return NodeFilter.SHOW_ELEMENT;
}
/**
- * @see org.w3c.dom.ls.DOMParserFilter#startElement(Element)
+ * @see org.w3c.dom.ls.LSParserFilter#startElement(Element)
*/
public short startElement(Element elt) {
- return DOMParserFilter.FILTER_ACCEPT;
+ return LSParserFilter.FILTER_ACCEPT;
}
}
1.2 +2 -2 xml-xerces/java/samples/xs/QueryXS.java
Index: QueryXS.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xs/QueryXS.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QueryXS.java 14 Nov 2003 19:37:01 -0000 1.1
+++ QueryXS.java 17 Nov 2003 13:38:11 -0000 1.2
@@ -67,7 +67,7 @@
import org.apache.xerces.xs.XSModel;
import org.apache.xerces.xs.XSNamedMap;
import org.apache.xerces.xs.XSObject;
-import org.w3c.dom.ls.DOMParser;
+import org.w3c.dom.ls.LSParser;
/**
* This sample program illustrates how to use load XML Schemas and
@@ -85,7 +85,7 @@
/** Default Schema validation support (false). */
protected static final boolean DEFAULT_SCHEMA_VALIDATION = false;
- static DOMParser builder;
+ static LSParser builder;
public static void main(String[] argv) {
if (argv.length == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]