dbertoni 2002/11/02 19:33:16
Modified: c/src/XPath XPathEnvSupport.hpp XPathEnvSupportDefault.cpp
XPathEnvSupportDefault.hpp
XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
Log:
Removed bogus error overloads related to stylesheet nodes.
Revision Changes Path
1.19 +0 -31 xml-xalan/c/src/XPath/XPathEnvSupport.hpp
Index: XPathEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupport.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XPathEnvSupport.hpp 19 Oct 2001 18:37:47 -0000 1.18
+++ XPathEnvSupport.hpp 3 Nov 2002 03:33:16 -0000 1.19
@@ -210,37 +210,6 @@
/**
* Function that is called when a problem event occurs.
*
- * @param where either eXMLParser,
eXSLTProcessor,
- *
eXPATHParser, eXPATHProcessor, or eDataSource.
- * @param classification either eWarning, or eError
- * @param styleNode style tree node where the problem occurred
- * (may be 0)
- * @param sourceNode source tree node where the problem
occurred
- * (may be 0)
- * @param msg string message explaining the problem.
- * @param uri the URI of the stylesheet, if
available. May be 0;
- * @param lineNo line number where the problem occurred,
- * if it is known, else -1
- * @param charOffset character offset where the problem,
- * occurred if it is known, else -1
- * @return true if the return is an ERROR, in which case
- * exception will be thrown. Otherwise the processor will
- * continue to process.
- */
- virtual bool
- problem(
- eSource where,
- eClassification classification,
- const XalanNode* styleNode,
- const XalanNode* sourceNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int
charOffset) const = 0;
-
- /**
- * Function that is called when a problem event occurs.
- *
* @param where either eXMLParser,
eXSLTProcessor,
* eXPATHParser,
eXPATHProcessor, or eDataSource.
* @param classification either eWarning, or eError
1.33 +0 -29 xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp
Index: XPathEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XPathEnvSupportDefault.cpp 5 Aug 2002 04:56:51 -0000 1.32
+++ XPathEnvSupportDefault.cpp 3 Nov 2002 03:33:16 -0000 1.33
@@ -472,35 +472,6 @@
XPathEnvSupportDefault::problem(
eSource /* where */,
eClassification classification,
- const XalanNode* /* styleNode */,
- const XalanNode* /* sourceNode */,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int
charOffset) const
-{
- cerr << msg;
-
- if (uri != 0)
- {
- cerr << ",in " << uri;
- }
-
- cerr << ", at line number "
- << lineNo
- << " at offset "
- << charOffset
- << endl;
-
- return classification == XPathEnvSupport::eError ? true : false;
-}
-
-
-
-bool
-XPathEnvSupportDefault::problem(
- eSource /* where */,
- eClassification classification,
const PrefixResolver* /* resolver */,
const XalanNode* /* sourceNode */,
const XalanDOMString& msg,
1.24 +0 -11 xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp
Index: XPathEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XPathEnvSupportDefault.hpp 19 Oct 2001 18:37:47 -0000 1.23
+++ XPathEnvSupportDefault.hpp 3 Nov 2002 03:33:16 -0000 1.24
@@ -208,17 +208,6 @@
problem(
eSource where,
eClassification classification,
- const XalanNode* styleNode,
- const XalanNode* sourceNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int
charOffset) const;
-
- virtual bool
- problem(
- eSource where,
- eClassification classification,
const PrefixResolver* resolver,
const XalanNode* sourceNode,
const XalanDOMString& msg,
1.51 +6 -42 xml-xalan/c/src/XPath/XPathExecutionContext.hpp
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- XPathExecutionContext.hpp 31 Oct 2002 07:12:03 -0000 1.50
+++ XPathExecutionContext.hpp 3 Nov 2002 03:33:16 -0000 1.51
@@ -705,73 +705,37 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const =
0;
-
- virtual void
- error(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const Locator* locator = 0) const = 0;
virtual void
error(
const char* msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const = 0;
-
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const Locator* locator = 0) const = 0;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const =
0;
-
- virtual void
- warn(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const Locator* locator = 0) const = 0;
virtual void
warn(
const char* msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const = 0;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const Locator* locator = 0) const = 0;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const =
0;
-
- virtual void
- message(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const Locator* locator = 0) const = 0;
virtual void
message(
const char* msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const = 0;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode,
- const Locator* locator) const = 0;
+ const Locator* locator = 0) const = 0;
protected:
1.53 +0 -106 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- XPathExecutionContextDefault.cpp 21 Sep 2002 01:24:21 -0000 1.52
+++ XPathExecutionContextDefault.cpp 3 Nov 2002 03:33:16 -0000 1.53
@@ -438,30 +438,6 @@
XPathExecutionContextDefault::error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const XalanNode* /* styleNode */) const
-{
- assert(m_xpathEnvSupport != 0);
-
- if (m_xpathEnvSupport->problem(
- XPathEnvSupport::eXPATHProcessor,
- XPathEnvSupport::eError,
- m_prefixResolver,
- sourceNode,
- msg,
- 0,
- -1,
- -1) == true)
- {
- throw XalanXPathException(msg, 0);
- }
-}
-
-
-
-void
-XPathExecutionContextDefault::error(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
const Locator* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -513,17 +489,6 @@
void
XPathExecutionContextDefault::error(
const char* msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- error(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-XPathExecutionContextDefault::error(
- const char* msg,
const XalanNode* sourceNode,
const Locator* locator) const
{
@@ -536,30 +501,6 @@
XPathExecutionContextDefault::warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const XalanNode* /* styleNode */) const
-{
- assert(m_xpathEnvSupport != 0);
-
- if (m_xpathEnvSupport->problem(
- XPathEnvSupport::eXPATHProcessor,
- XPathEnvSupport::eWarning,
- m_prefixResolver,
- sourceNode,
- msg,
- 0,
- -1,
- -1) == true)
- {
- throw XalanXPathException(msg, sourceNode);
- }
-}
-
-
-
-void
-XPathExecutionContextDefault::warn(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
const Locator* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -612,17 +553,6 @@
XPathExecutionContextDefault::warn(
const char* msg,
const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- warn(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-XPathExecutionContextDefault::warn(
- const char* msg,
- const XalanNode* sourceNode,
const Locator* locator) const
{
warn(TranscodeFromLocalCodePage(msg), sourceNode, locator);
@@ -634,31 +564,6 @@
XPathExecutionContextDefault::message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
- const XalanNode* /* styleNode */) const
-{
- assert(m_xpathEnvSupport != 0);
-
- if (m_xpathEnvSupport->problem(
- XPathEnvSupport::eXPATHProcessor,
- XPathEnvSupport::eMessage,
- m_prefixResolver,
- sourceNode,
- msg,
- 0,
- -1,
- -1) == true)
- {
- // $$$ ToDo: Do something with the PrefixResolver here...
- throw XalanXPathException(msg);
- }
-}
-
-
-
-void
-XPathExecutionContextDefault::message(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
const Locator* locator) const
{
assert(m_xpathEnvSupport != 0);
@@ -703,17 +608,6 @@
{
throw XalanXPathException(msg, uri, lineNumber, columnNumber);
}
-}
-
-
-
-void
-XPathExecutionContextDefault::message(
- const char* msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- message(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
}
1.45 +6 -42 xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- XPathExecutionContextDefault.hpp 21 Sep 2002 01:24:21 -0000 1.44
+++ XPathExecutionContextDefault.hpp 3 Nov 2002 03:33:16 -0000 1.45
@@ -311,73 +311,37 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- error(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const Locator* locator) const;
+ const Locator* locator = 0) const;
virtual void
error(
const char* msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const Locator* locator) const;
+ const Locator* locator = 0) const;
virtual void
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- warn(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const Locator* locator) const;
+ const Locator* locator = 0) const;
virtual void
warn(
const char* msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const Locator* locator) const;
+ const Locator* locator = 0) const;
virtual void
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- message(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const Locator* locator) const;
+ const Locator* locator = 0) const;
virtual void
message(
const char* msg,
const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode,
- const Locator* locator) const;
+ const Locator* locator = 0) const;
protected:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
