rahuls 2002/08/14 03:13:38
Modified: java/src/org/apache/xerces/impl/xs/traversers Tag:
jaxp-ri-1_2_0-fcs-branch XSDHandler.java
java/src/org/apache/xerces/util Tag:
jaxp-ri-1_2_0-fcs-branch DOMUtil.java
Log:
Integrating the DTM for schema loading with XSDHandler.
Revision Changes Path
No revision
No revision
1.31.2.1 +7 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Index: XSDHandler.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- XSDHandler.java 3 Mar 2002 13:33:57 -0000 1.31
+++ XSDHandler.java 14 Aug 2002 10:13:37 -0000 1.31.2.1
@@ -86,6 +86,8 @@
import org.apache.xerces.util.DOMUtil;
import org.apache.xerces.xni.XMLLocator;
+import org.apache.xerces.impl.xs.opti.SchemaParsingConfig;
+
import org.apache.xerces.impl.xs.dom.DOMParser;
import org.apache.xerces.impl.xs.dom.ElementNSImpl;
import org.apache.xerces.impl.xs.util.SimpleLocator;
@@ -315,7 +317,8 @@
XSDUniqueOrKeyTraverser fUniqueOrKeyTraverser;
XSDWildcardTraverser fWildCardTraverser;
- DOMParser fSchemaParser;
+ //DOMParser fSchemaParser;
+ SchemaParsingConfig fSchemaParser;
// these data members are needed for the deferred traversal
// of local elements.
@@ -357,7 +360,8 @@
// REVISIT: don't use SchemaConfiguration internally
// we will get stack overflaw because
// XMLSchemaValidator will be instantiating XSDHandler...
- fSchemaParser = new DOMParser();
+ //fSchemaParser = new DOMParser();
+ fSchemaParser = new SchemaParsingConfig();
fSchemaGrammarDescription = new SchemaGrammarDescription();
createTraversers();
No revision
No revision
1.6.2.1 +27 -6 xml-xerces/java/src/org/apache/xerces/util/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/DOMUtil.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- DOMUtil.java 29 Jan 2002 01:15:18 -0000 1.6
+++ DOMUtil.java 14 Aug 2002 10:13:37 -0000 1.6.2.1
@@ -57,9 +57,12 @@
package org.apache.xerces.util;
-import org.apache.xerces.dom.AttrImpl;
-import org.apache.xerces.dom.DocumentImpl;
-import org.apache.xerces.dom.NodeImpl;
+//import org.apache.xerces.dom.AttrImpl;
+//import org.apache.xerces.dom.DocumentImpl;
+//import org.apache.xerces.dom.NodeImpl;
+
+import org.apache.xerces.impl.xs.opti.NodeImpl;
+import org.apache.xerces.impl.xs.opti.SchemaDOM;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -99,6 +102,7 @@
* <p>
* <em>Note:</em> This is an iterative implementation.
*/
+/*
public static void copyInto(Node src, Node dest) throws DOMException {
// get node factory
@@ -182,6 +186,7 @@
}
} // copyInto(Node,Node)
+*/
/** Finds and returns the first child element node. */
public static Element getFirstChildElement(Node parent) {
@@ -290,17 +295,33 @@
// set this Node as being hidden
public static void setHidden(Node node) {
- ((NodeImpl)node).setReadOnly(true, false);
+ if (node instanceof NodeImpl) {
+ ((NodeImpl)node).setReadOnly(true, false);
+ }
+ else if (node instanceof SchemaDOM) {
+ ((SchemaDOM)node).setReadOnly(true, false);
+ }
} // setHidden(node):void
// set this Node as being visible
public static void setVisible(Node node) {
- ((NodeImpl)node).setReadOnly(false, false);
+ if (node instanceof NodeImpl) {
+ ((NodeImpl)node).setReadOnly(false, false);
+ }
+ else if (node instanceof SchemaDOM) {
+ ((SchemaDOM)node).setReadOnly(false, false);
+ }
} // setVisible(node):void
// is this node hidden?
public static boolean isHidden(Node node) {
- return ((NodeImpl)node).getReadOnly();
+ if (node instanceof NodeImpl) {
+ return ((NodeImpl)node).getReadOnly();
+ }
+ else if (node instanceof SchemaDOM) {
+ return ((SchemaDOM)node).getReadOnly();
+ }
+ return false;
} // isHidden(Node):boolean
/** Finds and returns the first child node with the given name. */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
