sandygao 2002/08/14 15:51:09
Modified: java/src/org/apache/xerces/dom DOMNormalizer.java
java/src/org/apache/xerces/impl XMLNamespaceBinder.java
java/src/org/apache/xerces/impl/xs XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xs/traversers
XSDocumentInfo.java
java/src/org/apache/xerces/util NamespaceSupport.java
java/src/org/apache/xml/serialize DOMWriterImpl.java
XMLSerializer.java
Log:
1. Removed the SymbolTable parameter of NamespaceSupport#reset().
2. Call NamespaceSupport#reset() in XSDocumentInfo, after a new
NamespaceSupport object is created.
3. Don't need to declare "xml" prefix in XSDocumentInfo, because they are
already in every NamespaceSupport object.
Revision Changes Path
1.11 +2 -2 xml-xerces/java/src/org/apache/xerces/dom/DOMNormalizer.java
Index: DOMNormalizer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMNormalizer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMNormalizer.java 14 Aug 2002 17:52:52 -0000 1.10
+++ DOMNormalizer.java 14 Aug 2002 22:51:08 -0000 1.11
@@ -199,7 +199,7 @@
}
fNamespaceValidation =
componentManager.getFeature(DOMValidationConfiguration.SCHEMA);
- fNamespaceBinder.reset(fSymbolTable);
+ fNamespaceBinder.reset();
fNamespaceBinder.declarePrefix(XMLSymbols.EMPTY_STRING,
XMLSymbols.EMPTY_STRING);
fNamespaceCounter = 1;
1.20 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLNamespaceBinder.java
Index: XMLNamespaceBinder.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLNamespaceBinder.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLNamespaceBinder.java 14 Aug 2002 17:52:52 -0000 1.19
+++ XMLNamespaceBinder.java 14 Aug 2002 22:51:08 -0000 1.20
@@ -263,7 +263,7 @@
fErrorReporter =
(XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
// initialize vars
- fNamespaceSupport.reset(fSymbolTable);
+ fNamespaceSupport.reset();
// use shared context
NamespaceContext context = fNamespaceContext;
1.81 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Index: XMLSchemaValidator.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- XMLSchemaValidator.java 13 Aug 2002 22:57:10 -0000 1.80
+++ XMLSchemaValidator.java 14 Aug 2002 22:51:08 -0000 1.81
@@ -1249,7 +1249,7 @@
fSchemaLoader.setEntityResolver(fEntityResolver);
// initialize namespace support
- fNamespaceSupport.reset(fSymbolTable);
+ fNamespaceSupport.reset();
fPushForNextBinding = true;
fValidationManager =
(ValidationManager)componentManager.getProperty(VALIDATION_MANAGER);
fValidationManager.addValidationState(fValidationState);
1.14 +2 -11
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java
Index: XSDocumentInfo.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSDocumentInfo.java 14 Aug 2002 17:52:52 -0000 1.13
+++ XSDocumentInfo.java 14 Aug 2002 22:51:08 -0000 1.14
@@ -117,13 +117,10 @@
throws XMLSchemaException {
fSchemaDoc = schemaDoc;
fNamespaceSupport = new SchemaNamespaceSupport();
+ fNamespaceSupport.reset();
fIsChameleonSchema = false;
fSymbolTable = symbolTable;
- // During XML Schema traversal bind "xml" prefix to
- // "http://www.w3.org/XML/1998/namespace";
- // per Namespace Constraint: Prefix Declared (Namespaces in XML REC)
- fNamespaceSupport.declarePrefix(XMLSymbols.PREFIX_XML,
SchemaNamespaceSupport.XML_URI);
if(schemaDoc != null) {
Element root = DOMUtil.getRoot(schemaDoc);
@@ -165,12 +162,6 @@
if (nsSupport == null)
nsSupport = fNamespaceSupportRoot;
fNamespaceSupport = new SchemaNamespaceSupport(nsSupport);
-
- // bind "xml" prefix to "http://www.w3.org/XML/1998/namespace";
- // per Namespace Constraint: Prefix Declared (Namespaces in XML REC)
- // REVISIT: shouldn't this work be done whenever a namespace support
- // object is constructed?
- fNamespaceSupport.declarePrefix(XMLSymbols.PREFIX_XML,
SchemaNamespaceSupport.XML_URI);
fValidationContext.setNamespaceSupport(fNamespaceSupport);
}
1.12 +2 -2 xml-xerces/java/src/org/apache/xerces/util/NamespaceSupport.java
Index: NamespaceSupport.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/util/NamespaceSupport.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NamespaceSupport.java 14 Aug 2002 17:52:52 -0000 1.11
+++ NamespaceSupport.java 14 Aug 2002 22:51:08 -0000 1.12
@@ -147,7 +147,7 @@
* <p>It is necessary to invoke this method before reusing the
* Namespace support object for a new session.</p>
*/
- public void reset(SymbolTable symbolTable) {
+ public void reset() {
// reset namespace and context info
fNamespaceSize = 0;
1.5 +2 -2 xml-xerces/java/src/org/apache/xml/serialize/DOMWriterImpl.java
Index: DOMWriterImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xml/serialize/DOMWriterImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMWriterImpl.java 13 Aug 2002 23:03:13 -0000 1.4
+++ DOMWriterImpl.java 14 Aug 2002 22:51:08 -0000 1.5
@@ -416,7 +416,7 @@
private boolean reset() {
serializer.reset();
- serializer.fNSBinder.reset(serializer.fSymbolTable);
+ serializer.fNSBinder.reset();
// during serialization always have a mapping to empty string
// so we assume there is a declaration.
serializer.fNSBinder.declarePrefix(XMLSymbols.EMPTY_STRING,
XMLSymbols.EMPTY_STRING);
1.42 +2 -2 xml-xerces/java/src/org/apache/xml/serialize/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xml/serialize/XMLSerializer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- XMLSerializer.java 14 Aug 2002 17:52:52 -0000 1.41
+++ XMLSerializer.java 14 Aug 2002 22:51:09 -0000 1.42
@@ -668,7 +668,7 @@
if (fNamespaces) {
// reset local binder
- fLocalNSBinder.reset(fSymbolTable);
+ fLocalNSBinder.reset();
// note: the values that added to namespace binder
// must be already be added to the symbol table
fLocalNSBinder.pushContext();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
