From dc0af55b3961ce6d125982aebb6f6cee10f2687c Mon Sep 17 00:00:00 2001
From: PeiYong Zhang <peiyongz@apache.org>
Date: Thu, 31 Jul 2003 17:05:48 +0000
Subject: [PATCH] using getGrammar(URI)
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175131 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/dom/deprecated/DOMParser.cpp | 4 +---
src/xercesc/parsers/DOMBuilderImpl.cpp | 4 +---
src/xercesc/parsers/SAX2XMLReaderImpl.cpp | 7 ++++---
src/xercesc/parsers/SAXParser.cpp | 7 ++++---
src/xercesc/parsers/XercesDOMParser.cpp | 4 +---
5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/xercesc/dom/deprecated/DOMParser.cpp b/src/xercesc/dom/deprecated/DOMParser.cpp
index f6643bc30..58b4aaa64 100644
--- a/src/xercesc/dom/deprecated/DOMParser.cpp
+++ b/src/xercesc/dom/deprecated/DOMParser.cpp
@@ -262,9 +262,7 @@ bool DOMParser::isUsingCachedGrammarInParse() const
Grammar* DOMParser::getGrammar(const XMLCh* const nameSpaceKey)
{
- XMLSchemaDescription* gramDesc = fGrammarResolver->getGrammarPool()->createSchemaDescription(nameSpaceKey);
- Janitor<XMLSchemaDescription> janName(gramDesc);
- return fGrammarResolver->getGrammar(gramDesc);
+ return fGrammarResolver->getGrammar(nameSpaceKey);
}
Grammar* DOMParser::getRootGrammar()
diff --git a/src/xercesc/parsers/DOMBuilderImpl.cpp b/src/xercesc/parsers/DOMBuilderImpl.cpp
index 345157ba3..e408b3154 100644
--- a/src/xercesc/parsers/DOMBuilderImpl.cpp
+++ b/src/xercesc/parsers/DOMBuilderImpl.cpp
@@ -635,9 +635,7 @@ void DOMBuilderImpl::resetCachedGrammarPool()
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
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
index c7c55897a..342200739 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
@@ -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 @@ void SAX2XMLReaderImpl::resetCachedGrammarPool()
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);
}
diff --git a/src/xercesc/parsers/SAXParser.cpp b/src/xercesc/parsers/SAXParser.cpp
index 1ece0f130..811bba6e1 100644
--- a/src/xercesc/parsers/SAXParser.cpp
+++ b/src/xercesc/parsers/SAXParser.cpp
@@ -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 @@ bool SAXParser::getStandardUriConformant() const
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()
diff --git a/src/xercesc/parsers/XercesDOMParser.cpp b/src/xercesc/parsers/XercesDOMParser.cpp
index 9790410ae..d1d020eb9 100644
--- a/src/xercesc/parsers/XercesDOMParser.cpp
+++ b/src/xercesc/parsers/XercesDOMParser.cpp
@@ -117,9 +117,7 @@ bool XercesDOMParser::isUsingCachedGrammarInParse() const
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()
--
GitLab