peiyongz 2003/06/25 15:38:40
Modified: c/src/xercesc/validators/common GrammarResolver.cpp
GrammarResolver.hpp
Log:
remove old getGrammar()
Revision Changes Path
1.14 +6 -13 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp
Index: GrammarResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GrammarResolver.cpp 25 Jun 2003 19:32:05 -0000 1.13
+++ GrammarResolver.cpp 25 Jun 2003 22:38:40 -0000 1.14
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.14 2003/06/25 22:38:40 peiyongz
+ * remove old getGrammar()
+ *
* Revision 1.13 2003/06/25 19:32:05 peiyongz
* remove old putGrammar()
*
@@ -188,7 +191,9 @@
}
else {
- Grammar* grammar = getGrammar(uriStr);
+ XMLSchemaDescription* gramDesc =
fGrammarPool->createSchemaDescription(uriStr);
+ Janitor<XMLSchemaDescription> janName(gramDesc);
+ Grammar* grammar = getGrammar(gramDesc);
if (grammar && grammar->getGrammarType() == Grammar::SchemaGrammarType) {
@@ -203,18 +208,6 @@
}
return dv;
-}
-
-//Deprecated
-Grammar* GrammarResolver::getGrammar(const XMLCh* const nameSpaceKey)
-{
- if (!nameSpaceKey)
- return 0;
-
- XMLGrammarDescription* gramDesc = getGrammarDescription(nameSpaceKey);
- Janitor<XMLGrammarDescription> janName(gramDesc);
- return getGrammar(gramDesc);
-
}
Grammar* GrammarResolver::getGrammar( XMLGrammarDescription* const gramDesc)
1.11 +2 -3 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.hpp
Index: GrammarResolver.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GrammarResolver.hpp 25 Jun 2003 19:32:05 -0000 1.10
+++ GrammarResolver.hpp 25 Jun 2003 22:38:40 -0000 1.11
@@ -117,10 +117,9 @@
/**
* Retrieve the grammar that is associated with the specified namespace key
*
- * @param nameSpaceKey Namespace key into Grammar pool
+ * @param gramDesc Namespace key into Grammar pool
* @return Grammar abstraction associated with the NameSpace key.
*/
- Grammar* getGrammar( const XMLCh* const nameSpaceKey ) ;
Grammar* getGrammar( XMLGrammarDescription* const gramDesc ) ;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
