tng 2002/12/06 08:54:58
Modified: c/src/xercesc/util XMLUri.cpp
Log:
Throw MalformedURLException instead of NumberFormatException in XMLUri.
Revision Changes Path
1.9 +28 -28 xml-xerces/c/src/xercesc/util/XMLUri.cpp
Index: XMLUri.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUri.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLUri.cpp 21 Nov 2002 15:42:39 -0000 1.8
+++ XMLUri.cpp 6 Dec 2002 16:54:58 -0000 1.9
@@ -63,7 +63,7 @@
// ---------------------------------------------------------------------------
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/Janitor.hpp>
-#include <xercesc/util/NumberFormatException.hpp>
+#include <xercesc/util/XMLURL.hpp>
#include <xercesc/util/XMLUri.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
@@ -308,7 +308,7 @@
throw;
}
return *this;
-}
+}
XMLUri::~XMLUri()
{
@@ -368,7 +368,7 @@
if ( !baseURI &&
(!trimedUriSpec || trimedUriSpecLen == 0))
{
- ThrowXML1(NumberFormatException
+ ThrowXML1(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Empty
, errMsg_PARAMS);
}
@@ -394,7 +394,7 @@
// A standalone base is a valid URI according to spec
if ( !baseURI && fragmentIdx != 0 )
{
- ThrowXML(NumberFormatException, XMLExcepts::XMLNUM_URI_No_Scheme);
+ ThrowXML(MalformedURLException, XMLExcepts::XMLNUM_URI_No_Scheme);
}
}
else
@@ -406,7 +406,7 @@
// It's an error if we stop here
if (index == trimedUriSpecLen)
{
- ThrowXML1(NumberFormatException
+ ThrowXML1(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Empty
, errMsg_PATH);
}
@@ -724,7 +724,7 @@
if ( !tmpPtr )
{
- ThrowXML(NumberFormatException, XMLExcepts::XMLNUM_URI_No_Scheme);
+ ThrowXML(MalformedURLException, XMLExcepts::XMLNUM_URI_No_Scheme);
}
else
{
@@ -740,7 +740,7 @@
{
if ( !uriSpec )
{
- ThrowXML1(NumberFormatException
+ ThrowXML1(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Empty
, errMsg_PATH);
}
@@ -768,7 +768,7 @@
{
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_EscapeSequence
, errMsg_PATH
, value1);
@@ -779,7 +779,7 @@
{
value1[0] = testChar;
value1[1] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_Char
, errMsg_PATH
, value1);
@@ -817,7 +817,7 @@
{
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
,
XMLExcepts::XMLNUM_URI_Component_Invalid_EscapeSequence
, errMsg_QUERY
, value1);
@@ -828,7 +828,7 @@
{
value1[0] = testChar;
value1[1] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_Char
, errMsg_QUERY
, value1);
@@ -862,7 +862,7 @@
{
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
,
XMLExcepts::XMLNUM_URI_Component_Invalid_EscapeSequence
, errMsg_FRAGMENT
, value1);
@@ -873,7 +873,7 @@
{
value1[0] = testChar;
value1[1] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_Char
, errMsg_FRAGMENT
, value1);
@@ -914,14 +914,14 @@
{
if ( !newScheme )
{
- ThrowXML1(NumberFormatException
+ ThrowXML1(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Set_Null
, errMsg_SCHEME);
}
if (!isConformantSchemeName(newScheme))
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Not_Conformant
, errMsg_SCHEME
, newScheme);
@@ -951,7 +951,7 @@
if ( newUserInfo &&
!getHost() )
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_NullHost
, errMsg_USERINFO
, newUserInfo);
@@ -996,7 +996,7 @@
if (!isWellFormedAddress(newHost))
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Not_Conformant
, errMsg_HOST
, newHost);
@@ -1017,7 +1017,7 @@
if (!getHost())
{
XMLString::binToText(newPort, value1, BUF_LEN, 10);
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_NullHost
, errMsg_PORT
, value1);
@@ -1026,7 +1026,7 @@
else if (newPort != -1)
{
XMLString::binToText(newPort, value1, BUF_LEN, 10);
- ThrowXML1(NumberFormatException
+ ThrowXML1(MalformedURLException
, XMLExcepts::XMLNUM_URI_PortNo_Invalid
, value1);
}
@@ -1070,21 +1070,21 @@
}
else if (!isGenericURI())
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_for_GenURI_Only
, errMsg_FRAGMENT
, newFragment);
}
else if ( !getPath() )
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_NullPath
, errMsg_FRAGMENT
, newFragment);
}
else if (!isURIString(newFragment))
{
- ThrowXML1(NumberFormatException
+ ThrowXML1(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_Char
, errMsg_FRAGMENT);
}
@@ -1113,21 +1113,21 @@
}
else if (!isGenericURI())
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_for_GenURI_Only
, errMsg_QUERY
, newQueryString);
}
else if ( !getPath() )
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_NullPath
, errMsg_QUERY
, newQueryString);
}
else if (!isURIString(newQueryString))
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_Char
, errMsg_QUERY
, newQueryString);
@@ -1205,7 +1205,7 @@
value1[2] = *(tmpStr+2);
value1[3] = chNull;
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_EscapeSequence
, errMsg_USERINFO
, value1);
@@ -1213,7 +1213,7 @@
}
else
{
- ThrowXML2(NumberFormatException
+ ThrowXML2(MalformedURLException
, XMLExcepts::XMLNUM_URI_Component_Invalid_Char
, errMsg_USERINFO
, userInfo);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
