You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2008/04/02 16:39:22 UTC
svn commit: r643922 - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl:
Constants.java xs/XMLSchemaLoader.java xs/XMLSchemaValidator.java
xs/models/CMBuilder.java xs/traversers/XSDHandler.java
Author: knoaman
Date: Wed Apr 2 07:39:20 2008
New Revision: 643922
URL: http://svn.apache.org/viewvc?rev=643922&view=rev
Log:
Use a numeric value to indicate the XML Schema version instead of a boolean flag
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java?rev=643922&r1=643921&r2=643922&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java Wed Apr 2 07:39:20 2008
@@ -460,6 +460,8 @@
// Constant to enable Schema 1.1 support
public final static boolean SCHEMA_1_1_SUPPORT = false;
+ public final static short SCHEMA_VERSION_1_0 = 1;
+ public final static short SCHEMA_VERSION_1_1 = 4;
// private
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java?rev=643922&r1=643921&r2=643922&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java Wed Apr 2 07:39:20 2008
@@ -245,7 +245,7 @@
private DOMEntityResolverWrapper fResourceResolver = null;
/** XML Schema 1.1 flag */
- private boolean fSchema11Support = false;
+ private short fSchemaVersion = Constants.SCHEMA_VERSION_1_0;
// default constructor. Create objects we absolutely need:
public XMLSchemaLoader() {
@@ -484,20 +484,20 @@
*/
void setSchemaVersion(String version) {
if (version.equals(Constants.W3C_XML_SCHEMA11_NS_URI)) {
- fSchema11Support = true;
+ fSchemaVersion = Constants.SCHEMA_VERSION_1_1;
}
else {
- fSchema11Support = false;
+ fSchemaVersion = Constants.SCHEMA_VERSION_1_0;
}
- fSchemaHandler.setSchema11Support(fSchema11Support);
- fCMBuilder.setSchema11Support(fSchema11Support);
+ fSchemaHandler.setSchemaVersion(fSchemaVersion);
+ fCMBuilder.setSchemaVersion(fSchemaVersion);
}
/**
* Return XML Schema 1.1 support flag
*/
- boolean isSchema11Support() {
- return fSchema11Support;
+ short getSchemaVersion() {
+ return fSchemaVersion;
}
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=643922&r1=643921&r2=643922&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java Wed Apr 2 07:39:20 2008
@@ -492,7 +492,7 @@
protected final Hashtable fLocationPairs = new Hashtable();
/** XML Schema 1.1 Support */
- boolean fSchema11Support = false;
+ short fSchemaVersion = Constants.SCHEMA_VERSION_1_0;
// handlers
@@ -562,7 +562,7 @@
}
else if (propertyId.equals(XML_SCHEMA_VERSION)) {
fSchemaLoader.setSchemaVersion((String)value);
- fSchema11Support = fSchemaLoader.isSchema11Support();
+ fSchemaVersion = fSchemaLoader.getSchemaVersion();
}
} // setProperty(String,Object)
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java?rev=643922&r1=643921&r2=643922&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/models/CMBuilder.java Wed Apr 2 07:39:20 2008
@@ -17,6 +17,7 @@
package org.apache.xerces.impl.xs.models;
+import org.apache.xerces.impl.Constants;
import org.apache.xerces.impl.dtd.models.CMNode;
import org.apache.xerces.impl.xs.SchemaSymbols;
import org.apache.xerces.impl.xs.XSComplexTypeDecl;
@@ -50,7 +51,7 @@
//Factory to create Bin, Uni, Leaf nodes
private final CMNodeFactory fNodeFactory;
// XML Schema 1.1 flag
- private boolean fSchema11Support = false;
+ private short fSchemaVersion = Constants.SCHEMA_VERSION_1_0;
public CMBuilder(CMNodeFactory nodeFactory) {
fDeclPool = null;
@@ -64,8 +65,8 @@
/**
* Set XML Schema 11 flag
*/
- public void setSchema11Support(boolean state) {
- fSchema11Support = state;
+ public void setSchemaVersion(short version) {
+ fSchemaVersion = version;
}
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=643922&r1=643921&r2=643922&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java Wed Apr 2 07:39:20 2008
@@ -347,7 +347,7 @@
XSAnnotationGrammarPool fGrammarBucketAdapter;
// flag to indicate schema 1.1 support
- boolean fSchema11Support = false;
+ short fSchemaVersion = Constants.SCHEMA_VERSION_1_0;
// these data members are needed for the deferred traversal
// of local elements.
@@ -1801,8 +1801,7 @@
}
fSchemaParser.parse(schemaSource);
- Document schemaDocument = fSchemaParser.getDocument();
- schemaElement = schemaDocument != null ? DOMUtil.getRoot(schemaDocument) : null;
+ schemaElement = fSchemaParser.getDocument() == null ? null: DOMUtil.getRoot(fSchemaParser.getDocument());
// now we need to store the mapping information from system id
// to the document. also from the document to the system id.
@@ -2702,8 +2701,12 @@
*
* @param state
*/
- public void setSchema11Support(boolean state) {
- fSchema11Support = state;
+ public void setSchemaVersion(short version) {
+ fSchemaVersion = version;
+ }
+
+ public short getSchemaVersion() {
+ return fSchemaVersion;
}
} // XSDHandler
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org