[mapguide-commits] r6314 - sandbox/adsk/vik/Common/CoordinateSystem
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Dec 8 11:39:21 EST 2011
Author: traianstanev
Date: 2011-12-08 08:39:20 -0800 (Thu, 08 Dec 2011)
New Revision: 6314
Modified:
sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h
Log:
Final exception renaming submission, code compiles again.
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -1337,13 +1337,13 @@
Ptr<MgCoordinateSystemCategoryDictionary> pCtDict=m_pCatalog->GetCategoryDictionary();
if (!pCtDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
}
//get the category dictionary pointer
Ptr<MgCoordinateSystemEnum> pEnumCategories=pCtDict->GetEnum();
if (!pEnumCategories)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
pCategoryNames = new MgStringCollection();
@@ -1487,7 +1487,7 @@
Ptr<MgCoordinateSystemDatumDictionary> pDtDict=pCatalog->GetDatumDictionary();
if (!pDtDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumDictionaryException", NULL);
}
//Build a wchar_t* from the datum name
@@ -1508,7 +1508,7 @@
Ptr<MgCoordinateSystemEllipsoidDictionary> pElDict=pCatalog->GetEllipsoidDictionary();
if (!pElDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
}
//Build a wchar_t* from the ellipsoid name
@@ -2683,14 +2683,14 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
*/
//no DT or EL if NERTH projection is used
if (ProjectionIsNerthType (GetProjectionCode()))
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidIfArbitraryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidIfArbitraryException", NULL);
}
//Get information out of the Ellipsoid def
@@ -2698,7 +2698,7 @@
bool bResult = BuildElDefFromInterface(pEllipsoid, eldef);
if (!bResult)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//If the coordinate system is geodetic we need to switch it
@@ -2726,7 +2726,7 @@
|| (0 != CS_nampp(eldef.key_nm))
|| (0 != CS_stricmp(m_csprm.csdef.elp_knm, eldef.key_nm)))
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Okay, at this point we have a valid cs_Csdef_ and cs_Eldef_.
@@ -2737,7 +2737,7 @@
CriticalClass.Leave();
if (NULL == pDatum)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
CriticalClass.Enter();
@@ -2745,7 +2745,7 @@
CriticalClass.Leave();
if (NULL == pCsprm)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
//We're all set. Initialize our data members.
@@ -2754,7 +2754,7 @@
Ptr<MgCoordinateSystemEllipsoid> pEllipsoidClone = pEllipsoid->CreateClone();
if (NULL == pEllipsoidClone.p)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
m_pEllipsoid = pEllipsoidClone;
@@ -2763,7 +2763,7 @@
//Make sure the coordinate system is valid
if (!IsValid())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
MG_CATCH(L"MgCoordinateSystem.SetEllipsoidDefinition")
@@ -3111,7 +3111,7 @@
//Make sure we've been initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.IsValidCoord", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.IsValidCoord", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Find out whether we're in range
@@ -3175,7 +3175,7 @@
{
//The conversion failed, because we're outside the
//mathematical domain of the coordinate system.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystem.ConvertPoint")
@@ -3193,13 +3193,13 @@
assert(NULL != func);
if (NULL == func)
{
- throw new MgNullArgumentException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Check the range. We need to do this even if range checking
@@ -3215,7 +3215,7 @@
if (nResult & cs_CNVRT_DOMN)
{
//Outside the mathematical domain!
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
//Do the conversion.
@@ -3230,7 +3230,7 @@
{
//WARNING
//should really be a warning but throwing exception
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystem.GetDouble")
@@ -3302,7 +3302,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -3338,7 +3338,7 @@
{
m_bEncrypted = bPrevEncrypted;
m_csprm.csdef = prevDef;
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -3355,7 +3355,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystem.SerializeTo", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -653,7 +653,7 @@
//Nope.
MgStringCollection arguments;
arguments.Add(sName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemCategoryDictionary.GetCategory", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.GetCategory", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make a new object
@@ -759,7 +759,7 @@
//nope, not there
MgStringCollection arguments;
arguments.Add(sOldName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make sure def with new name is *not* present
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -407,7 +407,7 @@
nSize=(ulFileBytes - sizeof(m_lMagic)) / nRecSize;
if (0!=CS_fclose(pFile))
{
- throw new MgFileIoException(L"MgCoordinateSystemDatumDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystemDatumDictionary.GetSize")
@@ -430,13 +430,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemDatum* pDatumDef=dynamic_cast<MgCoordinateSystemDatum*>(pDefinition);
if (!pDatumDef)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Dtdef_, MgCoordinateSystemDatum>(
@@ -480,13 +480,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemDatum* pDatumDef=dynamic_cast<MgCoordinateSystemDatum*>(pDefinition);
if (!pDatumDef)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Dtdef_, MgCoordinateSystemDatum>(
@@ -538,7 +538,7 @@
//wasn't there!
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemDatumDictionary.GetDatum", __LINE__, __WFILE__, &whatArguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetDatum", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
//Okay, at this point we have a Mentor coordsys definition
@@ -687,7 +687,7 @@
}
if (NULL == m_pmapSystemNameDescription)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -700,7 +700,7 @@
{
const bool fileClosed = (0 == CS_fclose(pFile));
if (!fileClosed && NULL == mgException) //throw this exception in case no other exception has already been caught
- mgException = new MgFileIoException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ mgException = new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
pFile = NULL;
}
@@ -724,11 +724,11 @@
/*IN, optional*/const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == targetDictionary)
- throw new MgNullArgumentException(L"CCoordinateSystemDatumDictionary.ReadAllDatums", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemDatumDictionary.ReadAllDatums", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
CCoordinateSystemDatumDictionary* datumDictionary = dynamic_cast<CCoordinateSystemDatumDictionary*>(targetDictionary);
if (NULL == datumDictionary) //everything else is an implementation defect
- throw new MgInvalidArgumentException(L"CCoordinateSystemDatumDictionary.ReadAllDatums", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemDatumDictionary.ReadAllDatums", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//place a lock here - we don't want any interference; what we need is the *current* status of all dictionary files
SmartCriticalClass dictionaryLock(true);
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -554,7 +554,7 @@
//wasn't there!
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemDictionary.GetCoordinateSystem", __LINE__, __WFILE__, &whatArguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetCoordinateSystem", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
//Okay, at this point we have a Mentor coordsys definition
@@ -647,11 +647,11 @@
/*IN, optional*/ const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == targetDictionary)
- throw new MgNullArgumentException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
CCoordinateSystemDictionary* csDictionary = dynamic_cast<CCoordinateSystemDictionary*>(targetDictionary);
if (NULL == csDictionary)
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//in order to create the MgCoordinateSystem objects, we have to have also the information on the datums and ellipsoids
map<STRING, Ptr<MgDisposable> > ellipsoidMap;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -93,7 +93,7 @@
CS_fclose(pFile);
delete [] pDict;
//It already exists, but it's not supposed to.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
}
if (pFile)
{
@@ -107,7 +107,7 @@
if (1!=nWrite || ferror(pFile))
{
CS_fclose(pFile);
- throw new MgFileIoException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//Success!
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -59,19 +59,19 @@
if (NULL==pDest)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
if (Protected())
{
//Can't modify a read-only object.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
}
if (!IsLegalString(sSrc.c_str(), nMaxSize))
{
//Can't set string, caller gave us an illegal value
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -132,12 +132,12 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
}
if (sCode.empty())
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -152,7 +152,7 @@
{
//illegal string
delete [] pStr;
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Copy into the definition
@@ -238,7 +238,7 @@
assert(NULL != pDef);
if (NULL == pDef)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure it's an ellipsoid definition
@@ -253,7 +253,7 @@
bool bResult = BuildElDefFromInterface(pElDef, def);
if (!bResult)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//And compare with this one!
@@ -488,21 +488,21 @@
if (Protected())
{
//can't change a read-only object
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
}
//Make sure the radii are mathematically valid
if (!IsLegalEllipsoidRadius(dEquatorialRadius)
|| !IsLegalEllipsoidRadius(dPolarRadius))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Make sure the flattening ratio is legitimate
double dFlat = FlatteningRatio(dEquatorialRadius, dPolarRadius);
if (!::IsLegalFlatteningRatio(dFlat))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Okay, everything's kosher, store the values.
@@ -529,7 +529,7 @@
assert(dFlat <= 1.0);
if ((dFlat < 0.0) || (dFlat > 1.0))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.FlatteningRatioToEccentricity", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.FlatteningRatioToEccentricity", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dEccent = Eccentricity(dFlat);
@@ -554,7 +554,7 @@
assert(dEccent <= 1.0);
if ((dEccent < 0.0) || (dEccent > 1.0))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.EccentToFlat", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.EccentToFlat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dFlat = FlatteningRatio(dEccent);
@@ -579,7 +579,7 @@
assert(dFlatteningRatio < 1.0);
if ((dFlatteningRatio < 0.0) || (dFlatteningRatio >= 1.0))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.EquatorialRadiusFromPolarRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.EquatorialRadiusFromPolarRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dEquatorialRadius = dPolarRadius / (1.0 - dFlatteningRatio);
@@ -604,7 +604,7 @@
assert(dFlatteningRatio < 1.0);
if ((dFlatteningRatio < 0.0) || (dFlatteningRatio >= 1.0))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.PolarRadiusFromEquatorialRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.PolarRadiusFromEquatorialRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dPolarRadius = dEquatorialRadius * (1.0 - dFlatteningRatio);
@@ -628,7 +628,7 @@
assert(NULL != pdAzimuth);
if (NULL == pdDistance || NULL == pdAzimuth)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEllipsoid.GreatCircle", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.GreatCircle", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//set up our input variables
@@ -675,7 +675,7 @@
assert(NULL != pdMaxRadius);
if (NULL == pdMinRadius || NULL == pdMaxRadius)
{
- throw new MgNullArgumentException(L"MentorDictionary.GetRadiusBounds", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.GetRadiusBounds", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
*pdMinRadius = kdMinEllipsoidRadius;
@@ -721,7 +721,7 @@
assert(NULL != pdMaxFlat);
if (NULL == pdMinFlat || NULL == pdMaxFlat)
{
- throw new MgNullArgumentException(L"MentorDictionary.GetFlatteningRatioBounds", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.GetFlatteningRatioBounds", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
*pdMinFlat = kdMinEllipsoidFlat;
@@ -770,11 +770,11 @@
if (!IsLegalEllipsoidRadius(dEquatorialRadius))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (!IsLegalEllipsoidRadius(dPolarRadius))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dFlat = FlatteningRatio(dEquatorialRadius, dPolarRadius);
@@ -798,7 +798,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -834,7 +834,7 @@
{
m_bEncrypted = bPrevEncrypted;
m_def = prevDef;
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -851,7 +851,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoid.SerializeTo", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -278,7 +278,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgFileIoException(L"MgCoordinateSystemEllipsoidDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"MgInvalidArgumentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
MentorDictionary::SetFileName(
@@ -345,7 +345,7 @@
nSize=(ulFileBytes - sizeof(m_lMagic)) / sizeof(cs_Eldef_);
if (0!=CS_fclose(pFile))
{
- throw new MgFileIoException(L"MgCoordinateSystemEllipsoidDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystemEllipsoidDictionary.GetSize")
@@ -369,13 +369,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemEllipsoid* pEllipsoidDef=dynamic_cast<MgCoordinateSystemEllipsoid*>(pDefinition);
if (!pEllipsoidDef)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Eldef_, MgCoordinateSystemEllipsoid>(
@@ -422,13 +422,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemEllipsoid* pEllipsoidDef=dynamic_cast<MgCoordinateSystemEllipsoid*>(pDefinition);
if (!pEllipsoidDef)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Eldef_, MgCoordinateSystemEllipsoid>(
@@ -474,7 +474,7 @@
//wasn't there!
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, &whatArguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
//Okay, at this point we have a Mentor ellipsoid definition
@@ -507,7 +507,7 @@
if (NULL == pEllipsoidDef.p)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return pEllipsoidDef.Detach();
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -138,7 +138,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//is it filtered out?
@@ -236,7 +236,7 @@
if (ulSkipCount != ulSkipped)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystemEnum.Skip")
@@ -264,7 +264,7 @@
assert(NULL != kpName);
if (!kpName)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//If a Filter hasn't been specified, just return false.
@@ -284,7 +284,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//Evaluate it
@@ -305,7 +305,7 @@
assert(NULL != pDef);
if (!pDef)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
for (size_t i=0; i<m_vectFilter.size(); i++)
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -61,7 +61,7 @@
assert(NULL != pDef);
if (!pDef)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
for (size_t i=0; i<m_vectFilter.size(); i++)
@@ -91,7 +91,7 @@
assert(NULL != kpName);
if (!kpName)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//If a filter hasn't been specified, just return false.
@@ -111,7 +111,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//Evaluate it
@@ -177,7 +177,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//check if this category is filtered out or not
@@ -230,7 +230,7 @@
//----------------------------------------------------------
MgStringCollection* CCoordinateSystemEnumCategory::NextDescription(UINT32 ulCount)
{
- throw new MgNotImplementedException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
//----------------------------------------------------------
@@ -259,7 +259,7 @@
if (ulSkipCount != ulSkipped)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH_AND_THROW(L"MgCoordinateSystemEnum.Skip")
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -88,12 +88,12 @@
if (!m_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemDictionary> pCsDict=m_pCatalog->GetCoordinateSystemDictionary();
if (!pCsDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.Next", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.Next", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
wchar_t* pstr;
@@ -119,7 +119,7 @@
{
MgStringCollection arguments;
arguments.Add(strCsName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//is it filtered out?
if (IsFilteredOut(pCs))
@@ -175,12 +175,12 @@
pOutput=new MgStringCollection;
if (!m_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemDictionary> pCsDict=m_pCatalog->GetCoordinateSystemDictionary();
if (!pCsDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.NextDescription", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.NextDescription", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
wchar_t* pstr;
@@ -205,7 +205,7 @@
{
MgStringCollection arguments;
arguments.Add(strCsName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//is it filtered out?
if (IsFilteredOut(pCs))
@@ -310,12 +310,12 @@
if (!m_pCatalog)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemDictionary> pCsDict=m_pCatalog->GetCoordinateSystemDictionary();
if (!pCsDict)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.IsFilteredOut", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystem.IsFilteredOut", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
//Get a def from the set for the Filter to work with
@@ -326,7 +326,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//Evaluate it
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -336,7 +336,7 @@
//make a coordsys object
if (!pCsDef || !pElDef)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//do we have a datum?
@@ -346,7 +346,7 @@
Ptr<MgCoordinateSystemDatum> pDtDef=BuildInterfaceFromDtDef(dtDef, NULL);
if (!pDtDef)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
pDtDef->SetEllipsoidDefinition(pElDef);
pCsDef->SetDatumDefinition(pDtDef);
@@ -377,7 +377,7 @@
// Could not create the coordinate system from the WKT
MgStringCollection arguments;
arguments.Add(sWkt);
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromWkt", &arguments);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromWkt", &arguments);
}
else
{
@@ -422,7 +422,7 @@
if (wktFlvrUnknown==GetWktFlavor(nWktFlavor))
{
//invalid argument
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
std::string szMsiName;
@@ -487,7 +487,7 @@
else
{
//invalid source format
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//now get the WKT
@@ -502,7 +502,7 @@
{
MgStringCollection arguments;
arguments.Add(strMsiName);
- throw new MgCoordinateSystemLoadFailedException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
INT32 prj=pCsCoordinateSystemDef->GetProjectionCode();
@@ -667,7 +667,7 @@
else
{
//invalid format
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.WktToCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
}
@@ -705,14 +705,14 @@
if (pSource==NULL)
{
- throw new MgNullArgumentException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//get the name of the source system
STRING sCsSource=pSource->GetCsCode();
if (sCsSource.empty())
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
pszCsSource = Convert_Wide_To_Ascii(sCsSource.c_str());
@@ -755,7 +755,7 @@
else
{
//invalid format
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH(L"MgCoordinateSystemFormatConverter.DefinitionToCode")
@@ -815,7 +815,7 @@
else
{
//invalid format
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//now get the definition
@@ -834,7 +834,7 @@
// Could not create the coordinate system from the code
MgStringCollection arguments;
arguments.Add(sCodeSource);
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromCode", &arguments);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromCode", &arguments);
}
MG_CATCH(L"MgCoordinateSystemFormatConverter.CodeToDefinition")
@@ -902,7 +902,7 @@
else
{
//invalid format
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
}
@@ -938,7 +938,7 @@
else
{
//invalid format
- throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH(L"MgCoordinateSystemFormatConverter.CodeToCode")
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -40,7 +40,7 @@
{
//have we been passed a non-null argument?
if (NULL == this->catalog)
- throw new MgNullArgumentException(L"CCoordinateSystemGeodeticTransformDef.ctor", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
CCoordinateSystemGeodeticTransformDef::~CCoordinateSystemGeodeticTransformDef()
@@ -77,7 +77,7 @@
break;
default:
- throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticTransformDef.Reset", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.Reset", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//try creating a new [cs_GeodeticTransform_] instance before we wipe out our own stuff
@@ -157,7 +157,7 @@
break;
default: //invalid / unknown [methodCode] given; don't know how to proceed here
- throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticTransformDef.Initialize", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.Initialize", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
return transformationType;
@@ -178,7 +178,7 @@
VERIFY_INITIALIZED(L"CCoordinateSystemGeodeticTransformDef.CreateTransformation");
if (!this->IsValid())
- throw new MgInvalidOperationException(L"CCoordinateSystemGeodeticTransformDef.CreateTransformation", __LINE__,__WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.CreateTransformation", __LINE__,__WFILE__, NULL, L"InvalidOperation", NULL);
//we don't take ownership of the transformation being returned but
//will release [sourceDatum] and [targetDatum];
@@ -239,7 +239,7 @@
default: //invalid state; why's that?
_ASSERT(false);
- throw new MgInvalidOperationException(L"CCoordinateSystemGeodeticTransformDef.GetParameters", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.GetParameters", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
}
}
@@ -311,7 +311,7 @@
}
if (NULL == transformDefParams)
- throw new MgInvalidOperationException(L"CCoordinateSystemGeodeticTransformDef.SetParameters", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.SetParameters", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
//copy the values from the parameter we've been passed into our own [parameters] section
transformDefParams->CopyTo(&this->transformDefinition->parameters);
@@ -377,7 +377,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
// In case an exception gets thrown.
@@ -417,7 +417,7 @@
// Nope! It's not valid, but not valid in such a way that would cause
// an exception to be thrown. transformationDefinition cannot be
// NULL at this point.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -447,7 +447,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemGeodeticTransformDef.SerializeTo", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformDef.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -46,16 +46,16 @@
: m_pDtcprm(NULL), m_pDtSource(NULL), m_pDtTarget(NULL)
{
if (NULL == pCatalog || NULL == transformationDef)
- throw new MgNullArgumentException(L"CCoordinateSystemGeodeticTransformation.ctor", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformation.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
- //this->Uninitialize(); //not needed - this does release the resourced held by this instance; we haven't set anything yet
+ //Uninitialize(); //not needed - this does release the resourced held by this instance; we haven't set anything yet
- this->SetCatalog(pCatalog);
+ SetCatalog(pCatalog);
//now - setup ourselves from the [MgCoordinateSystemGeodeticTransformDef] we've been passed
//we'll not pass a source and a target datum to CS Map so it constructs the cs_Dtcprm_ struct
//but we'll do that because we already have a transformation
- this->SetupFromTransformationDef(transformationDef, createInversed);
+ SetupFromTransformationDef(transformationDef, createInversed);
}
//-----------------------------------------------------------------------------
@@ -92,7 +92,7 @@
MgCoordinateSystemDatum *pSourceTmp=GetWGS84IfNull(pSource);
if (!pSourceTmp)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
CCoordinateSystemDatum* pDtSourceImp=dynamic_cast<CCoordinateSystemDatum*>(pSourceTmp);
assert(pDtSourceImp);
@@ -103,7 +103,7 @@
{
SAFE_RELEASE(pSourceTmp);
}
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
//Set up our target datum
@@ -115,7 +115,7 @@
{
SAFE_RELEASE(pSourceTmp);
}
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
CCoordinateSystemDatum* pDtTargetImp=dynamic_cast<CCoordinateSystemDatum*>(pTargetTmp);
assert(pDtTargetImp);
@@ -131,7 +131,7 @@
{
SAFE_RELEASE(pTargetTmp);
}
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
//Set up our datum conversion struct
@@ -141,7 +141,7 @@
assert(pDtcprm);
if (!pDtcprm)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
}
Uninitialize();
@@ -175,7 +175,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.GetSource", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetSource", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return SAFE_ADDREF(m_pDtSource);
@@ -190,7 +190,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.GetTarget", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return SAFE_ADDREF(m_pDtTarget);
@@ -226,12 +226,12 @@
if (1==nResult)
{
// Partial failure - Outside the useful range.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
else if (-1==nResult)
{
// Total failure - Outside the mathematical domain.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
pLonLat->SetX(dLongitude);
pLonLat->SetY(dLatitude);
@@ -269,12 +269,12 @@
if (1==nResult)
{
// Partial failure - Outside the useful range.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
else if (-1==nResult)
{
// Total failure - Outside the mathematical domain.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
pCoord=new MgCoordinateXY(dLongitude, dLatitude);
@@ -311,12 +311,12 @@
if (1==nResult)
{
// Partial failure - Outside the useful range.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
else if (-1==nResult)
{
// Total failure - Outside the mathematical domain.
- throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
pCoord=new MgCoordinateXYZ(dLongitude, dLatitude, dZ);
@@ -365,7 +365,7 @@
CCoordinateSystemGeodeticTransformDef* transformDefImpl = dynamic_cast<CCoordinateSystemGeodeticTransformDef*>(transformationDef);
if (NULL == transformDefImpl)
- throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
cs_GeodeticTransform_ csMapTransformDef;
transformDefImpl->CopyTo(csMapTransformDef);
@@ -374,7 +374,7 @@
datumTransform = CSdtcsu2(&csMapTransformDef, createInversed ? cs_DTCDIR_INV : cs_DTCDIR_FWD, cs_DTCFLG_BLK_W);
if (NULL == datumTransform)
- throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
Ptr<MgCoordinateSystemDatumDictionary> datumDictionary = this->m_pCatalog->GetDatumDictionary();
Ptr<MgCoordinateSystemDatum> srcDatum = datumDictionary->GetDatum(transformationDef->GetSourceDatum());
@@ -482,7 +482,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetX", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetX", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult=def.delta_X;
@@ -499,7 +499,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetY", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetY", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult=def.delta_Y;
MG_CATCH_AND_THROW(L"MgCoordinateSystemGeodeticTransformation.GetOffsetY")
@@ -515,7 +515,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetZ", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetZ", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult=def.delta_Z;
MG_CATCH_AND_THROW(L"MgCoordinateSystemGeodeticTransformation.GetOffsetZ")
@@ -537,26 +537,26 @@
MG_TRY()
if (!m_pDtSource || !m_pDtTarget)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//if not WGS84 for the target system, bye bye!
if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
CCoordinateSystemDatum* pDatumImp=dynamic_cast<CCoordinateSystemDatum*>(m_pDtSource);
assert(pDatumImp);
if (!pDatumImp)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//Make sure this object isn't read-only
if (m_pDtSource->IsProtected())
{
//can't change a read-only object
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (!IsLegalDatumOffset(x) ||
@@ -564,7 +564,7 @@
!IsLegalDatumOffset(z))
{
//Caller gave us an illegal value.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
pDatumImp->m_DtDef.delta_X = pDatumImp->m_datum.delta_X = x;
@@ -758,26 +758,26 @@
if (!m_pDtSource || !m_pDtTarget)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//if not WGS84 for the target system, bye bye!
if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
CCoordinateSystemDatum* pDatumImp=dynamic_cast<CCoordinateSystemDatum*>(m_pDtSource);
assert(pDatumImp);
if (!pDatumImp)
{
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//Make sure this object isn't read-only
if (m_pDtSource->IsProtected())
{
//can't change a read-only object
- throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (!IsLegalGeodeticTransformationMethod(nGeodeticTransformationMethod))
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-08 16:39:20 UTC (rev 6314)
@@ -310,12 +310,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -338,13 +338,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -357,12 +357,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h 2011-12-08 15:50:05 UTC (rev 6313)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h 2011-12-08 16:39:20 UTC (rev 6314)
@@ -122,7 +122,7 @@
allDefs.reset(MentorDictionary::ReadDictionaryEntries<T>(pFile, CS_Trd));
if (NULL == allDefs.get())
- throw new MgInvalidArgumentException(L"MentorDictionary.ReadDictionaryEntries", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.ReadDictionaryEntries", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
MG_CATCH(L"MentorDictionary.ReadDictionaryEntries")
@@ -130,7 +130,7 @@
pFile = NULL;
if (!fileClosed && NULL == mgException)
- throw new MgFileIoException(L"MentorDictionary.ReadDictionaryEntries", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgApplicationException(L"MentorDictionary.ReadDictionaryEntries", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
MG_THROW()
@@ -202,10 +202,10 @@
/*IN/OUT, required*/ std::map<STRING, Ptr<MgDisposable> >& definitions)
{
if (NULL == targetDictionary || NULL == GetCode)
- throw new MgNullArgumentException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
if (0 != definitions.size())
- throw new MgInvalidArgumentException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
const UINT32 entryCount = targetDictionary->GetSize();;
@@ -232,7 +232,7 @@
/*IN, optional*/const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == toBeFiltered)
- throw new MgNullArgumentException(L"MentorDictionary.FilterDefinitions", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.FilterDefinitions", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
if (NULL == filters)
return SAFE_ADDREF(toBeFiltered); //see coment - the caller does always have to release the collection being returned
@@ -247,7 +247,7 @@
Ptr<MgDisposable> disposableItem = toBeFiltered->GetItem((INT32)j);
T* mgCsItem = dynamic_cast<T*>(disposableItem.p);
if (NULL == mgCsItem)
- throw new MgInvalidArgumentException(L"MentorDictionary.FilterDefinitions", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.FilterDefinitions", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//exclude the [mgCsItem], if it's not accepted by the filter we got
if (filters->at(j)->IsFilteredOut(mgCsItem))
@@ -272,15 +272,15 @@
{
//'true' input parameter check
if (NULL == primaryDictionary)
- throw new MgNullArgumentException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
//method pointer checks
if (NULL == GetMgItem || NULL == CS_Trd)
- throw new MgNullArgumentException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
auto_ptr<vector<U> > allDefs(MentorDictionary::ReadDictionaryEntries<U>(primaryDictionary, CS_Trd));
if (NULL == allDefs.get()) //[ReadDictionaryEntries] will return NULL, if the dictionary entries couldn't be read
- throw new MgInvalidArgumentException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgApplicationException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
const bool doPostProcess = (NULL != PostProcess);
Ptr<MgDisposableCollection> filteredDefinitions = new MgDisposableCollection();
More information about the mapguide-commits
mailing list