peiyongz 2003/07/31 10:05:48
Modified: c/src/xercesc/parsers DOMBuilderImpl.cpp
SAX2XMLReaderImpl.cpp SAXParser.cpp
XercesDOMParser.cpp
Log:
using getGrammar(URI)
Revision Changes Path
1.27 +2 -4 xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.cpp
Index: DOMBuilderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/DOMBuilderImpl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DOMBuilderImpl.cpp 25 Jun 2003 22:36:46 -0000 1.26
+++ DOMBuilderImpl.cpp 31 Jul 2003 17:05:48 -0000 1.27
@@ -635,9 +635,7 @@
Grammar* DOMBuilderImpl::getGrammar(const XMLCh* const nameSpaceKey) const
{
- XMLSchemaDescription* gramDesc =
getGrammarResolver()->getGrammarPool()->createSchemaDescription(nameSpaceKey);
- Janitor<XMLSchemaDescription> janName(gramDesc);
- return getGrammarResolver()->getGrammar(gramDesc);
+ return getGrammarResolver()->getGrammar(nameSpaceKey);
}
Grammar* DOMBuilderImpl::getRootGrammar() const
1.25 +4 -3 xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Index: SAX2XMLReaderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SAX2XMLReaderImpl.cpp 10 Jul 2003 19:48:24 -0000 1.24
+++ SAX2XMLReaderImpl.cpp 31 Jul 2003 17:05:48 -0000 1.25
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.25 2003/07/31 17:05:48 peiyongz
+ * using getGrammar(URI)
+ *
* Revision 1.24 2003/07/10 19:48:24 peiyongz
* Stateless Grammar: Initialize scanner with grammarResolver,
*
@@ -1715,9 +1718,7 @@
Grammar* SAX2XMLReaderImpl::getGrammar(const XMLCh* const nameSpaceKey)
{
- XMLSchemaDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createSchemaDescription(nameSpaceKey);
- Janitor<XMLSchemaDescription> janName(gramDesc);
- return fGrammarResolver->getGrammar(gramDesc);
+ return fGrammarResolver->getGrammar(nameSpaceKey);
}
1.23 +4 -3 xml-xerces/c/src/xercesc/parsers/SAXParser.cpp
Index: SAXParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAXParser.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SAXParser.cpp 10 Jul 2003 19:48:24 -0000 1.22
+++ SAXParser.cpp 31 Jul 2003 17:05:48 -0000 1.23
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.23 2003/07/31 17:05:48 peiyongz
+ * using getGrammar(URI)
+ *
* Revision 1.22 2003/07/10 19:48:24 peiyongz
* Stateless Grammar: Initialize scanner with grammarResolver,
*
@@ -521,9 +524,7 @@
Grammar* SAXParser::getGrammar(const XMLCh* const nameSpaceKey)
{
- XMLSchemaDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createSchemaDescription(nameSpaceKey);
- Janitor<XMLSchemaDescription> janName(gramDesc);
- return fGrammarResolver->getGrammar(gramDesc);
+ return fGrammarResolver->getGrammar(nameSpaceKey);
}
Grammar* SAXParser::getRootGrammar()
1.15 +2 -4 xml-xerces/c/src/xercesc/parsers/XercesDOMParser.cpp
Index: XercesDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/XercesDOMParser.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XercesDOMParser.cpp 25 Jun 2003 22:36:46 -0000 1.14
+++ XercesDOMParser.cpp 31 Jul 2003 17:05:48 -0000 1.15
@@ -117,9 +117,7 @@
Grammar* XercesDOMParser::getGrammar(const XMLCh* const nameSpaceKey)
{
- XMLSchemaDescription* gramDesc =
getGrammarResolver()->getGrammarPool()->createSchemaDescription(nameSpaceKey);
- Janitor<XMLSchemaDescription> janName(gramDesc);
- return getGrammarResolver()->getGrammar(gramDesc);
+ return getGrammarResolver()->getGrammar(nameSpaceKey);
}
Grammar* XercesDOMParser::getRootGrammar()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
