[mapguide-commits] r6306 - in sandbox/adsk/vik/Common:
CoordinateSystem Geometry/CoordinateSystem
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Dec 8 00:54:30 EST 2011
Author: traianstanev
Date: 2011-12-07 21:54:30 -0800 (Wed, 07 Dec 2011)
New Revision: 6306
Modified:
sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
Log:
Some more varied exception throws replaced by MgApplicationException. Still hundreds more to go.
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -205,14 +205,14 @@
Ptr<MgCoordinateSystemEllipsoidDictionary> pElDict = m_pCatalog->GetEllipsoidDictionary();
if (!pElDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
}
pEllipsoid = pElDict->Get(sElName);
assert(pEllipsoid);
if (!pEllipsoid)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidInDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidInDictionaryException", NULL);
}
}
@@ -479,7 +479,7 @@
// and there must be a Great Circle path between the points.
if(GetType() == MgCoordinateSystemType::Arbitrary)
{
- throw new MgInvalidCoordinateSystemTypeException(L"MgCoordinateSystem.MeasureGreatCircleDistance", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMustNotBeArbitrary", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.MeasureGreatCircleDistance", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMustNotBeArbitrary", NULL);
}
Ptr<MgCoordinate> pLonLat1=ConvertToLonLat(x1, y1);
@@ -768,12 +768,12 @@
MG_TRY()
if (!m_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=m_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
sWkt=pConverter->DefinitionToWkt(this, MgCoordinateSystemWktFlavor::Ogc);
MG_CATCH_AND_THROW(L"MgCoordinateSystem.ToString")
@@ -813,7 +813,7 @@
//Can't change read-only items
if (Protected())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
//Make sure the projection's been properly set
@@ -821,7 +821,7 @@
if (MgCoordinateSystemProjectionCode::Unknown == prj)
{
//Projection hasn't been properly set, so we can't set the unit type.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Make sure it's a unit type we know about
@@ -830,7 +830,7 @@
if (!GetUnitInfo(unit, &unitType, &dScale))
{
//Unknown unit type.
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert(dScale > 0.0);
assert(MgCoordinateSystemUnitType::Unknown != unitType);
@@ -841,7 +841,7 @@
if (prjUnitType != unitType)
{
//Wrong unit type for this projection.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Okay, we're all set. Copy in the values...
@@ -971,13 +971,13 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
if (sCode.empty())
{
//null pointer is obviously not legal...
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -992,7 +992,7 @@
{
//illegal string
delete [] pStr;
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Copy into the definition
@@ -1055,13 +1055,13 @@
if (Protected())
{
//Can't change read-only items
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
if (MgCoordinateSystemProjectionCode::Unknown==prjType)
{
//cs_UNKWN_PROJ
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Set the projection string
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -345,7 +345,7 @@
case kFileInvalidCantWrite:
MgStringCollection arguments;
arguments.Add(strPath);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemDictionaryReadOnlyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemDictionaryReadOnlyException", NULL);
break;
}
}
@@ -530,7 +530,7 @@
{
MgStringCollection arguments;
arguments.Add(sName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemCategoryDictionary.Remove", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Remove", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Rewrite the file, skipping the specified category.
@@ -582,7 +582,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make a CCoordinateSystemCategory object out of what we're given
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -963,7 +963,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -1011,7 +1011,7 @@
{
m_bEncrypted = bPrevEncrypted;
m_DtDef = prevDef;
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -1028,7 +1028,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDatum.SerializeTo", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatum.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -166,8 +166,8 @@
nNameSize = sizeof(v8.key_nm);
return;
default:
- throw new MgCoordinateSystemInitializationFailedException(
- L"GetCoordinateSystemSizeInfo", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(
+ L"GetCoordinateSystemSizeInfo", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//The following will never actually get
@@ -357,7 +357,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgFileIoException(L"MgCoordinateSystemDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"MgInvalidArgumentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
MentorDictionary::SetFileName(
@@ -425,7 +425,7 @@
if (0!=CS_fclose(pFile))
{
- throw new MgFileIoException(L"MgCoordinateSystemDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystemDictionary.GetSize")
@@ -449,13 +449,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystem* pCoordinateSystem=dynamic_cast<MgCoordinateSystem*>(pDefinition);
if (!pCoordinateSystem)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Csdef_, MgCoordinateSystem>(
@@ -499,13 +499,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystem* pCoordinateSystem=dynamic_cast<MgCoordinateSystem*>(pDefinition);
if (!pCoordinateSystem)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Csdef_, MgCoordinateSystem>(
@@ -755,7 +755,7 @@
}
if (NULL == m_pmapSystemNameDescription)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -764,7 +764,7 @@
if (0!=CS_fclose(pFile))
{
- throw new MgFileIoException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
pFile=NULL;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -581,7 +581,7 @@
CS_elrd);
if (NULL == m_pmapSystemNameDescription)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -590,7 +590,7 @@
if (0!=CS_fclose(pFile))
{
- throw new MgFileIoException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
pFile=NULL;
@@ -615,11 +615,11 @@
/*IN, optional*/const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == targetDictionary)
- throw new MgNullArgumentException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
CCoordinateSystemEllipsoidDictionary* ellipsoidDictionary = dynamic_cast<CCoordinateSystemEllipsoidDictionary*>(targetDictionary);
if (NULL == ellipsoidDictionary)
- throw new MgInvalidArgumentException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
return MentorDictionary::ReadAllDefinitions<MgCoordinateSystemEllipsoid, cs_Eldef_, CCoordinateSystemEllipsoidDictionary>(
ellipsoidDictionary,
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -60,7 +60,7 @@
assert((NULL != pnValues) || (ulSize == 0));
if (!pnValues)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEnumInteger32.SetList", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnumInteger32.SetList", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
delete [] m_pnValues;
@@ -187,7 +187,7 @@
}
if (ulSkipCount != ulSkipped)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEnumInteger32.Skip", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnumInteger32.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystemEnumInteger32.Skip")
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -37,7 +37,7 @@
{
if(NULL == pCoordSys)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemMeasure.MgCoordinateSystemMeasure", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMeasure.MgCoordinateSystemMeasure", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
m_pCoordSys = SAFE_ADDREF(pCoordSys);
@@ -99,7 +99,7 @@
MG_TRY()
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgNullArgumentException(L"MgCoordinateSystemMeasure.GetDistance", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMeasure.GetDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
distance = GetDistance(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
@@ -146,7 +146,7 @@
MG_TRY()
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgNullArgumentException(L"MgCoordinateSystemMeasure.GetAzimuth", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMeasure.GetAzimuth", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
azimuth = GetAzimuth(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
MG_CATCH_AND_THROW(L"MgCoordinateSystemMeasure.GetAzimuth")
@@ -197,7 +197,7 @@
{
if(NULL == coord)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemMeasure.GetCoordinate", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMeasure.GetCoordinate", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
return GetCoordinate(coord->GetX(), coord->GetY(), azimuth, distance);
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -785,7 +785,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
else
{
@@ -799,7 +799,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
else
{
@@ -826,7 +826,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
}
else
{
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -292,12 +292,12 @@
MG_TRY()
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -390,13 +390,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -409,12 +409,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -441,13 +441,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -460,12 +460,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -105,7 +105,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.IsValidPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemTransform.IsValidPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Test the point
@@ -765,7 +765,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.GetSource", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemTransform.GetSource", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
return SAFE_ADDREF(m_pCsSource.p);
@@ -780,7 +780,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.GetTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemTransform.GetTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
return SAFE_ADDREF(m_pCsTarget.p);
@@ -827,12 +827,12 @@
bool bResult = BuildCsprmFromInterface(pSource, srcCsprm);
if (!bResult)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
bResult = BuildCsprmFromInterface(pTarget, dstCsprm);
if (!bResult)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//Attempt to set up a datum conversion.
@@ -846,7 +846,7 @@
//This can easily happen if, for example, it's a NADCON
//datum shift and Mentor couldn't find the NADCON
//data files at run time.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
}
//Okay, we're all set! Uninitialize ourselves, and
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp 2011-12-08 05:39:51 UTC (rev 6305)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp 2011-12-08 05:54:30 UTC (rev 6306)
@@ -367,12 +367,12 @@
Ptr<MgCoordinateSystemCategory> pCategory=pCtDict->GetCategory(category);
if (!pCategory)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryInDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryInDictionaryException", NULL);
}
Ptr<MgCoordinateSystemEnum> pEnum=pCategory->GetEnum();
if (!pEnum)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
for ( ; ; )
@@ -449,12 +449,12 @@
if (!sm_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
wchar_t wszEpsg[255];
#ifdef _WIN32
@@ -488,12 +488,12 @@
if (!sm_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
STRING strEpsgCode=pConverter->WktToCode(MgCoordinateSystemWktFlavor::Unknown, wkt, MgCoordinateSystemCodeFormat::Epsg);
nEpsg = (INT32)wcstol(strEpsgCode.c_str(), NULL, 10);
@@ -522,13 +522,13 @@
if (!sm_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
try
More information about the mapguide-commits
mailing list