dmitryh 2004/08/24 07:03:17
Modified: c/src/xalanc/PlatformSupport URISupport.cpp URISupport.hpp
XSLException.cpp XSLException.hpp
XalanFStreamOutputStream.cpp
XalanFStreamOutputStream.hpp
XalanFileOutputStream.cpp XalanFileOutputStream.hpp
XalanOutputStream.cpp XalanOutputStream.hpp
XalanStdOutputStream.cpp XalanStdOutputStream.hpp
XalanTranscodingServices.cpp
XalanTranscodingServices.hpp
c/src/xalanc/XPath XObject.cpp XObject.hpp
XPathConstructionContextDefault.cpp
XPathParserException.cpp XPathParserException.hpp
XalanQName.cpp XalanQName.hpp XalanQNameByValue.cpp
XalanXPathException.cpp XalanXPathException.hpp
c/src/xalanc/XSLT ElemMessage.cpp ElemMessage.hpp
KeyTable.cpp VariablesStack.cpp VariablesStack.hpp
XSLTProcessorException.cpp
XSLTProcessorException.hpp
c/src/xalanc/XalanTransformer
XalanTransformerOutputStream.cpp
Log:
Cleaning default XalanDOMString parameters for the XSLExceptions class familly
Revision Changes Path
1.8 +25 -2 xml-xalan/c/src/xalanc/PlatformSupport/URISupport.cpp
Index: URISupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/URISupport.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- URISupport.cpp 31 Jul 2004 06:05:04 -0000 1.7
+++ URISupport.cpp 24 Aug 2004 14:03:14 -0000 1.8
@@ -216,11 +216,34 @@
return theCopy;
}
+const XalanDOMChar URISupport::InvalidURIException::m_type[] =
+{
+ XalanUnicode::charLetter_I,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_v,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_U,
+ XalanUnicode::charLetter_R,
+ XalanUnicode::charLetter_I,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
URISupport::InvalidURIException::InvalidURIException(const XalanDOMString&
theMessage) :
- XSLException(theMessage,
-
TranscodeFromLocalCodePage("InvalidURIException"))
+ XSLException(theMessage)
{
}
1.5 +9 -0 xml-xalan/c/src/xalanc/PlatformSupport/URISupport.hpp
Index: URISupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/URISupport.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URISupport.hpp 26 Feb 2004 22:34:18 -0000 1.4
+++ URISupport.hpp 24 Aug 2004 14:03:14 -0000 1.5
@@ -338,6 +338,15 @@
virtual
~InvalidURIException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+ static const XalanDOMChar m_type[];
};
1.6 +8 -19 xml-xalan/c/src/xalanc/PlatformSupport/XSLException.cpp
Index: XSLException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XSLException.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLException.cpp 26 Feb 2004 22:34:18 -0000 1.5
+++ XSLException.cpp 24 Aug 2004 14:03:14 -0000 1.6
@@ -25,50 +25,40 @@
XALAN_CPP_NAMESPACE_BEGIN
-
+static const XalanDOMChar s_dummy = 0;
XSLException::XSLException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int theLineNumber,
- int theColumnNumber,
- const XalanDOMString& theType) :
+ int
theColumnNumber) :
m_message(theMessage),
m_uri(theURI),
m_lineNumber(theLineNumber),
- m_columnNumber(theColumnNumber),
- m_type(theType)
+ m_columnNumber(theColumnNumber)
{
}
-static const XalanDOMChar s_dummy = 0;
-
-
-
XSLException::XSLException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
+ const XalanDOMString& theMessage) :
m_message(theMessage),
m_uri(theLocator.getSystemId() == 0 ? &s_dummy :
theLocator.getSystemId()),
m_lineNumber(theLocator.getLineNumber()),
- m_columnNumber(theLocator.getColumnNumber()),
- m_type(theType)
+ m_columnNumber(theLocator.getColumnNumber())
{
}
XSLException::XSLException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
+ const XalanDOMString& theMessage) :
m_message(theMessage),
m_uri(),
m_lineNumber(XalanLocator::getUnknownValue()),
- m_columnNumber(XalanLocator::getUnknownValue()),
- m_type(theType)
+ m_columnNumber(XalanLocator::getUnknownValue())
{
}
@@ -95,7 +85,7 @@
void
XSLException::defaultFormat(XalanDOMString& theBuffer) const
{
- defaultFormat(m_message, m_uri, m_lineNumber, m_columnNumber, m_type,
theBuffer);
+ defaultFormat(m_message, m_uri, m_lineNumber, m_columnNumber,
getType(), theBuffer);
}
@@ -166,7 +156,6 @@
LongToDOMString(theColumnNumber, theBuffer);
theBuffer += XalanDOMChar(XalanUnicode::charRightParenthesis);
}
-
XALAN_CPP_NAMESPACE_END
1.5 +8 -17 xml-xalan/c/src/xalanc/PlatformSupport/XSLException.hpp
Index: XSLException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XSLException.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLException.hpp 26 Feb 2004 22:34:18 -0000 1.4
+++ XSLException.hpp 24 Aug 2004 14:03:14 -0000 1.5
@@ -55,9 +55,7 @@
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int
theLineNumber,
- int
theColumnNumber,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLException")));
-
+ int
theColumnNumber);
/**
* Constructor
*
@@ -67,9 +65,7 @@
*/
XSLException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLException")));
-
+ const XalanDOMString& theMessage);
/**
* Constructor
*
@@ -77,8 +73,7 @@
* @param theType type of exception, default is "XSLException"
*/
XSLException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLException")));
+ const XalanDOMString& theMessage);
virtual
~XSLException();
@@ -88,11 +83,8 @@
*
* @return type of exception
*/
- const XalanDOMString&
- getType() const
- {
- return m_type;
- }
+ virtual const XalanDOMChar*
+ getType() const = 0;
/**
* Retrieve message for exception
@@ -150,7 +142,7 @@
const XalanDOMString& theURI,
size_type theLineNumber,
size_type theColumnNumber,
- const XalanDOMString& theType,
+ const XalanDOMChar* theType,
XalanDOMString& theBuffer)
{
defaultFormat(
@@ -160,8 +152,8 @@
theURI.size(),
theLineNumber,
theColumnNumber,
- theType.c_str(),
- theType.size(),
+ theType,
+ XalanDOMString::length(theType),
theBuffer);
}
@@ -208,7 +200,6 @@
const size_type m_lineNumber;
const size_type m_columnNumber;
- const XalanDOMString m_type;
};
1.7 +38 -2
xml-xalan/c/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp
Index: XalanFStreamOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanFStreamOutputStream.cpp 19 Apr 2004 14:47:17 -0000 1.6
+++ XalanFStreamOutputStream.cpp 24 Aug 2004 14:03:14 -0000 1.7
@@ -85,12 +85,48 @@
}
+const XalanDOMChar
XalanFStreamOutputStream::XalanFStreamOutputStreamWriteException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_F,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_W,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XalanFStreamOutputStream::XalanFStreamOutputStreamWriteException::XalanFStreamOutputStreamWriteException(int
theErrorCode) :
XalanOutputStreamException(FormatMessageLocal(
XalanMessageLoader::getMessage(XalanMessages::ErrorWritingFile_1Param,XalanDOMString("")),
- theErrorCode),
-
TranscodeFromLocalCodePage("XalanFStreamOutputStreamWriteException"))
+ theErrorCode))
{
}
1.4 +9 -0
xml-xalan/c/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp
Index: XalanFStreamOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanFStreamOutputStream.hpp 26 Feb 2004 22:34:18 -0000 1.3
+++ XalanFStreamOutputStream.hpp 24 Aug 2004 14:03:14 -0000 1.4
@@ -70,6 +70,15 @@
virtual
~XalanFStreamOutputStreamWriteException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+ static const XalanDOMChar m_type[];
};
protected:
1.10 +83 -22
xml-xalan/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
Index: XalanFileOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanFileOutputStream.cpp 19 Apr 2004 14:47:17 -0000 1.9
+++ XalanFileOutputStream.cpp 24 Aug 2004 14:03:14 -0000 1.10
@@ -31,6 +31,85 @@
XALAN_CPP_NAMESPACE_BEGIN
+const XalanDOMChar
XalanFileOutputStream::XalanFileOutputStreamOpenException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_F,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
+const XalanDOMChar
XalanFileOutputStream::XalanFileOutputStreamWriteException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_F,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_W,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
static XalanFileOutputStream::HandleType
@@ -198,36 +277,19 @@
}
-/*
-static XalanDOMString
-FormatMessageLocal(
- const XalanDOMString& theMessage,
-
- int
theErrorCode)
-{
- return XalanMessageLoader::getMessage(
-#if defined(WIN32)
- XalanMessages::WindowsErrorCodeIs_3Params,
-#else
- XalanMessages::CPPRunTimeErrorCode_3Params,
-#endif
- theMessage,
- theFileName,
- LongToDOMString(theErrorCode));
-}
-*/
extern XalanDOMString
FormatMessageLocal(
const XalanDOMString& theMessage,
int theErrorCode);
+
+
XalanFileOutputStream::XalanFileOutputStreamOpenException::XalanFileOutputStreamOpenException(
const XalanDOMString& theFileName,
int theErrorCode) :
XalanOutputStreamException(FormatMessageLocal(
XalanMessageLoader::getMessage(XalanMessages::ErrorOpeningFile_1Param,
theFileName ),
- theErrorCode),
-
TranscodeFromLocalCodePage("XalanFileOutputStreamOpenException"))
+ theErrorCode))
{
}
@@ -244,8 +306,7 @@
int theErrorCode) :
XalanOutputStreamException(FormatMessageLocal(
XalanMessageLoader::getMessage(XalanMessages::ErrorWritingFile_1Param,theFileName),
- theErrorCode),
-
TranscodeFromLocalCodePage("XalanFileOutputStreamWriteException"))
+ theErrorCode))
{
}
1.7 +20 -0
xml-xalan/c/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp
Index: XalanFileOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanFileOutputStream.hpp 31 Jul 2004 06:05:04 -0000 1.6
+++ XalanFileOutputStream.hpp 24 Aug 2004 14:03:14 -0000 1.7
@@ -83,6 +83,16 @@
virtual
~XalanFileOutputStreamOpenException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+ static const XalanDOMChar m_type[];
+
};
class XALAN_PLATFORMSUPPORT_EXPORT XalanFileOutputStreamWriteException
: public XalanOutputStream::XalanOutputStreamException
@@ -102,6 +112,16 @@
virtual
~XalanFileOutputStreamWriteException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+ static const XalanDOMChar m_type[];
+
};
protected:
1.8 +101 -13
xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStream.cpp
Index: XalanOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStream.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanOutputStream.cpp 19 Apr 2004 14:47:17 -0000 1.7
+++ XalanOutputStream.cpp 24 Aug 2004 14:03:14 -0000 1.8
@@ -427,12 +427,45 @@
#endif
}
+const XalanDOMChar XalanOutputStream::XalanOutputStreamException::m_type[]
=
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_F,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XalanOutputStream::XalanOutputStreamException::XalanOutputStreamException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
- XSLException(theMessage, theType)
+ const XalanDOMString& theMessage) :
+ XSLException(theMessage)
{
}
@@ -442,12 +475,38 @@
{
}
-
+const XalanDOMChar XalanOutputStream::UnknownEncodingException::m_type[] =
+{
+ XalanUnicode::charLetter_U,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_k,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_w,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_g,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XalanOutputStream::UnknownEncodingException::UnknownEncodingException() :
XalanOutputStreamException(
-
XalanMessageLoader::getMessage(XalanMessages::AnErrorOccurredWhileTranscoding),
- TranscodeFromLocalCodePage("UnknownEncodingException"))
+
XalanMessageLoader::getMessage(XalanMessages::AnErrorOccurredWhileTranscoding))
{
}
@@ -458,11 +517,42 @@
}
+const XalanDOMChar
XalanOutputStream::UnsupportedEncodingException::m_type[] =
+{
+ XalanUnicode::charLetter_U,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_g,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XalanOutputStream::UnsupportedEncodingException::UnsupportedEncodingException(const
XalanDOMString& theEncoding) :
XalanOutputStreamException(
-
XalanMessageLoader::getMessage(XalanMessages::UnsupportedEncoding_1Param,theEncoding),
-
TranscodeFromLocalCodePage("UnsupportedEncodingException")),
+
XalanMessageLoader::getMessage(XalanMessages::UnsupportedEncoding_1Param,theEncoding)),
m_encoding(theEncoding)
{
}
@@ -477,9 +567,8 @@
XalanOutputStream::TranscoderInternalFailureException::TranscoderInternalFailureException(const
XalanDOMString& theEncoding) :
XalanOutputStreamException(
-
XalanMessageLoader::getMessage(XalanMessages::UnknownErrorOccurredWhileTranscodingToEncoding_1Param,theEncoding),
-
TranscodeFromLocalCodePage("TranscoderInternalFailureException")),
- m_encoding(theEncoding)
+
XalanMessageLoader::getMessage(XalanMessages::UnknownErrorOccurredWhileTranscodingToEncoding_1Param,theEncoding)),
+ m_encoding(theEncoding)
{
}
@@ -493,8 +582,7 @@
XalanOutputStream::TranscodingException::TranscodingException() :
XalanOutputStreamException(
-
XalanMessageLoader::getMessage(XalanMessages::AnErrorOccurredWhileTranscoding),
- TranscodeFromLocalCodePage("TranscodingException"))
+
XalanMessageLoader::getMessage(XalanMessages::AnErrorOccurredWhileTranscoding))
{
}
1.9 +29 -2
xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStream.hpp
Index: XalanOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStream.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanOutputStream.hpp 31 Jul 2004 06:05:04 -0000 1.8
+++ XalanOutputStream.hpp 24 Aug 2004 14:03:14 -0000 1.9
@@ -281,11 +281,20 @@
public:
XalanOutputStreamException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType);
+ const XalanDOMString& theMessage);
virtual
~XalanOutputStreamException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+ static const XalanDOMChar m_type[];
+
};
class XALAN_PLATFORMSUPPORT_EXPORT UnknownEncodingException : public
XalanOutputStreamException
@@ -297,6 +306,16 @@
virtual
~UnknownEncodingException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+ static const XalanDOMChar m_type[];
+
};
class XALAN_PLATFORMSUPPORT_EXPORT UnsupportedEncodingException :
public XalanOutputStreamException
@@ -314,7 +333,15 @@
return m_encoding;
}
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
private:
+
+ static const XalanDOMChar m_type[];
const XalanDOMString m_encoding;
};
1.7 +41 -2
xml-xalan/c/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
Index: XalanStdOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanStdOutputStream.cpp 19 Apr 2004 14:47:17 -0000 1.6
+++ XalanStdOutputStream.cpp 24 Aug 2004 14:03:14 -0000 1.7
@@ -159,12 +159,51 @@
}
+const XalanDOMChar
XalanStdOutputStream::XalanStdOutputStreamWriteException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_u,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_W,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
XalanStdOutputStream::XalanStdOutputStreamWriteException::XalanStdOutputStreamWriteException(
int theErrorCode) :
XalanOutputStreamException(FormatMessageLocal(XalanMessageLoader::getMessage(XalanMessages::ErrorWritingToStdStream),
-
theErrorCode),
-
TranscodeFromLocalCodePage("XercesStdOutputStreamWriteException"))
+
theErrorCode))
{
}
1.5 +11 -0
xml-xalan/c/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp
Index: XalanStdOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanStdOutputStream.hpp 26 Feb 2004 22:34:18 -0000 1.4
+++ XalanStdOutputStream.hpp 24 Aug 2004 14:03:14 -0000 1.5
@@ -90,6 +90,17 @@
virtual
~XalanStdOutputStreamWriteException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+
+ static const XalanDOMChar m_type[];
+
};
protected:
1.7 +36 -2
xml-xalan/c/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp
Index: XalanTranscodingServices.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanTranscodingServices.cpp 26 Feb 2004 22:34:18 -0000 1.6
+++ XalanTranscodingServices.cpp 24 Aug 2004 14:03:14 -0000 1.7
@@ -422,6 +422,41 @@
}
+const XalanDOMChar
XalanTranscodingServices::UnrepresentableCharacterException::m_type[] =
+{
+ XalanUnicode::charLetter_U,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_b,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_C,
+ XalanUnicode::charLetter_h,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
XalanTranscodingServices::UnrepresentableCharacterException::UnrepresentableCharacterException(
UnicodeCharType theCharacter,
@@ -430,8 +465,7 @@
XalanMessageLoader::getMessage(
XalanMessages::UnrepresentableCharacter_2Param,
UnsignedLongToHexDOMString(theCharacter),
- theEncoding),
-
TranscodeFromLocalCodePage("UnrepresentableCharacterException")),
+ theEncoding)),
m_badCharacter(theCharacter),
m_encoding(theEncoding)
{
1.7 +9 -0
xml-xalan/c/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp
Index: XalanTranscodingServices.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanTranscodingServices.hpp 26 Feb 2004 22:34:18 -0000 1.6
+++ XalanTranscodingServices.hpp 24 Aug 2004 14:03:14 -0000 1.7
@@ -255,7 +255,16 @@
return m_encoding;
}
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
private:
+
+ static const XalanDOMChar m_type[];
+
const UnicodeCharType m_badCharacter;
1.8 +63 -6 xml-xalan/c/src/xalanc/XPath/XObject.cpp
Index: XObject.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XObject.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XObject.cpp 26 Feb 2004 22:40:34 -0000 1.7
+++ XObject.cpp 24 Aug 2004 14:03:15 -0000 1.8
@@ -1116,11 +1116,31 @@
}
+const XalanDOMChar XObject::XObjectException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_b,
+ XalanUnicode::charLetter_j,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
XObject::XObjectException::XObjectException(
- const XalanDOMString& message,
- const XalanDOMString& theType) :
- XalanXPathException(message, theType)
+ const XalanDOMString& message) :
+ XalanXPathException(message)
{
}
@@ -1130,14 +1150,51 @@
{
}
-
+const XalanDOMChar XObject::XObjectInvalidConversionException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_O,
+ XalanUnicode::charLetter_b,
+ XalanUnicode::charLetter_j,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_I,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_v,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_C,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_v,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XObject::XObjectInvalidConversionException::XObjectInvalidConversionException(
const XalanDOMString& fromType,
const XalanDOMString& toType) :
XObjectException(
- formatErrorString(fromType, toType),
-
StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("XObjectInvalidConversionException"))),
+ formatErrorString(fromType, toType)),
m_fromType(fromType),
m_toType(toType)
{
1.7 +18 -2 xml-xalan/c/src/xalanc/XPath/XObject.hpp
Index: XObject.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XObject.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XObject.hpp 26 Feb 2004 22:40:34 -0000 1.6
+++ XObject.hpp 24 Aug 2004 14:03:15 -0000 1.7
@@ -482,11 +482,19 @@
explicit
XObjectException(
- const XalanDOMString& message =
XalanDOMString(),
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XObjectException")));
+ const XalanDOMString& message);
virtual
~XObjectException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+ private:
+
+ static const XalanDOMChar m_type[];
};
class XObjectInvalidConversionException : public XObjectException
@@ -512,7 +520,15 @@
return m_toType;
}
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
private:
+
+ static const XalanDOMChar m_type[];
static const XalanDOMString
formatErrorString(
1.6 +3 -3
xml-xalan/c/src/xalanc/XPath/XPathConstructionContextDefault.cpp
Index: XPathConstructionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XPath/XPathConstructionContextDefault.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathConstructionContextDefault.cpp 6 Apr 2004 00:15:27 -0000
1.5
+++ XPathConstructionContextDefault.cpp 24 Aug 2004 14:03:15 -0000
1.6
@@ -18,7 +18,7 @@
-#include "xalanc/PlatformSupport/XSLException.hpp"
+#include "xalanc/XPath/XPathParserException.hpp"
@@ -92,11 +92,11 @@
{
if (locator != 0)
{
- throw XSLException(*locator, msg);
+ throw XPathParserException(*locator, msg);
}
else
{
- throw XSLException(msg);
+ throw XPathParserException(msg);
}
}
1.6 +31 -9 xml-xalan/c/src/xalanc/XPath/XPathParserException.cpp
Index: XPathParserException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathParserException.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathParserException.cpp 26 Feb 2004 22:40:35 -0000 1.5
+++ XPathParserException.cpp 24 Aug 2004 14:03:15 -0000 1.6
@@ -21,15 +21,39 @@
XALAN_CPP_NAMESPACE_BEGIN
+const XalanDOMChar XPathParserException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_P,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_h,
+ XalanUnicode::charLetter_P,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
XPathParserException::XPathParserException(
const XalanDOMString& message,
const XalanDOMString& theURI,
int
theLineNumber,
- int
theColumnNumber,
- const XalanDOMString& theType) :
- XalanXPathException(message, theURI, theLineNumber, theColumnNumber,
theType)
+ int
theColumnNumber) :
+ XalanXPathException(message, theURI, theLineNumber, theColumnNumber)
{
}
@@ -37,18 +61,16 @@
XPathParserException::XPathParserException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
- XalanXPathException(theLocator, theMessage, theType)
+ const XalanDOMString& theMessage) :
+ XalanXPathException(theLocator, theMessage)
{
}
XPathParserException::XPathParserException(
- const XalanDOMString& message,
- const XalanDOMString& theType) :
- XalanXPathException(message, theType)
+ const XalanDOMString& message) :
+ XalanXPathException(message)
{
}
1.5 +13 -7 xml-xalan/c/src/xalanc/XPath/XPathParserException.hpp
Index: XPathParserException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathParserException.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPathParserException.hpp 26 Feb 2004 22:40:35 -0000 1.4
+++ XPathParserException.hpp 24 Aug 2004 14:03:15 -0000 1.5
@@ -51,8 +51,7 @@
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int
theLineNumber,
- int
theColumnNumber,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
+ int
theColumnNumber);
/**
* Constructor
@@ -63,8 +62,7 @@
*/
XPathParserException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
+ const XalanDOMString& theMessage);
/**
* Constructor
@@ -73,11 +71,19 @@
* @param theType type of exception, default is "XPathParserException"
*/
XPathParserException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XPathParserException")));
+ const XalanDOMString& theMessage);
virtual
- ~XPathParserException();
+ ~XPathParserException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+private:
+
+ static const XalanDOMChar m_type[];
};
1.7 +30 -3 xml-xalan/c/src/xalanc/XPath/XalanQName.cpp
Index: XalanQName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanQName.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanQName.cpp 26 Feb 2004 22:40:35 -0000 1.6
+++ XalanQName.cpp 24 Aug 2004 14:03:15 -0000 1.7
@@ -297,6 +297,33 @@
}
+const XalanDOMChar XalanQName::InvalidQNameException::m_type[] =
+{
+ XalanUnicode::charLetter_I,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_v,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_Q,
+ XalanUnicode::charLetter_N,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
XalanQName::InvalidQNameException::InvalidQNameException(
const XalanDOMChar* theQName,
@@ -304,7 +331,7 @@
const XalanDOMString& theURI,
int
theLineNumber,
int
theColumnNumber) :
- XSLException(format(theQName, theQNameLength), theURI, theLineNumber,
theColumnNumber, XalanDOMString("InvalidQNameException"))
+ XSLException(format(theQName, theQNameLength), theURI, theLineNumber,
theColumnNumber)
{
}
@@ -314,7 +341,7 @@
const LocatorType& theLocator,
const XalanDOMChar* theQName,
XalanDOMString::size_type theQNameLength) :
- XSLException(theLocator, format(theQName, theQNameLength),
XalanDOMString("InvalidQNameException"))
+ XSLException(theLocator, format(theQName, theQNameLength))
{
}
@@ -323,7 +350,7 @@
XalanQName::InvalidQNameException::InvalidQNameException(
const XalanDOMChar* theQName,
XalanDOMString::size_type theQNameLength) :
- XSLException(format(theQName, theQNameLength),
XalanDOMString("InvalidQNameException"))
+ XSLException(format(theQName, theQNameLength))
{
}
1.5 +8 -0 xml-xalan/c/src/xalanc/XPath/XalanQName.hpp
Index: XalanQName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanQName.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanQName.hpp 26 Feb 2004 22:40:35 -0000 1.4
+++ XalanQName.hpp 24 Aug 2004 14:03:15 -0000 1.5
@@ -359,7 +359,15 @@
virtual
~InvalidQNameException();
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
private:
+
+ static const XalanDOMChar m_type[];
static const XalanDOMString
format(
1.6 +3 -4 xml-xalan/c/src/xalanc/XPath/XalanQNameByValue.cpp
Index: XalanQNameByValue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanQNameByValue.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanQNameByValue.cpp 26 Feb 2004 22:40:35 -0000 1.5
+++ XalanQNameByValue.cpp 24 Aug 2004 14:03:15 -0000 1.6
@@ -20,9 +20,8 @@
#include <xalanc/PlatformSupport/PrefixResolver.hpp>
#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>
-#include <xalanc/PlatformSupport/XSLException.hpp>
-
+#include <xalanc/XPath/XalanQName.hpp>
#include <xalanc/DOMSupport/DOMServices.hpp>
#include <xalanc/DOMSupport/DOMSupport.hpp>
@@ -246,11 +245,11 @@
{
if (theLocator == 0)
{
- throw XSLException(theMessage);
+ throw XalanQName::InvalidQNameException(theMessage.c_str(),
theMessage.length());
}
else
{
- throw XSLException(*theLocator, theMessage);
+ throw
XalanQName::InvalidQNameException(*theLocator,theMessage.c_str(),
theMessage.length());
}
}
1.6 +30 -11 xml-xalan/c/src/xalanc/XPath/XalanXPathException.cpp
Index: XalanXPathException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanXPathException.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanXPathException.cpp 26 Feb 2004 22:40:35 -0000 1.5
+++ XalanXPathException.cpp 24 Aug 2004 14:03:15 -0000 1.6
@@ -24,24 +24,44 @@
const XalanDOMString XalanXPathException::s_emptyString;
-
+const XalanDOMChar XalanXPathException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_P,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_h,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XalanXPathException::XalanXPathException(
const XalanDOMString& message,
const XalanDOMString& theURI,
int
theLineNumber,
- int
theColumnNumber,
- const XalanDOMString& theType) :
- XSLException(message, theURI, theLineNumber, theColumnNumber, theType)
+ int
theColumnNumber) :
+ XSLException(message, theURI, theLineNumber, theColumnNumber)
{
}
XalanXPathException::XalanXPathException(
- const XalanDOMString& message,
- const XalanDOMString& theType) :
- XSLException(message, theType)
+ const XalanDOMString& message) :
+ XSLException(message)
{
}
@@ -49,16 +69,15 @@
XalanXPathException::XalanXPathException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
- XSLException(theLocator, theMessage, theType)
+ const XalanDOMString& theMessage) :
+ XSLException(theLocator, theMessage)
{
}
XalanXPathException::XalanXPathException() :
- XSLException(s_emptyString, s_emptyString)
+ XSLException(s_emptyString)
{
}
1.6 +10 -7 xml-xalan/c/src/xalanc/XPath/XalanXPathException.hpp
Index: XalanXPathException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XalanXPathException.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanXPathException.hpp 26 Feb 2004 22:40:35 -0000 1.5
+++ XalanXPathException.hpp 24 Aug 2004 14:03:15 -0000 1.6
@@ -59,8 +59,7 @@
const XalanDOMString& message,
const XalanDOMString& theURI,
int
theLineNumber,
- int
theColumnNumber,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
+ int
theColumnNumber);
/**
* Constructor
@@ -72,8 +71,7 @@
*/
XalanXPathException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
+ const XalanDOMString& theMessage);
/**
* Construct an XPath exeption object.
@@ -81,13 +79,17 @@
* @param message message explaining the problem.
* @param theType type of exception, default is "XalanXPathException"
*/
- XalanXPathException(
- const XalanDOMString& message,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XalanXPathException")));
+ XalanXPathException(const XalanDOMString& message);
virtual
~XalanXPathException();
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
protected:
/**
@@ -98,6 +100,7 @@
XalanXPathException();
private:
+ static const XalanDOMChar m_type[];
const XalanNode* m_styleNode;
1.9 +38 -4 xml-xalan/c/src/xalanc/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemMessage.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemMessage.cpp 31 Jul 2004 05:08:49 -0000 1.8
+++ ElemMessage.cpp 24 Aug 2004 14:03:16 -0000 1.9
@@ -173,11 +173,46 @@
}
#endif
+const XalanDOMChar ElemMessage::ElemMessageTerminateException::m_type[] =
+{
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_M,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_g,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_T,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_m,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
ElemMessage::ElemMessageTerminateException::ElemMessageTerminateException(const
XalanDOMString& theMessage) :
XSLTProcessorException(
- theMessage,
-
TranscodeFromLocalCodePage("ElemMessageTerminateException"))
+ theMessage)
{
}
@@ -188,8 +223,7 @@
const XalanDOMString& theMessage) :
XSLTProcessorException(
theLocator,
- theMessage,
-
TranscodeFromLocalCodePage("ElemMessageTerminateException"))
+ theMessage)
{
}
1.7 +11 -0 xml-xalan/c/src/xalanc/XSLT/ElemMessage.hpp
Index: ElemMessage.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemMessage.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemMessage.hpp 31 Jul 2004 05:08:49 -0000 1.6
+++ ElemMessage.hpp 24 Aug 2004 14:03:16 -0000 1.7
@@ -93,6 +93,17 @@
virtual
~ElemMessageTerminateException();
+
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+
+ static const XalanDOMChar m_type[];
};
private:
1.7 +1 -2 xml-xalan/c/src/xalanc/XSLT/KeyTable.cpp
Index: KeyTable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/KeyTable.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyTable.cpp 26 Feb 2004 22:58:57 -0000 1.6
+++ KeyTable.cpp 24 Aug 2004 14:03:16 -0000 1.7
@@ -108,8 +108,7 @@
XalanMessageLoader::getMessage(XalanMessages::UseOfFunctionIsIllegal_2Param,"key()","xsl:key"),
*kd.getURI(),
kd.getLineNumber(),
- kd.getColumnNumber(),
-
TranscodeFromLocalCodePage("XSLTKeyIllegalKeyFunctionException"));
+ kd.getColumnNumber());
}
else
{
1.11 +35 -2 xml-xalan/c/src/xalanc/XSLT/VariablesStack.cpp
Index: VariablesStack.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/VariablesStack.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VariablesStack.cpp 29 Mar 2004 21:23:23 -0000 1.10
+++ VariablesStack.cpp 24 Aug 2004 14:03:16 -0000 1.11
@@ -734,10 +734,43 @@
}
+const XalanDOMChar VariablesStack::InvalidStackContextException::m_type[]
=
+{
+ XalanUnicode::charLetter_I,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_v,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_l,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_d,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_k,
+ XalanUnicode::charLetter_C,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
+
+
VariablesStack::InvalidStackContextException::InvalidStackContextException()
:
-
XSLTProcessorException(XalanMessageLoader::getMessage(XalanMessages::InvalidStackContext),
-
TranscodeFromLocalCodePage("InvalidStackContextException"))
+
XSLTProcessorException(XalanMessageLoader::getMessage(XalanMessages::InvalidStackContext))
{
}
1.10 +9 -0 xml-xalan/c/src/xalanc/XSLT/VariablesStack.hpp
Index: VariablesStack.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/VariablesStack.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VariablesStack.hpp 31 Jul 2004 06:05:08 -0000 1.9
+++ VariablesStack.hpp 24 Aug 2004 14:03:16 -0000 1.10
@@ -301,7 +301,16 @@
virtual
~InvalidStackContextException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
private:
+
+ static const XalanDOMChar m_type[];
};
1.5 +32 -10 xml-xalan/c/src/xalanc/XSLT/XSLTProcessorException.cpp
Index: XSLTProcessorException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTProcessorException.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTProcessorException.cpp 26 Feb 2004 22:58:58 -0000 1.4
+++ XSLTProcessorException.cpp 24 Aug 2004 14:03:16 -0000 1.5
@@ -24,15 +24,39 @@
XALAN_CPP_NAMESPACE_BEGIN
-
+const XalanDOMChar XSLTProcessorException::m_type[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_L,
+ XalanUnicode::charLetter_T,
+ XalanUnicode::charLetter_P,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_s,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_r,
+ XalanUnicode::charLetter_E,
+ XalanUnicode::charLetter_x,
+ XalanUnicode::charLetter_c,
+ XalanUnicode::charLetter_e,
+ XalanUnicode::charLetter_p,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_i,
+ XalanUnicode::charLetter_o,
+ XalanUnicode::charLetter_n,
+ 0
+};
XSLTProcessorException::XSLTProcessorException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int theLineNumber,
- int theColumnNumber,
- const XalanDOMString& theType) :
- XSLException(theMessage, theURI, theLineNumber, theColumnNumber,
theType)
+ int
theColumnNumber) :
+ XSLException(theMessage, theURI, theLineNumber, theColumnNumber)
{
}
@@ -40,18 +64,16 @@
XSLTProcessorException::XSLTProcessorException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
- XSLException(theLocator, theMessage, theType)
+ const XalanDOMString& theMessage) :
+ XSLException(theLocator, theMessage)
{
}
XSLTProcessorException::XSLTProcessorException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType) :
- XSLException(theMessage, theType)
+ const XalanDOMString& theMessage) :
+ XSLException(theMessage)
{
}
1.5 +13 -9 xml-xalan/c/src/xalanc/XSLT/XSLTProcessorException.hpp
Index: XSLTProcessorException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTProcessorException.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLTProcessorException.hpp 26 Feb 2004 22:58:58 -0000 1.4
+++ XSLTProcessorException.hpp 24 Aug 2004 14:03:16 -0000 1.5
@@ -43,39 +43,43 @@
* @param theURI the URI of the related document, if known
* @param theLineNumber the line number of the related document.
* @param theColumnNumber the column number of the related document.
- * @param theType type of exception string, default is
"XSLTProcessorException"
*/
XSLTProcessorException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int theLineNumber,
- int theColumnNumber,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
+ int
theColumnNumber);
/**
* Constructor
*
* @param theLocator The locator instance for error reporting.
* @param theMessage message to write when exception thrown
- * @param theType type of exception, default is "XSLTProcessorException"
*/
XSLTProcessorException(
const LocatorType& theLocator,
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
+ const XalanDOMString& theMessage);
/**
* Construct an XSLT Processor exception object
*
* @param theMessage message to print when exception thrown
- * @param theType type of exception string, default is
"XSLTProcessorException"
*/
XSLTProcessorException(
- const XalanDOMString& theMessage,
- const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
+ const XalanDOMString& theMessage);
virtual
~XSLTProcessorException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+private:
+
+ static const XalanDOMChar m_type[];
};
1.6 +1 -2
xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformerOutputStream.cpp
Index: XalanTransformerOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformerOutputStream.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanTransformerOutputStream.cpp 26 Feb 2004 23:07:13 -0000 1.5
+++ XalanTransformerOutputStream.cpp 24 Aug 2004 14:03:16 -0000 1.6
@@ -67,8 +67,7 @@
if(theBytesWritten != theBufferLength)
{
throw XalanOutputStreamException(
-
XalanMessageLoader::getMessage(XalanMessages::NumberBytesWrittenDoesNotEqual),
-
TranscodeFromLocalCodePage("UnknownOutputHandlerException"));
+
XalanMessageLoader::getMessage(XalanMessages::NumberBytesWrittenDoesNotEqual));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
