You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2005/06/10 03:57:35 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/jaxp SAXParserFactoryImpl.java DocumentBuilderFactoryImpl.java
mrglavas 2005/06/09 18:57:35
Modified: java/src/org/apache/xerces/jaxp SAXParserFactoryImpl.java
DocumentBuilderFactoryImpl.java
Log:
Merging in schema and XInclude methods from the RI.
Revision Changes Path
1.11 +25 -8 xml-xerces/java/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java
Index: SAXParserFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/SAXParserFactoryImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SAXParserFactoryImpl.java 24 Feb 2004 23:15:58 -0000 1.10
+++ SAXParserFactoryImpl.java 10 Jun 2005 01:57:35 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2002,2004 The Apache Software Foundation.
+ * Copyright 2000-2002,2004,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-
package org.apache.xerces.jaxp;
import java.util.Hashtable;
@@ -22,24 +21,26 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.validation.Schema;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
/**
- * @author Rajiv Mordani
- * @author Edwin Goei
- * @version $Id$
- */
-
-/**
* This is the implementation specific class for the
* <code>javax.xml.parsers.SAXParserFactory</code>. This is the platform
* default implementation for the platform.
+ *
+ * @author Rajiv Mordani
+ * @author Edwin Goei
+ *
+ * @version $Id$
*/
public class SAXParserFactoryImpl extends SAXParserFactory {
private Hashtable features;
+ private Schema grammar;
+ private boolean isXIncludeAware;
/**
* Creates a new instance of <code>SAXParser</code> using the currently
@@ -118,4 +119,20 @@
// feature value
return newSAXParserImpl().getXMLReader().getFeature(name);
}
+
+ public Schema getSchema() {
+ return grammar;
+ }
+
+ public void setSchema(Schema grammar) {
+ this.grammar = grammar;
+ }
+
+ public boolean isXIncludeAware() {
+ return this.isXIncludeAware;
+ }
+
+ public void setXIncludeAware(boolean state) {
+ this.isXIncludeAware = state;
+ }
}
1.16 +20 -1 xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java
Index: DocumentBuilderFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderFactoryImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DocumentBuilderFactoryImpl.java 2 May 2005 21:24:48 -0000 1.15
+++ DocumentBuilderFactoryImpl.java 10 Jun 2005 01:57:35 -0000 1.16
@@ -19,6 +19,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.validation.Schema;
import org.xml.sax.SAXException;
@@ -34,6 +35,8 @@
public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory {
/** These are DocumentBuilderFactory attributes not DOM attributes */
private Hashtable attributes;
+ private Schema grammar;
+ private boolean isXIncludeAware;
/**
* Creates a new instance of a {@link javax.xml.parsers.DocumentBuilder}
@@ -122,6 +125,22 @@
}
}
+ public Schema getSchema() {
+ return grammar;
+ }
+
+ public void setSchema(Schema grammar) {
+ this.grammar = grammar;
+ }
+
+ public boolean isXIncludeAware() {
+ return this.isXIncludeAware;
+ }
+
+ public void setXIncludeAware(boolean state) {
+ this.isXIncludeAware = state;
+ }
+
// TODO: Add in implementation. This is just a stub so that the code complies with JAXP 1.3.
public boolean getFeature(String name)
throws ParserConfigurationException {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org