neilg 2003/07/03 08:18:20
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDHandler.java
Log:
as part of the annotation implementation, need to pass SymbolTable to the
SchemaGrammar constructor; also, need to allow for GrammarBucket queries
Revision Changes Path
1.72 +10 -2
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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- XSDHandler.java 23 Jun 2003 16:35:22 -0000 1.71
+++ XSDHandler.java 3 Jul 2003 15:18:20 -0000 1.72
@@ -451,6 +451,14 @@
} // end parseSchema
/**
+ * Pull the grammar out of the bucket simply using
+ * its TNS as a key
+ */
+ SchemaGrammar getGrammar(String tns) {
+ return fGrammarBucket.getGrammar(tns);
+ }
+
+ /**
* First try to find a grammar in the bucket, if failed, consult the
* grammar pool. If a grammar is found in the pool, then add it (and all
* imported ones) into the bucket.
@@ -589,7 +597,7 @@
sg = fGrammarBucket.getGrammar(currSchemaInfo.fTargetNamespace);
}
else {
- sg = new SchemaGrammar(currSchemaInfo.fTargetNamespace,
desc.makeClone());
+ sg = new SchemaGrammar(currSchemaInfo.fTargetNamespace,
desc.makeClone(), fSymbolTable);
fGrammarBucket.putGrammar(sg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
