[mapguide-commits] r6316 - in sandbox/adsk/vik/Common:
CoordinateSystem Foundation Foundation/Data
Foundation/Exception Foundation/System Geometry
Geometry/Buffer Geometry/CoordinateSystem Geometry/Parse
Geometry/Spatial
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Dec 8 12:44:30 EST 2011
Author: traianstanev
Date: 2011-12-08 09:44:30 -0800 (Thu, 08 Dec 2011)
New Revision: 6316
Removed:
sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.cpp
sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.h
Modified:
sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.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/CoordSysEnumInteger32.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMacro.h
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/CoordinateSystem/CoordSysUnitInformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp
sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h
sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp
sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp
sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp
sandbox/adsk/vik/Common/Foundation/Data/Property.cpp
sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp
sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp
sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp
sandbox/adsk/vik/Common/Foundation/Exception/Exception.h
sandbox/adsk/vik/Common/Foundation/Exception/ExceptionDefs.h
sandbox/adsk/vik/Common/Foundation/Foundation.h
sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters
sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp
sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp
sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp
sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h
sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp
sandbox/adsk/vik/Common/Foundation/System/Util.cpp
sandbox/adsk/vik/Common/Foundation/System/Util.h
sandbox/adsk/vik/Common/Geometry/Buffer/MgBuffer.cpp
sandbox/adsk/vik/Common/Geometry/Buffer/oobject.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp
sandbox/adsk/vik/Common/Geometry/CurveString.cpp
sandbox/adsk/vik/Common/Geometry/Envelope.cpp
sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp
sandbox/adsk/vik/Common/Geometry/Geometry.cpp
sandbox/adsk/vik/Common/Geometry/LineString.cpp
sandbox/adsk/vik/Common/Geometry/LinearRing.cpp
sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp
sandbox/adsk/vik/Common/Geometry/Parse/Array.h
sandbox/adsk/vik/Common/Geometry/Parse/ArrayHelper.cpp
sandbox/adsk/vik/Common/Geometry/Parse/LexAwkt.cpp
sandbox/adsk/vik/Common/Geometry/Parse/ParseAwkt.cpp
sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp
sandbox/adsk/vik/Common/Geometry/Polygon.cpp
sandbox/adsk/vik/Common/Geometry/Spatial/MathUtility.cpp
sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp
sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp
Log:
Unified MgException and MgApplicationException into MgException. Removed MgApplicationException.
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -117,7 +117,7 @@
assert(bResult);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return;
}
@@ -151,7 +151,7 @@
Ptr<MgDisposable> disposableCsObject = datumMapIterator->second;
MgCoordinateSystemDatum* datumInfo = dynamic_cast<MgCoordinateSystemDatum*>(disposableCsObject.p);
if (NULL == datumInfo)
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
pDatum = SAFE_ADDREF(datumInfo);
}
@@ -162,14 +162,14 @@
Ptr<MgCoordinateSystemDatumDictionary> pDtDict = m_pCatalog->GetDatumDictionary();
if (!pDtDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumDictionaryException", NULL);
}
pDatum = pDtDict->Get(sDtName);
assert(pDatum);
if (!pDatum)
{
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumInDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumInDictionaryException", NULL);
}
}
@@ -193,7 +193,7 @@
Ptr<MgDisposable> disposableCsObject = ellipsoidMapIterator->second;
MgCoordinateSystemEllipsoid* ellipsoidInfo = dynamic_cast<MgCoordinateSystemEllipsoid*>(disposableCsObject.p);
if (NULL == ellipsoidInfo)
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
pEllipsoid = SAFE_ADDREF(ellipsoidInfo);
}
@@ -205,14 +205,14 @@
Ptr<MgCoordinateSystemEllipsoidDictionary> pElDict = m_pCatalog->GetEllipsoidDictionary();
if (!pElDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
}
pEllipsoid = pElDict->Get(sElName);
assert(pEllipsoid);
if (!pEllipsoid)
{
- throw new MgApplicationException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidInDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidInDictionaryException", NULL);
}
}
@@ -291,7 +291,7 @@
else
{
// What dimension is this?
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
return pCoordinate;
@@ -327,7 +327,7 @@
else
{
// What dimension is this?
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
return pCoordinate;
@@ -378,7 +378,7 @@
{
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgApplicationException(L"MgCoordinateSystem.MeasureEuclideanDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.MeasureEuclideanDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
return MeasureEuclideanDistance(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
@@ -431,7 +431,7 @@
{
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgApplicationException(L"MgCoordinateSystem.MeasureGreatCircleDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.MeasureGreatCircleDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
return MeasureGreatCircleDistance(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
@@ -466,7 +466,7 @@
// and there must be a Great Circle path between the points.
if(GetType() == MgCoordinateSystemType::Arbitrary)
{
- throw new MgApplicationException(L"MgCoordinateSystem.MeasureGreatCircleDistance", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMustNotBeArbitrary", NULL);
+ throw new MgException(L"MgCoordinateSystem.MeasureGreatCircleDistance", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMustNotBeArbitrary", NULL);
}
Ptr<MgCoordinate> pLonLat1=ConvertToLonLat(x1, y1);
@@ -503,7 +503,7 @@
{
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetAzimuth", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetAzimuth", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
return GetAzimuth(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
@@ -587,7 +587,7 @@
{
if(NULL == coord)
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetCoordinate", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetCoordinate", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
return GetCoordinate(coord->GetX(), coord->GetY(), azimuth, distance);
@@ -745,12 +745,12 @@
if (!m_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=m_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgApplicationException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
sWkt=pConverter->DefinitionToWkt(this, MgCoordinateSystemWktFlavor::Ogc);
@@ -787,7 +787,7 @@
//Can't change read-only items
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
//Make sure the projection's been properly set
@@ -795,7 +795,7 @@
if (MgCoordinateSystemProjectionCode::Unknown == prj)
{
//Projection hasn't been properly set, so we can't set the unit type.
- throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Make sure it's a unit type we know about
@@ -804,7 +804,7 @@
if (!GetUnitInfo(unit, &unitType, &dScale))
{
//Unknown unit type.
- throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert(dScale > 0.0);
assert(MgCoordinateSystemUnitType::Unknown != unitType);
@@ -815,7 +815,7 @@
if (prjUnitType != unitType)
{
//Wrong unit type for this projection.
- throw new MgApplicationException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetUnitCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Okay, we're all set. Copy in the values...
@@ -939,13 +939,13 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
if (sCode.empty())
{
//null pointer is obviously not legal...
- throw new MgApplicationException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -960,7 +960,7 @@
{
//illegal string
delete [] pStr;
- throw new MgApplicationException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetCsCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Copy into the definition
@@ -1016,13 +1016,13 @@
if (Protected())
{
//Can't change read-only items
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
if (MgCoordinateSystemProjectionCode::Unknown==prjType)
{
//cs_UNKWN_PROJ
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Set the projection string
@@ -1031,7 +1031,7 @@
if (!kpProj)
{
//cs_UNKWN_PROJ
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//if same as the existing projection, do nothing
@@ -1049,7 +1049,7 @@
if (!pp)
{
//cs_UNKWN_PROJ
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
m_csprm.prj_code = pp->code;
m_csprm.prj_flags = pp->flags;
@@ -1287,13 +1287,13 @@
Ptr<MgCoordinateSystemCategoryDictionary> pCtDict=m_pCatalog->GetCategoryDictionary();
if (!pCtDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
}
//get the category dictionary pointer
Ptr<MgCoordinateSystemEnum> pEnumCategories=pCtDict->GetEnum();
if (!pEnumCategories)
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetCategories", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
pCategoryNames = new MgStringCollection();
@@ -1399,7 +1399,7 @@
assert(NULL != pCatalog);
if (NULL == pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//First, make sure it's valid in its own right; if it's
@@ -1429,7 +1429,7 @@
Ptr<MgCoordinateSystemDatumDictionary> pDtDict=pCatalog->GetDatumDictionary();
if (!pDtDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumDictionaryException", NULL);
}
//Build a wchar_t* from the datum name
@@ -1450,7 +1450,7 @@
Ptr<MgCoordinateSystemEllipsoidDictionary> pElDict=pCatalog->GetEllipsoidDictionary();
if (!pElDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidDictionaryException", NULL);
}
//Build a wchar_t* from the ellipsoid name
@@ -1474,7 +1474,7 @@
assert(NULL != pDef);
if (NULL == pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
int i;
@@ -1492,7 +1492,7 @@
bool bResult = BuildCsDefFromInterface(pCsDef, def);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsSameAs", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsSameAs", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//And compare with this one!
@@ -1850,7 +1850,7 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
//Projection type hasn't been properly initialized.
- throw new MgApplicationException(L"MgCoordinateSystem.GetProjectionParamCount", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetProjectionParamCount", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
// Now for each possible parameter.
@@ -1880,7 +1880,7 @@
//Make sure the parameter is in the valid range
if ((nIndex < 1) || (nIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetProjectionParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetProjectionParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Make sure that this parameter is used by this projection
@@ -1888,7 +1888,7 @@
if (MgCoordinateSystemProjectionCode::Unknown == prj)
{
//Projection type hasn't been properly initialized.
- throw new MgApplicationException(L"MgCoordinateSystem.GetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
short prjCode = prj;
//The following function call returns 1 if this
@@ -1902,7 +1902,7 @@
if (1 != nResult)
{
//The parameter isn't used.
- throw new MgApplicationException(L"MgCoordinateSystem.GetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//The parameter is used. Return it.
@@ -1926,13 +1926,13 @@
//Can't change read-only items
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
//Make sure the parameter is in the valid range
if ((nIndex < 1) || (nIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Make sure this parameter is used by this projection
@@ -1940,7 +1940,7 @@
if (MgCoordinateSystemProjectionCode::Unknown == prj)
{
//Projection type hasn't been properly initialized.
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
struct cs_Prjprm_ info;
short prjCode = prj;
@@ -1956,7 +1956,7 @@
{
//The specified parameter isn't used by this
//projection.
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Okay, at this point we know our projection type
@@ -1967,7 +1967,7 @@
if ((dValue < info.min_val) || (dValue > info.max_val))
{
//They've given us an illegal value!
- throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Okay, the value they've given us is legitimate, too.
@@ -1995,7 +1995,7 @@
//Make sure we're not read-only
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetOriginLongitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetOriginLongitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
m_csprm.csdef.org_lng = dOrgLng;
@@ -2018,7 +2018,7 @@
//Make sure we're not read-only
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetOriginLatitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetOriginLatitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
m_csprm.csdef.org_lat = dOrgLat;
@@ -2044,7 +2044,7 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetOffsets", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetOffsets", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
m_csprm.csdef.x_off = dXOffset;
@@ -2075,7 +2075,7 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetScaleReduction", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetScaleReduction", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
INT32 prj = ProjectionFromString(m_csprm.csdef.prj_knm);
if (ProjectionUsesSclRed(prj))
@@ -2100,7 +2100,7 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetMapScale", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetMapScale", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
m_csprm.csdef.map_scl = dMapScale;
@@ -2128,7 +2128,7 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetZeroes", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetZeroes", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
m_csprm.csdef.zero[0] = (dXZero < 0.0)? 0.0 : dXZero;
@@ -2178,7 +2178,7 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
OrderMinMax(dLonMin, dLonMax);
@@ -2204,7 +2204,7 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.CancelLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.CancelLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
//it will only be set on CsMap's transformation struct, i.e.
@@ -2225,7 +2225,7 @@
//Make sure we're not read-only
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
OrderMinMax(dXMin, dXMax);
@@ -2245,7 +2245,7 @@
//Make sure we're not read-only
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.CancelXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.CancelXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
m_csprm.min_xy[0] = 0.0;
@@ -2270,12 +2270,12 @@
//Make sure we're not read-only
if (Protected())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetQuadrant", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetQuadrant", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
if ((sQuad < -4) || (sQuad > 4) || (0 == sQuad))
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetQuadrant", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetQuadrant", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
m_csprm.csdef.quad = sQuad;
@@ -2376,7 +2376,7 @@
if (!pDatum)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//if we check the protection, we can never setup any system since all systems
//are built via void CCoordinateSystem::InitFromCatalog(const cs_Csdef_& csdef)
@@ -2391,7 +2391,7 @@
//no DT or EL if NERTH projection is used
if (ProjectionIsNerthType (GetProjectionCode()))
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumIfArbitraryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumIfArbitraryException", NULL);
}
//Get information out of the datum def
@@ -2399,7 +2399,7 @@
bool bResult = BuildDtDefFromInterface(pDatum, dtdef);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//If the coordinate system is not geodetic we need to switch it
@@ -2427,7 +2427,7 @@
|| (0 != CS_nampp(dtdef.key_nm))
|| (0 != CS_stricmp(m_csprm.csdef.dat_knm, dtdef.key_nm)))
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Get information out of the ellipsoid def
@@ -2435,13 +2435,13 @@
assert(pEllipsoid);
if (!pEllipsoid)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
cs_Eldef_ eldef;
bResult = BuildElDefFromInterface(pEllipsoid, eldef);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//Okay, at this point we have a cs_Csdef_, cs_Dtdef_, and cs_Eldef_
@@ -2452,7 +2452,7 @@
CriticalClass.Leave();
if (NULL == pCsprm)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
//Everything worked okay! Copy the data into our member variables.
@@ -2461,7 +2461,7 @@
Ptr<MgCoordinateSystemDatum> pDatumClone = pDatum->CreateClone();
if (NULL == pDatumClone.p)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
m_pDatum = pDatumClone;
@@ -2471,7 +2471,7 @@
//Make sure the coordinate system is valid
if (!IsValid())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
MG_CATCH(L"MgCoordinateSystem.SetDatumDefinition")
@@ -2529,7 +2529,7 @@
if (!pEllipsoid)
{
//We were given an uninitialized datum.
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//if we check the protection, we can never setup any system since all systems
//are built via void CCoordinateSystem::InitFromCatalog(const cs_Csdef_& csdef)
@@ -2537,14 +2537,14 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
*/
//no DT or EL if NERTH projection is used
if (ProjectionIsNerthType (GetProjectionCode()))
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidIfArbitraryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoEllipsoidIfArbitraryException", NULL);
}
//Get information out of the Ellipsoid def
@@ -2552,7 +2552,7 @@
bool bResult = BuildElDefFromInterface(pEllipsoid, eldef);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//If the coordinate system is geodetic we need to switch it
@@ -2580,7 +2580,7 @@
|| (0 != CS_nampp(eldef.key_nm))
|| (0 != CS_stricmp(m_csprm.csdef.elp_knm, eldef.key_nm)))
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Okay, at this point we have a valid cs_Csdef_ and cs_Eldef_.
@@ -2591,7 +2591,7 @@
CriticalClass.Leave();
if (NULL == pDatum)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
CriticalClass.Enter();
@@ -2599,7 +2599,7 @@
CriticalClass.Leave();
if (NULL == pCsprm)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
//We're all set. Initialize our data members.
@@ -2608,7 +2608,7 @@
Ptr<MgCoordinateSystemEllipsoid> pEllipsoidClone = pEllipsoid->CreateClone();
if (NULL == pEllipsoidClone.p)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
m_pEllipsoid = pEllipsoidClone;
@@ -2617,7 +2617,7 @@
//Make sure the coordinate system is valid
if (!IsValid())
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
MG_CATCH(L"MgCoordinateSystem.SetEllipsoidDefinition")
@@ -2684,7 +2684,7 @@
else
{
// What dimension is this?
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
}
@@ -2711,7 +2711,7 @@
else
{
// What dimension is this?
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -2823,19 +2823,19 @@
if (NULL==pDest)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystem.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
if (!IsLegalString(sSrc.c_str(), nMaxSize))
{
//Can't set string, caller gave us an illegal value
- throw new MgApplicationException(L"MgCoordinateSystem.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -2951,7 +2951,7 @@
//Make sure we've been initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsValidCoord", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsValidCoord", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Find out whether we're in range
@@ -2985,13 +2985,13 @@
assert(NULL != pdDestCoord2);
if (NULL == pdDestCoord1 || NULL == pdDestCoord2)
{
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Do the conversion.
@@ -3011,7 +3011,7 @@
{
//The conversion failed, because we're outside the
//mathematical domain of the coordinate system.
- throw new MgApplicationException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgException(L"MgCoordinateSystem.ConvertPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
}
@@ -3026,13 +3026,13 @@
assert(NULL != func);
if (NULL == func)
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Check the range. We need to do this even if range checking
@@ -3048,7 +3048,7 @@
if (nResult & cs_CNVRT_DOMN)
{
//Outside the mathematical domain!
- throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
//Do the conversion.
@@ -3063,7 +3063,7 @@
{
//WARNING
//should really be a warning but throwing exception
- throw new MgApplicationException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgException(L"MgCoordinateSystem.GetDouble", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
return dResult;
@@ -3123,7 +3123,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -3159,7 +3159,7 @@
{
m_bEncrypted = bPrevEncrypted;
m_csprm.csdef = prevDef;
- throw new MgApplicationException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -3174,7 +3174,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystem.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystem.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -241,7 +241,7 @@
if (sDir.empty())
{
fprintf(stderr, "DefaultDir for the Coordinate System library has been set but is empty.\n");
- throw new MgApplicationException(L"MgCoordinateSystemCatalog.GetDefaultDictionaryDir", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCatalog.GetDefaultDictionaryDir", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (!MgFileUtil::IsDirectory(sDir.c_str()))
@@ -252,7 +252,7 @@
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemCatalog.GetDefaultDictionaryDir", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemCatalog.GetDefaultDictionaryDir", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return sDir;
@@ -277,7 +277,7 @@
{
if (sDirPath.empty())
{
- throw new MgApplicationException(L"MgCoordinateSystemCatalog.SetDictionaryDir", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCatalog.SetDictionaryDir", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
#ifdef _WIN32
@@ -377,7 +377,7 @@
|| !m_pGxDict || m_pGxDict->GetFileName().empty())
{
//Directory hasn't been specified yet.
- throw new MgApplicationException(L"MgCoordinateSystemCatalog.AreDictionaryFilesWritable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemCatalog.AreDictionaryFilesWritable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
STRING sPath=m_pElDict->GetPath();
@@ -501,7 +501,7 @@
//need to get at data files to do certain datum shifts.
if (m_sDir.empty())
{
- throw new MgApplicationException(L"MgCoordinateSystemCatalog.GetGeodeticTransformations", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemCatalog.GetGeodeticTransformations", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
Ptr<CCoordinateSystemGeodeticTransformation> pNew = new CCoordinateSystemGeodeticTransformation(this, pSource, pTarget);
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -85,11 +85,11 @@
//make sure the file is okay
if (!pFile || -1==CS_ftell(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.SaveToFstream", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.SaveToFstream", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (ferror(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.SaveToFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.SaveToFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
previousPosition = CS_ftell(pFile); //in case of error
@@ -140,7 +140,7 @@
if (0!=ferror(pFile) && -1!=previousPosition)
{
CS_fseek(pFile, previousPosition, SEEK_SET);
- throw new MgApplicationException(L"MgCoordinateSystemCategory.SaveToFstream", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.SaveToFstream", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
MG_THROW()
}
@@ -168,11 +168,11 @@
assert(pFile && CS_ftell(pFile)>=0);
if (!pFile || -1==CS_ftell(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (ferror(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
previousPosition = CS_ftell(pFile); //in case of error
@@ -192,7 +192,7 @@
_ASSERT(0 == nRead); //otherwise something else is going on here...
//we reached the end of the file
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//copy the category name into our [m_categoryName] TNameStruct
@@ -203,7 +203,7 @@
nRead=CS_fread(reinterpret_cast<char *>(&ulSize), sizeof(ulSize), 1, pFile);
if (1!=nRead)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//Size in file.
@@ -211,12 +211,12 @@
nRead=CS_fread(reinterpret_cast<char *>(&ulMinSize), sizeof(ulMinSize), 1, pFile);
if (1!=nRead)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
assert(ulMinSize >= ulSize);
if (ulMinSize < ulSize)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
char keyNameBuffer[cs_KEYNM_DEF] = { '\0' };
@@ -228,7 +228,7 @@
nRead=CS_fread(keyNameBuffer, sizeof(char), expectedBufferCountRead, pFile);
if (expectedBufferCountRead != nRead)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
member = keyNameBuffer;
@@ -250,7 +250,7 @@
}
if (ferror(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//We're done! Return success.
@@ -260,7 +260,7 @@
{
CS_fseek(pFile, previousPosition, SEEK_SET);
Clear();
- throw new MgApplicationException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.LoadFromFstream", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
MG_THROW()
}
@@ -274,7 +274,7 @@
assert(NULL != pDef);
if (!pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.CopyFrom", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.CopyFrom", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
Clear();
@@ -315,7 +315,7 @@
{
if (!IsLegalName(sName))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.SetName", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.SetName", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
char *pName = Convert_Wide_To_Ascii(sName.c_str()); //need to delete [] pName
@@ -352,7 +352,7 @@
//Null pointers are illegal
if (NULL == kpName)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.IsLegalName", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.IsLegalName", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//String can't be empty or too long
@@ -402,7 +402,7 @@
{
if (NULL == pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategory.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure it's a category def
@@ -540,7 +540,7 @@
if (!IsLegalMentorName(pName))
{
delete [] pName;
- throw new MgApplicationException(L"MgCoordinateSystemCategory.AddCoordinateSystem", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.AddCoordinateSystem", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Make a new member out of it
@@ -552,7 +552,7 @@
if (itList != m_listCoordinateSystemNames.end())
{
//duplicate!
- throw new MgApplicationException(L"MgCoordinateSystemCategory.AddCoordinateSystem", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemCategoryDuplicateException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.AddCoordinateSystem", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemCategoryDuplicateException", NULL);
}
//Try to insert it in our list
@@ -574,7 +574,7 @@
if (!IsLegalMentorName(pName))
{
delete [] pName;
- throw new MgApplicationException(L"MgCoordinateSystemCategory.RemoveCoordinateSystem", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategory.RemoveCoordinateSystem", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Make a member out of it
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -138,7 +138,7 @@
CS_fseek(pFile, sizeof(klCategoryMagic), SEEK_SET);
if (ferror(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.GenerateIndex", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.GenerateIndex", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//Start reading records.
@@ -201,7 +201,7 @@
if (!pTemp || ferror(pTemp))
{
//couldn't open file
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.RewriteFile", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.RewriteFile", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
}
//Copy the magic number
@@ -228,7 +228,7 @@
CS_fclose(pTemp);
CS_fclose(pFile);
pFile=NULL;
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.RewriteFile", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.RewriteFile", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//Is it the one we're replacing?
@@ -257,7 +257,7 @@
CS_fclose(pFile);
pFile=NULL;
CS_fclose(pTemp);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.RewriteFile", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.RewriteFile", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
}
} //until we reach the end of the original file
@@ -309,7 +309,7 @@
bWriting = true;
break;
default:
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -326,7 +326,7 @@
switch (reason)
{
case kFileInvalidEmptyString:
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
case kFileInvalidPath:
case kFileInvalidDoesNotExist:
@@ -334,13 +334,13 @@
{
MgStringCollection arguments;
arguments.Add(strPath);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
}
break;
case kFileInvalidCantWrite:
MgStringCollection arguments;
arguments.Add(strPath);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemDictionaryReadOnlyException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemDictionaryReadOnlyException", NULL);
break;
}
}
@@ -351,7 +351,7 @@
INT32 lDummy;
if (NULL==(pFile=OpenDictionaryFile(strPath.c_str(), szMode, lDummy, ValidCategoryMagic)))
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//And we're done! Return success.
@@ -380,7 +380,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
if (!sFileName.empty())
@@ -439,20 +439,20 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemCategory* pCategoryDef=dynamic_cast<MgCoordinateSystemCategory*>(pDefinition);
if (!pCategoryDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Look for it in our index
STRING str = pCategoryDef->GetName();
if (str.empty())
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
char *pName = Convert_Wide_To_Ascii(str.c_str()); //need to delete [] pName
@@ -463,7 +463,7 @@
if (iter != Index().end())
{
//Yup.
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
}
//Is it a valid def?
@@ -471,7 +471,7 @@
if (!bValid)
{
//Invalid def!
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Add", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Build a CCoordinateSystemCategory out of it.
@@ -516,7 +516,7 @@
{
MgStringCollection arguments;
arguments.Add(sName);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Remove", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Remove", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Rewrite the file, skipping the specified category.
@@ -543,20 +543,20 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemCategory* pCategoryDef=dynamic_cast<MgCoordinateSystemCategory*>(pDefinition);
if (!pCategoryDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
//Look for it in our index
STRING str = pCategoryDef->GetName();
if (str.empty())
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
char *pName = Convert_Wide_To_Ascii(str.c_str()); //need to delete [] pName
@@ -568,7 +568,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make a CCoordinateSystemCategory object out of what we're given
@@ -588,7 +588,7 @@
size_t nRead=CS_fread(reinterpret_cast<char *>(&ulFileSize), sizeof(ulFileSize), 1, pFile);
if (1!=nRead)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Modify", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//Can we do in-place replacement?
@@ -639,7 +639,7 @@
//Nope.
MgStringCollection arguments;
arguments.Add(sName);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.GetCategory", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.GetCategory", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make a new object
@@ -726,7 +726,7 @@
{
MgStringCollection whatArguments;
whatArguments.Add(sNewName);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, &whatArguments, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, &whatArguments, L"InvalidArgument", NULL);
}
//Make sure def with old name is present
@@ -739,7 +739,7 @@
//nope, not there
MgStringCollection arguments;
arguments.Add(sOldName);
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make sure def with new name is *not* present
@@ -747,7 +747,7 @@
if (bHas)
{
//there's already a def with that name
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
}
INT32 lMagic;
@@ -770,7 +770,7 @@
size_t nRead=CS_fread(reinterpret_cast<char *>(&ulFileSize), sizeof(ulFileSize), 1, pFile);
if (1!=nRead)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//Overwrite the def
@@ -789,7 +789,7 @@
}
catch (std::bad_alloc)
{
- throw new MgApplicationException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, NULL, L"BadAlloc", NULL);
+ throw new MgException(L"MgCoordinateSystemCategoryDictionary.Rename", __LINE__, __WFILE__, NULL, L"BadAlloc", NULL);
}
CCategoryNameList::iterator iterList;
for (iterList = List().begin(); iterList != List().end(); ++iterList)
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -87,7 +87,7 @@
if (NULL == pEl.p)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.GetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumInitializationFailedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.GetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumInitializationFailedException", NULL);
}
return pEl.Detach();
@@ -118,7 +118,7 @@
//Make sure the specified datum is valid
if (def.key_nm[0]=='\0')
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//init the datum defintion part
@@ -159,7 +159,7 @@
Ptr<MgDisposable> disposableCsObject = ellipsoidsIterator->second;
MgCoordinateSystemEllipsoid* ellipsoidInfo = dynamic_cast<MgCoordinateSystemEllipsoid*>(disposableCsObject.p);
if (NULL == ellipsoidInfo)
- throw new MgApplicationException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
pEllipsoid = SAFE_ADDREF(ellipsoidInfo);
}
@@ -172,7 +172,7 @@
Ptr<MgCoordinateSystemEllipsoidDictionary> pElDict = m_pCatalog->GetEllipsoidDictionary();
if (!pElDict)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumNoEllipsoidDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumNoEllipsoidDictionaryException", NULL);
}
//load the ellipsoid defintion from the dictionary
@@ -181,7 +181,7 @@
}
if (NULL == pEllipsoid)
- throw new MgApplicationException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumNoEllipsoidInDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.InitFromCatalog", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumNoEllipsoidInDictionaryException", NULL);
//Initialize from ellipsoid definitions we have
SetEllipsoidDefinition(dynamic_cast<MgCoordinateSystemEllipsoid*>(pEllipsoid.p));
@@ -228,13 +228,13 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (sCode.empty())
{
//null pointer is obviously not legal...
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -249,7 +249,7 @@
{
//illegal string
delete [] pStr;
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetDtCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Copy into the definitions, dtdef and cs_datum_ must be in synch
@@ -323,7 +323,7 @@
assert(NULL != pCatalog);
if (NULL == pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.IsUsable", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.IsUsable", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//First, make sure it's valid in its own right; if it's
@@ -341,7 +341,7 @@
Ptr<MgCoordinateSystemEllipsoidDictionary> pElDict=pCatalog->GetEllipsoidDictionary();
if (!pElDict)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumNoEllipsoidDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.IsUsable", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumNoEllipsoidDictionaryException", NULL);
}
//Build a wchar_t* from the ellipsoid name
@@ -366,7 +366,7 @@
assert(NULL != pDef);
if (NULL == pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure it's a datum definition
@@ -380,7 +380,7 @@
cs_Dtdef_ def;
if (!BuildDtDefFromInterface(pDtDef, def))
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.IsSameAs", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.IsSameAs", __LINE__, __WFILE__, NULL, L"", NULL);
}
//And compare with this one!
@@ -681,13 +681,13 @@
if (Protected())
{
//can't change a read-only object
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoid", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoid", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
//Make sure it's a legal datum name
if (!IsLegalMentorName(sEllipsoid.c_str()))
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoid", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoid", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert wchar_t* to C++ string
@@ -755,7 +755,7 @@
if (NULL == pEllipsoidDef)
{
//We were given an uninitialized datum.
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
STRING sEllipsoid=pEllipsoidDef->GetElCode();
@@ -763,7 +763,7 @@
//Make sure it's a legal datum name
if (!IsLegalMentorName(sEllipsoid.c_str()))
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert wchar_t* to C++ string
@@ -788,7 +788,7 @@
bool bResult = BuildElDefFromInterface(pEllipsoidDef, eldef);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//Make sure the datum's specified ellipsoid matches the
@@ -801,7 +801,7 @@
|| (0 != CS_nampp(eldef.key_nm))
|| (0 != CS_stricmp(m_DtDef.ell_knm, eldef.key_nm)))
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumMismatchException", NULL);
}
//Build a cs_Datum_ from the datum and ellipsoid definitions
@@ -810,7 +810,7 @@
CriticalClass.Leave();
if (NULL == pDatum)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumInternalException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetEllipsoidDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumInternalException", NULL);
}
//Okay, everything succeeded. Hang on to a copy of the
@@ -858,19 +858,19 @@
assert(NULL != pDest);
if (NULL==pDest)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (!IsLegalString(sSrc.c_str(), nMaxSize))
{
//Can't set string, caller gave us an illegal value
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -906,7 +906,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -954,7 +954,7 @@
{
m_bEncrypted = bPrevEncrypted;
m_DtDef = prevDef;
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -969,7 +969,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatum.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatum.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -332,7 +332,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"MgInvalidArgumentException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"MgInvalidArgumentException", NULL);
}
MentorDictionary::SetFileName(
@@ -396,7 +396,7 @@
nSize=(ulFileBytes - sizeof(m_lMagic)) / nRecSize;
if (0!=CS_fclose(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
return nSize;
@@ -417,13 +417,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemDatum* pDatumDef=dynamic_cast<MgCoordinateSystemDatum*>(pDefinition);
if (!pDatumDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Dtdef_, MgCoordinateSystemDatum>(
@@ -462,13 +462,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemDatum* pDatumDef=dynamic_cast<MgCoordinateSystemDatum*>(pDefinition);
if (!pDatumDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Dtdef_, MgCoordinateSystemDatum>(
@@ -519,7 +519,7 @@
//wasn't there!
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetDatum", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.GetDatum", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
//Okay, at this point we have a Mentor coordsys definition
@@ -662,7 +662,7 @@
}
if (NULL == m_pmapSystemNameDescription)
{
- throw new MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -675,7 +675,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 MgApplicationException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ mgException = new MgException(L"MgCoordinateSystemDatumDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
pFile = NULL;
}
@@ -699,11 +699,11 @@
/*IN, optional*/const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == targetDictionary)
- throw new MgApplicationException(L"CCoordinateSystemDatumDictionary.ReadAllDatums", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"CCoordinateSystemDatumDictionary.ReadAllDatums", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -166,7 +166,7 @@
nNameSize = sizeof(v8.key_nm);
return;
default:
- throw new MgApplicationException(
+ throw new MgException(
L"GetCoordinateSystemSizeInfo", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
@@ -351,7 +351,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
MentorDictionary::SetFileName(
@@ -414,7 +414,7 @@
if (0!=CS_fclose(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
return nSize;
@@ -434,13 +434,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystem* pCoordinateSystem=dynamic_cast<MgCoordinateSystem*>(pDefinition);
if (!pCoordinateSystem)
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Csdef_, MgCoordinateSystem>(
@@ -478,13 +478,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystem* pCoordinateSystem=dynamic_cast<MgCoordinateSystem*>(pDefinition);
if (!pCoordinateSystem)
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Csdef_, MgCoordinateSystem>(
@@ -532,7 +532,7 @@
//wasn't there!
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetCoordinateSystem", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.GetCoordinateSystem", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
//Okay, at this point we have a Mentor coordsys definition
@@ -623,11 +623,11 @@
/*IN, optional*/ const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == targetDictionary)
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
CCoordinateSystemDictionary* csDictionary = dynamic_cast<CCoordinateSystemDictionary*>(targetDictionary);
if (NULL == csDictionary)
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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;
@@ -727,7 +727,7 @@
}
if (NULL == m_pmapSystemNameDescription)
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -736,7 +736,7 @@
if (0!=CS_fclose(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
pFile=NULL;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -27,7 +27,7 @@
: dictMagicNumber(0) /* no yet initialized - will be read in [SetFileName] */, dictionaryItems(NULL)
{
if (NULL == pCatalog)
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.ctor()", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.ctor()", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
this->catalog = SAFE_ADDREF(pCatalog); // 'Ptr = ' does not increment the ref counter
this->fileName = defaultFileName; //template default parameter
@@ -135,7 +135,7 @@
if(NULL != pFile && (0 != CS_fclose(pFile)))
{
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.GetSize", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.GetSize", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
MG_THROW()
@@ -149,11 +149,11 @@
{
//we won't take ownership of [pDefinition]; i.e. it can be deleted by the caller after we're done here
if (NULL == pDefinition)
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
T* pDictionaryDef = dynamic_cast<T*>(pDefinition);
if (!pDictionaryDef)
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.Add", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.Add", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//::UpdateDef will lock the (file) resource via [SmartCriticalClass critical(true);]
MentorDictionary::UpdateDef<U, T>(
@@ -185,11 +185,11 @@
void DICTIONARY_BASE_TEMPLATE_METHOD::Modify(MgGuardDisposable *pDefinition)
{
if (NULL == pDefinition)
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
T* pDictionaryDef = dynamic_cast<T*>(pDefinition);
if (!pDictionaryDef)
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.Modify", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.Modify", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//::UpdateDef will lock the (file) resource via [SmartCriticalClass critical(true);]
@@ -232,7 +232,7 @@
{
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.Get", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.Get", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
pDefinition = this->NewItem(); //no AddRef; release if needed
@@ -313,7 +313,7 @@
definitionAccess->readAllDefinitions);
if (NULL == allDictionaryEntries) //whatever happend here - the dictionay file seems to be invalid
- throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.GetEnumImp", __LINE__, __WFILE__, NULL, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"CCoordinateSystemDictionaryBase.GetEnumImp", __LINE__, __WFILE__, NULL, L"CoordinateSystemLoadFailed", NULL);
}
else
{
@@ -331,7 +331,7 @@
&& NULL == mgException.p)
//if there hasn't yet an exception occurred we now have one
//if there was one already we (unfortunately) do now swallow the MgFileIoException
- mgException = new MgApplicationException(L"CCoordinateSystemDictionaryBase.GetEnumImp", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ mgException = new MgException(L"CCoordinateSystemDictionaryBase.GetEnumImp", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
MG_THROW()
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -91,7 +91,7 @@
CS_fclose(pFile);
delete [] pDict;
//It already exists, but it's not supposed to.
- throw new MgApplicationException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
}
if (pFile)
{
@@ -105,7 +105,7 @@
if (1!=nWrite || ferror(pFile))
{
CS_fclose(pFile);
- throw new MgApplicationException(L"MgCoordinateSystemDictionaryUtility.CreateDictionaryFile", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -58,19 +58,19 @@
if (NULL==pDest)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -125,12 +125,12 @@
if (Protected())
{
//Can't modify a read-only object.
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
}
if (sCode.empty())
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
@@ -145,7 +145,7 @@
{
//illegal string
delete [] pStr;
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetElCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Copy into the definition
@@ -225,7 +225,7 @@
assert(NULL != pDef);
if (NULL == pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure it's an ellipsoid definition
@@ -240,7 +240,7 @@
bool bResult = BuildElDefFromInterface(pElDef, def);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.IsSameAs", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//And compare with this one!
@@ -461,21 +461,21 @@
if (Protected())
{
//can't change a read-only object
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemEllipsoidProtectedException", NULL);
}
//Make sure the radii are mathematically valid
if (!IsLegalEllipsoidRadius(dEquatorialRadius)
|| !IsLegalEllipsoidRadius(dPolarRadius))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SetRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Okay, everything's kosher, store the values.
@@ -499,7 +499,7 @@
assert(dFlat <= 1.0);
if ((dFlat < 0.0) || (dFlat > 1.0))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.FlatteningRatioToEccentricity", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.FlatteningRatioToEccentricity", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dEccent = Eccentricity(dFlat);
@@ -520,7 +520,7 @@
assert(dEccent <= 1.0);
if ((dEccent < 0.0) || (dEccent > 1.0))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.EccentToFlat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.EccentToFlat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dFlat = FlatteningRatio(dEccent);
@@ -541,7 +541,7 @@
assert(dFlatteningRatio < 1.0);
if ((dFlatteningRatio < 0.0) || (dFlatteningRatio >= 1.0))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.EquatorialRadiusFromPolarRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.EquatorialRadiusFromPolarRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dEquatorialRadius = dPolarRadius / (1.0 - dFlatteningRatio);
@@ -562,7 +562,7 @@
assert(dFlatteningRatio < 1.0);
if ((dFlatteningRatio < 0.0) || (dFlatteningRatio >= 1.0))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.PolarRadiusFromEquatorialRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.PolarRadiusFromEquatorialRadiusFlatteningRatio", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dPolarRadius = dEquatorialRadius * (1.0 - dFlatteningRatio);
@@ -582,7 +582,7 @@
assert(NULL != pdAzimuth);
if (NULL == pdDistance || NULL == pdAzimuth)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.GreatCircle", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.GreatCircle", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//set up our input variables
@@ -627,7 +627,7 @@
assert(NULL != pdMaxRadius);
if (NULL == pdMinRadius || NULL == pdMaxRadius)
{
- throw new MgApplicationException(L"MentorDictionary.GetRadiusBounds", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorDictionary.GetRadiusBounds", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
*pdMinRadius = kdMinEllipsoidRadius;
@@ -669,7 +669,7 @@
assert(NULL != pdMaxFlat);
if (NULL == pdMinFlat || NULL == pdMaxFlat)
{
- throw new MgApplicationException(L"MentorDictionary.GetFlatteningRatioBounds", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorDictionary.GetFlatteningRatioBounds", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
*pdMinFlat = kdMinEllipsoidFlat;
@@ -713,11 +713,11 @@
if (!IsLegalEllipsoidRadius(dEquatorialRadius))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (!IsLegalEllipsoidRadius(dPolarRadius))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.FlatteningRatioFromRadii", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
dFlat = FlatteningRatio(dEquatorialRadius, dPolarRadius);
@@ -739,7 +739,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -775,7 +775,7 @@
{
m_bEncrypted = bPrevEncrypted;
m_def = prevDef;
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoid.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -790,7 +790,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoid.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -272,7 +272,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.SetFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
MentorDictionary::SetFileName(
@@ -333,7 +333,7 @@
nSize=(ulFileBytes - sizeof(m_lMagic)) / sizeof(cs_Eldef_);
if (0!=CS_fclose(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.GetSize", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
return nSize;
@@ -354,13 +354,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemEllipsoid* pEllipsoidDef=dynamic_cast<MgCoordinateSystemEllipsoid*>(pDefinition);
if (!pEllipsoidDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.Add", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Eldef_, MgCoordinateSystemEllipsoid>(
@@ -403,13 +403,13 @@
assert(NULL != pDefinition);
if (NULL == pDefinition)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
MgCoordinateSystemEllipsoid* pEllipsoidDef=dynamic_cast<MgCoordinateSystemEllipsoid*>(pDefinition);
if (!pEllipsoidDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.Modify", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
MentorDictionary::UpdateDef<cs_Eldef_, MgCoordinateSystemEllipsoid>(
@@ -454,7 +454,7 @@
//wasn't there!
MgStringCollection whatArguments;
whatArguments.Add(sName);
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
}
//Okay, at this point we have a Mentor ellipsoid definition
@@ -487,7 +487,7 @@
if (NULL == pEllipsoidDef.p)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.GetEllipsoid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return pEllipsoidDef.Detach();
@@ -556,7 +556,7 @@
CS_elrd);
if (NULL == m_pmapSystemNameDescription)
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -565,7 +565,7 @@
if (0!=CS_fclose(pFile))
{
- throw new MgApplicationException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgException(L"MgCoordinateSystemEllipsoidDictionary.GetEnum", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
}
pFile=NULL;
@@ -590,11 +590,11 @@
/*IN, optional*/const std::vector<MgCoordinateSystemFilter*>* const filters)
{
if (NULL == targetDictionary)
- throw new MgApplicationException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
CCoordinateSystemEllipsoidDictionary* ellipsoidDictionary = dynamic_cast<CCoordinateSystemEllipsoidDictionary*>(targetDictionary);
if (NULL == ellipsoidDictionary)
- throw new MgApplicationException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemEllipsoidDictionary.ReadAllEllipsoids", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
return MentorDictionary::ReadAllDefinitions<MgCoordinateSystemEllipsoid, cs_Eldef_, CCoordinateSystemEllipsoidDictionary>(
ellipsoidDictionary,
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -135,7 +135,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//is it filtered out?
@@ -226,7 +226,7 @@
if (ulSkipCount != ulSkipped)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -250,7 +250,7 @@
assert(NULL != kpName);
if (!kpName)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//If a Filter hasn't been specified, just return false.
@@ -270,7 +270,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//Evaluate it
@@ -289,7 +289,7 @@
assert(NULL != pDef);
if (!pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -60,7 +60,7 @@
assert(NULL != pDef);
if (!pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
for (size_t i=0; i<m_vectFilter.size(); i++)
@@ -87,7 +87,7 @@
assert(NULL != kpName);
if (!kpName)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//If a filter hasn't been specified, just return false.
@@ -107,7 +107,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//Evaluate it
@@ -169,7 +169,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//check if this category is filtered out or not
@@ -219,7 +219,7 @@
//----------------------------------------------------------
MgStringCollection* CCoordinateSystemEnumCategory::NextDescription(UINT32 ulCount)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
//----------------------------------------------------------
@@ -246,7 +246,7 @@
if (ulSkipCount != ulSkipped)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -85,12 +85,12 @@
if (!m_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemDictionary> pCsDict=m_pCatalog->GetCoordinateSystemDictionary();
if (!pCsDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.Next", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.Next", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
wchar_t* pstr;
@@ -116,7 +116,7 @@
{
MgStringCollection arguments;
arguments.Add(strCsName);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Next", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//is it filtered out?
if (IsFilteredOut(pCs))
@@ -170,12 +170,12 @@
pOutput=new MgStringCollection;
if (!m_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemDictionary> pCsDict=m_pCatalog->GetCoordinateSystemDictionary();
if (!pCsDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.NextDescription", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.NextDescription", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
wchar_t* pstr;
@@ -200,7 +200,7 @@
{
MgStringCollection arguments;
arguments.Add(strCsName);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.NextDescription", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//is it filtered out?
if (IsFilteredOut(pCs))
@@ -243,7 +243,7 @@
if (ulSkipCount != ulSkipped)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -266,7 +266,7 @@
assert(NULL != kpName);
if (!kpName)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Get a def from the set for the Filter to work with
@@ -287,7 +287,7 @@
assert(NULL != kpName);
if (!kpName)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//If a Filter hasn't been specified, just return true.
@@ -299,12 +299,12 @@
if (!m_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemDictionary> pCsDict=m_pCatalog->GetCoordinateSystemDictionary();
if (!pCsDict)
{
- throw new MgApplicationException(L"MgCoordinateSystem.IsFilteredOut", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystem.IsFilteredOut", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
//Get a def from the set for the Filter to work with
@@ -315,7 +315,7 @@
{
MgStringCollection arguments;
arguments.Add(str);
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
//Evaluate it
@@ -333,7 +333,7 @@
assert(NULL != pDef);
if (!pDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnum.IsFilteredOut", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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/CoordSysEnumInteger32.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -59,7 +59,7 @@
assert((NULL != pnValues) || (ulSize == 0));
if (!pnValues)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnumInteger32.SetList", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnumInteger32.SetList", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
delete [] m_pnValues;
@@ -178,7 +178,7 @@
}
if (ulSkipCount != ulSkipped)
{
- throw new MgApplicationException(L"MgCoordinateSystemEnumInteger32.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemEnumInteger32.Skip", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -59,18 +59,18 @@
if (pSource==NULL)
{
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToWkt", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.DefinitionToWkt", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
if (wktFlvrUnknown==GetWktFlavor(nWktFlavor))
{
//invalid argument
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.DefinitionToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
bool bResult = BuildDefsFromInterface(pSource, pCsDef, pDtDef, pElDef);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.DefinitionToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
if (ProjectionIsNerthType (pCsDef->prj_knm))
@@ -157,7 +157,7 @@
Ptr<CCoordinateSystem> pNew = new CCoordinateSystem(m_pCatalog);
if (!pNew->InitArbitrary(csprm))
{
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInitializationFailed", NULL);
}
return pNew.Detach();
}
@@ -336,7 +336,7 @@
//make a coordsys object
if (!pCsDef || !pElDef)
{
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromWkt", &arguments);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.WktToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromWkt", &arguments);
}
else
{
@@ -420,7 +420,7 @@
if (wktFlvrUnknown==GetWktFlavor(nWktFlavor))
{
//invalid argument
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
std::string szMsiName;
@@ -485,7 +485,7 @@
else
{
//invalid source format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//now get the WKT
@@ -500,7 +500,7 @@
{
MgStringCollection arguments;
arguments.Add(strMsiName);
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToWkt", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
INT32 prj=pCsCoordinateSystemDef->GetProjectionCode();
@@ -664,7 +664,7 @@
else
{
//invalid format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.WktToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.WktToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
}
@@ -702,14 +702,14 @@
if (pSource==NULL)
{
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
pszCsSource = Convert_Wide_To_Ascii(sCsSource.c_str());
@@ -752,7 +752,7 @@
else
{
//invalid format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.DefinitionToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH(L"MgCoordinateSystemFormatConverter.DefinitionToCode")
@@ -812,7 +812,7 @@
else
{
//invalid format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//now get the definition
@@ -831,7 +831,7 @@
// Could not create the coordinate system from the code
MgStringCollection arguments;
arguments.Add(sCodeSource);
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromCode", &arguments);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemFailedToCreateCoordinateSystemFromCode", &arguments);
}
MG_CATCH(L"MgCoordinateSystemFormatConverter.CodeToDefinition")
@@ -899,7 +899,7 @@
else
{
//invalid format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
}
@@ -935,7 +935,7 @@
else
{
//invalid format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.CodeToCode", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
MG_CATCH(L"MgCoordinateSystemFormatConverter.CodeToCode")
@@ -995,7 +995,7 @@
else
{
//invalid format
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.IsCodeInDictionary", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.IsCodeInDictionary", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
return bIsPresent;
@@ -1039,7 +1039,7 @@
if (NULL == pCsDict.p)
{
- throw new MgApplicationException(
+ throw new MgException(
L"MgCoordinateSystemFormatConverter.GetCoordinateSystem",
__LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
}
@@ -1068,7 +1068,7 @@
bool bResult=BuildCsDefFromInterface(pCsDef, def);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.ConvertArbitraryToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFormatConverter.ConvertArbitraryToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
char* szWkt=CCsArbitraryCoordinateSystemUtil::ConvertCoordinateSystemToWkt(&def);
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -35,7 +35,7 @@
{
this->geocentricTransformParams = (csGeocentricXformParams*) CS_malc(sizeof(csGeocentricXformParams));
if (NULL == this->geocentricTransformParams)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.Ctor", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.Ctor", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
*this->geocentricTransformParams = params;
}
@@ -103,7 +103,7 @@
break;
default:
- throw new MgApplicationException(L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
this->transformationMethod = analyticalMethodCode;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -56,7 +56,7 @@
this->gridFileParams = (csGridFileXformParams*) CS_malc(sizeof(csGridFileXformParams));
if (NULL == this->gridFileParams)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.Reset", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.Reset", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
memset(this->gridFileParams, 0, sizeof(csGridFileXformParams));
}
@@ -79,7 +79,7 @@
ENSURE_NOT_NULL(gridFiles, L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFileNames");
const INT32 fileNamesCount = gridFiles->GetCount();
if (fileNamesCount > csGRIDI1_FILEMAX)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
bool emptyFileCollection = (0 == fileNamesCount);
csGeodeticXfromParmsFile_* allFiles = emptyFileCollection ? NULL : new csGeodeticXfromParmsFile_[fileNamesCount];
@@ -94,11 +94,11 @@
Ptr<MgDisposable> gridFile = gridFiles->GetItem(i); //calls [AddRef] on the item being returned
CCoordinateSystemGeodeticTransformGridFile* gridFileSetting = dynamic_cast<CCoordinateSystemGeodeticTransformGridFile*>(gridFile.p);
if (NULL == gridFileSetting)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//we only allow for setting valid grid files
if (!gridFileSetting->IsValid())
- throw new MgApplicationException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
//take the values from the settings we have been passed here and set our internal
//[csGridFileXFormat] instance at index [i] to those values
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -57,7 +57,7 @@
this->mulRegParams = (csMultipleRegressionXformParams*) CS_malc(sizeof(csMultipleRegressionXformParams));
if (NULL == this->mulRegParams)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticMultipleRegressionTransformDefParams.Reset", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticMultipleRegressionTransformDefParams.Reset", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
memset(this->mulRegParams, 0, sizeof(csMultipleRegressionXformParams));
}
@@ -107,7 +107,7 @@
break;
default:
- throw new MgApplicationException(L"CCoordinateSystemGeodeticMultipleRegressionTransformDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticMultipleRegressionTransformDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
this->transformationMethod = mulRegTransformationMethod;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -34,7 +34,7 @@
: pathDefinition(NULL), catalog(SAFE_ADDREF(pCatalog))
{
if (NULL == pCatalog)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticPath.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticPath.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
CCoordinateSystemGeodeticPath::~CCoordinateSystemGeodeticPath()
@@ -62,7 +62,7 @@
this->pathDefinition = (cs_GeodeticPath_*)CS_malc(sizeof(cs_GeodeticPath_));
if (NULL == this->pathDefinition)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticPath.Initialize", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticPath.Initialize", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
memset ((void*)this->pathDefinition, 0, sizeof(cs_GeodeticPath_));
}
@@ -155,7 +155,7 @@
const INT32 pathElementCount = pathElements->GetCount();
if (0 == pathElementCount || pathElementCount > csPATH_MAXXFRM)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticPath.SetPathElements", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticPath.SetPathElements", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
cs_GeodeticPathElement_* validElements = new cs_GeodeticPathElement_[pathElementCount];
@@ -169,7 +169,7 @@
Ptr<MgDisposable> collectionItem = pathElements->GetItem(i);
MgCoordinateSystemGeodeticPathElement* pathElement = dynamic_cast<MgCoordinateSystemGeodeticPathElement*>(collectionItem.p);
if (NULL == pathElement)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticPath.SetPathElements", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticPath.SetPathElements", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
cs_GeodeticPathElement_& pathElementDef = validElements[i];
@@ -214,7 +214,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticPath.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticPath.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
UINT8 nVersion=pStreamOut[0];
@@ -229,7 +229,7 @@
if (pathDefinition == NULL)
{
this->pathDefinition = previousPathPtr;
- throw new MgApplicationException (L"MgCoordinateSystemGeodeticPath.SerializeFrom", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException (L"MgCoordinateSystemGeodeticPath.SerializeFrom", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
}
memcpy(pathDefinition, pStreamOut, sizeof(cs_GeodeticPath_));
pStreamOut = pStreamOut + sizeof(cs_GeodeticPath_);
@@ -239,7 +239,7 @@
{
CS_free (this->pathDefinition);
this->pathDefinition = previousPathPtr;
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticPath.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticPath.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
CS_free (previousPathPtr);
}
@@ -255,7 +255,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticPath.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticPath.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//save the version
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -59,7 +59,7 @@
{
cs_GeodeticPathElement_* tempPathElement = (cs_GeodeticPathElement_*) CS_malc(sizeof(cs_GeodeticPathElement_));
if (NULL == tempPathElement)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticPathElement.Reset", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticPathElement.Reset", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
MG_TRY()
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -76,7 +76,7 @@
break;
default:
- throw new MgApplicationException(L"CCoordinateSystemGeodeticStandaloneDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticStandaloneDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
this->m_nStandaloneMethodCode = standaloneMethodCode;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -40,7 +40,7 @@
{
//have we been passed a non-null argument?
if (NULL == this->catalog)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticTransformDef.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
CCoordinateSystemGeodeticTransformDef::~CCoordinateSystemGeodeticTransformDef()
@@ -77,7 +77,7 @@
break;
default:
- throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.Reset", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.Initialize", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.CreateTransformation", __LINE__,__WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(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 MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.GetParameters", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticTransformDef.GetParameters", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
}
}
@@ -311,7 +311,7 @@
}
if (NULL == transformDefParams)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformDef.SetParameters", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformDef.SerializeFrom", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
@@ -446,7 +446,7 @@
assert(NULL != pStream);
if (!pStream)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformDef.SerializeTo", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -46,7 +46,7 @@
: m_pDtcprm(NULL), m_pDtSource(NULL), m_pDtTarget(NULL)
{
if (NULL == pCatalog || NULL == transformationDef)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformation.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticTransformation.ctor", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
//Uninitialize(); //not needed - this does release the resourced held by this instance; we haven't set anything yet
@@ -90,7 +90,7 @@
MgCoordinateSystemDatum *pSourceTmp=GetWGS84IfNull(pSource);
if (!pSourceTmp)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
CCoordinateSystemDatum* pDtSourceImp=dynamic_cast<CCoordinateSystemDatum*>(pSourceTmp);
assert(pDtSourceImp);
@@ -101,7 +101,7 @@
{
SAFE_RELEASE(pSourceTmp);
}
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
//Set up our target datum
@@ -113,7 +113,7 @@
{
SAFE_RELEASE(pSourceTmp);
}
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
CCoordinateSystemDatum* pDtTargetImp=dynamic_cast<CCoordinateSystemDatum*>(pTargetTmp);
assert(pDtTargetImp);
@@ -129,7 +129,7 @@
{
SAFE_RELEASE(pTargetTmp);
}
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotFoundException", NULL);
}
//Set up our datum conversion struct
@@ -139,7 +139,7 @@
assert(pDtcprm);
if (!pDtcprm)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
}
Uninitialize();
@@ -171,7 +171,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetSource", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetSource", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return SAFE_ADDREF(m_pDtSource);
@@ -186,7 +186,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return SAFE_ADDREF(m_pDtTarget);
@@ -221,12 +221,12 @@
if (1==nResult)
{
// Partial failure - Outside the useful range.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
else if (-1==nResult)
{
// Total failure - Outside the mathematical domain.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
pLonLat->SetX(dLongitude);
pLonLat->SetY(dLatitude);
@@ -261,12 +261,12 @@
if (1==nResult)
{
// Partial failure - Outside the useful range.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
else if (-1==nResult)
{
// Total failure - Outside the mathematical domain.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
pCoord=new MgCoordinateXY(dLongitude, dLatitude);
@@ -301,12 +301,12 @@
if (1==nResult)
{
// Partial failure - Outside the useful range.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
else if (-1==nResult)
{
// Total failure - Outside the mathematical domain.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.Shift", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
pCoord=new MgCoordinateXYZ(dLongitude, dLatitude, dZ);
@@ -354,7 +354,7 @@
CCoordinateSystemGeodeticTransformDef* transformDefImpl = dynamic_cast<CCoordinateSystemGeodeticTransformDef*>(transformationDef);
if (NULL == transformDefImpl)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
cs_GeodeticTransform_ csMapTransformDef;
transformDefImpl->CopyTo(csMapTransformDef);
@@ -363,7 +363,7 @@
datumTransform = CSdtcsu2(&csMapTransformDef, createInversed ? cs_DTCDIR_INV : cs_DTCDIR_FWD, cs_DTCFLG_BLK_W);
if (NULL == datumTransform)
- throw new MgApplicationException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"CCoordinateSystemGeodeticTransformation.SetupFromTransformationDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
Ptr<MgCoordinateSystemDatumDictionary> datumDictionary = this->m_pCatalog->GetDatumDictionary();
Ptr<MgCoordinateSystemDatum> srcDatum = datumDictionary->GetDatum(transformationDef->GetSourceDatum());
@@ -470,7 +470,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetX", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetX", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult=def.delta_X;
@@ -485,7 +485,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetY", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetY", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult=def.delta_Y;
@@ -500,7 +500,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetZ", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetOffsetZ", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult=def.delta_Z;
@@ -521,26 +521,26 @@
{
if (!m_pDtSource || !m_pDtTarget)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
CCoordinateSystemDatum* pDatumImp=dynamic_cast<CCoordinateSystemDatum*>(m_pDtSource);
assert(pDatumImp);
if (!pDatumImp)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (!IsLegalDatumOffset(x) ||
@@ -548,7 +548,7 @@
!IsLegalDatumOffset(z))
{
//Caller gave us an illegal value.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetOffset", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
pDatumImp->m_DtDef.delta_X = pDatumImp->m_datum.delta_X = x;
@@ -577,7 +577,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformRotationX", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformRotationX", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult = def.rot_X;
@@ -593,7 +593,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformRotationY", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformRotationY", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult = def.rot_Y;
@@ -609,7 +609,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformRotationZ", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformRotationZ", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult = def.rot_Z;
@@ -625,7 +625,7 @@
cs_Dtdef_ def;
if (!GetDefinitionForGeodeticTransformationParameter(def))
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformBwScale", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.GetBursaWolfeTransformBwScale", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
dResult = def.bwscale;
@@ -648,26 +648,26 @@
{
if (!m_pDtSource || !m_pDtTarget)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"", NULL);
}
//if not WGS84 for the target system, bye bye!
if (m_pDtTarget->GetDtCode()!=kpWGS84Datum)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
CCoordinateSystemDatum* pDatumImp=dynamic_cast<CCoordinateSystemDatum*>(m_pDtSource);
assert(pDatumImp);
if (!pDatumImp)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (!IsLegalDatumRotation(dRotationX) ||
@@ -676,7 +676,7 @@
!::IsLegalBwScale(dBwScale))
{
//Caller gave us an illegal value.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetBursaWolfeTransform", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
pDatumImp->m_DtDef.rot_X = pDatumImp->m_datum.rot_X = dRotationX;
@@ -726,32 +726,32 @@
{
if (!m_pDtSource || !m_pDtTarget)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
CCoordinateSystemDatum* pDatumImp=dynamic_cast<CCoordinateSystemDatum*>(m_pDtSource);
assert(pDatumImp);
if (!pDatumImp)
{
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDatumProtectedException", NULL);
}
if (!IsLegalGeodeticTransformationMethod(nGeodeticTransformationMethod))
{
//Not one of the known datum conversion techniques.
- throw new MgApplicationException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemGeodeticTransformation.SetGeodeticTransformationMethod", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
pDatumImp->m_DtDef.to84_via = pDatumImp->m_datum.to84_via = nGeodeticTransformationMethod;
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -182,7 +182,7 @@
codeOk = GetUnitInfo(unitCode,&lclUnitType,NULL);
if (!codeOk || unitType != lclUnitType)
{
- throw new MgApplicationException(L"MgCoordinateSystemGridSpecification.SetUnits",
+ throw new MgException(L"MgCoordinateSystemGridSpecification.SetUnits",
__LINE__, __WFILE__, NULL, L"InvalidCoordinateSystemUnits", NULL);
}
@@ -352,7 +352,7 @@
GetUnitInfo(trgUnitCode,&trgUnitType,NULL);
if (trgUnitType != m_UnitType)
{
- throw new MgApplicationException(L"MgCoordinateSystemGridSpecification.ConvertUnitsOfValue", __LINE__, __WFILE__, NULL, L"InvalidCoordinateSystemUnits", NULL);
+ throw new MgException(L"MgCoordinateSystemGridSpecification.ConvertUnitsOfValue", __LINE__, __WFILE__, NULL, L"InvalidCoordinateSystemUnits", NULL);
}
// Calculate the appropriate units conversion factor. Since the unit types
@@ -952,14 +952,14 @@
void CCoordinateSystemGridLineCollection::SetItem (INT32 index,MgCoordinateSystemGridLine* value)
{
if (GetAvailableMemory() < m_MemoryThreshold)
- throw new MgApplicationException(L"CCoordinateSystemGridLineCollection.SetItem", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
+ throw new MgException(L"CCoordinateSystemGridLineCollection.SetItem", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
m_GridLineCollection->SetItem (index,value);
}
void CCoordinateSystemGridLineCollection::Add (MgCoordinateSystemGridLine* value)
{
if (GetAvailableMemory() < m_MemoryThreshold)
- throw new MgApplicationException(L"CCoordinateSystemGridLineCollection.Add", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
+ throw new MgException(L"CCoordinateSystemGridLineCollection.Add", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
// The MgDIsposableCollection object does the "SAFE_ADDREF" operation.
m_GridLineCollection->Add (value);
@@ -1024,14 +1024,14 @@
void CCoordinateSystemGridRegionCollection::SetItem (INT32 index, MgCoordinateSystemGridRegion* value)
{
if (GetAvailableMemory() < m_MemoryThreshold)
- throw new MgApplicationException(L"CCoordinateSystemGridRegionCollection.SetItem", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
+ throw new MgException(L"CCoordinateSystemGridRegionCollection.SetItem", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
m_GridRegionCollection->SetItem (index,value);
}
void CCoordinateSystemGridRegionCollection::Add (MgCoordinateSystemGridRegion* value)
{
if (GetAvailableMemory() < m_MemoryThreshold)
- throw new MgApplicationException(L"CCoordinateSystemGridRegionCollection.Add", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
+ throw new MgException(L"CCoordinateSystemGridRegionCollection.Add", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
m_GridRegionCollection->Add (value);
}
@@ -1097,14 +1097,14 @@
void CCoordinateSystemGridTickCollection::SetItem (INT32 index, MgCoordinateSystemGridTick* value)
{
if (GetAvailableMemory() < m_MemoryThreshold)
- throw new MgApplicationException(L"CCoordinateSystemGridTickCollection.SetItem", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
+ throw new MgException(L"CCoordinateSystemGridTickCollection.SetItem", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
m_GridTickCollection->SetItem (index,value);
}
void CCoordinateSystemGridTickCollection::Add (MgCoordinateSystemGridTick* value)
{
if (GetAvailableMemory() < m_MemoryThreshold)
- throw new MgApplicationException(L"CCoordinateSystemGridTickCollection.Add", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
+ throw new MgException(L"CCoordinateSystemGridTickCollection.Add", __LINE__, __WFILE__, NULL, L"GridDensity", NULL);
m_GridTickCollection->Add (value);
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMacro.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMacro.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMacro.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -26,17 +26,17 @@
#ifdef CS_MAP_DEF_VARIABLE
#define VERIFY_INITIALIZED(x) if (NULL == CS_MAP_DEF_VARIABLE) \
- throw new MgApplicationException(x, __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL)
+ throw new MgException(x, __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL)
#else
#define VERIFY_INITIALIZED(x)
#endif
#define VERIFY_NOT_PROTECTED(x) if (this->IsProtected()) \
- throw new MgApplicationException(x, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(x, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
#define ENSURE_NOT_NULL(param,method) \
if (NULL == param) \
- throw new MgApplicationException(method, __LINE__, __WFILE__, NULL, L"NullArgument", NULL)
+ throw new MgException(method, __LINE__, __WFILE__, NULL, L"NullArgument", NULL)
#define DEFINE_GET_STRING(x,y) STRING x::Get##y()
#define DEFINE_SET_STRING(x,y) void x::Set##y(CREFSTRING propertyValue)
@@ -51,7 +51,7 @@
{ \
VERIFY_INITIALIZED(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName)); \
if (this->IsProtected()) \
- throw new MgApplicationException(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName), __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL); \
+ throw new MgException(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName), __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL); \
\
MentorSetString(propertyValue, charBuffer /* target buffer */, sizeof(charBuffer)); \
}
@@ -72,7 +72,7 @@
{ \
VERIFY_INITIALIZED(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName)); \
if (this->IsProtected()) \
- throw new MgApplicationException(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName), __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL); \
+ throw new MgException(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName), __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL); \
\
target = propertyValue;\
}
@@ -82,7 +82,7 @@
{ \
VERIFY_INITIALIZED(MAKE_QUALIFIED_MEMBER_STRING(className,Get##propertyName)); \
if (index < 0 || index > maxIdx) \
- throw new MgApplicationException(MAKE_QUALIFIED_MEMBER_STRING(className,Get##propertyName), __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL); \
+ throw new MgException(MAKE_QUALIFIED_MEMBER_STRING(className,Get##propertyName), __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL); \
\
return target[index]; \
} \
@@ -90,10 +90,10 @@
{ \
VERIFY_INITIALIZED(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName)); \
if (this->IsProtected()) \
- throw new MgApplicationException(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName), __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL); \
+ throw new MgException(MAKE_QUALIFIED_MEMBER_STRING(className,Set##propertyName), __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL); \
\
if (index < 0 || index > maxIdx) \
- throw new MgApplicationException(MAKE_QUALIFIED_MEMBER_STRING(className,Get##propertyName), __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL); \
+ throw new MgException(MAKE_QUALIFIED_MEMBER_STRING(className,Get##propertyName), __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL); \
\
target[index] = propertyValue;\
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -37,7 +37,7 @@
{
if(NULL == pCoordSys)
{
- throw new MgApplicationException(L"MgCoordinateSystemMeasure.MgCoordinateSystemMeasure", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemMeasure.MgCoordinateSystemMeasure", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
m_pCoordSys = SAFE_ADDREF(pCoordSys);
@@ -96,7 +96,7 @@
double distance = 0.0;
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgApplicationException(L"MgCoordinateSystemMeasure.GetDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemMeasure.GetDistance", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
distance = GetDistance(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
@@ -140,7 +140,7 @@
if((NULL == coord1) || (NULL == coord2))
{
- throw new MgApplicationException(L"MgCoordinateSystemMeasure.GetAzimuth", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemMeasure.GetAzimuth", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
azimuth = GetAzimuth(coord1->GetX(), coord1->GetY(), coord2->GetX(), coord2->GetY());
@@ -189,7 +189,7 @@
{
if(NULL == coord)
{
- throw new MgApplicationException(L"MgCoordinateSystemMeasure.GetCoordinate", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -130,7 +130,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.Init", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.Init", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
else
{
@@ -158,7 +158,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.InitFromEllipsoid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.InitFromEllipsoid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
else
{
@@ -186,7 +186,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.InitFromDatum", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.InitFromDatum", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
else
{
@@ -363,7 +363,7 @@
if (m_GridBoundary == 0)
{
// Proceeding without a grid boundary will cause a crash.
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.GetGridLines",
+ throw new MgException(L"MgCoordinateSystemMgrs.GetGridLines",
__LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
@@ -419,7 +419,7 @@
if (m_GridBoundary == 0)
{
// Proceeding without a grid boundary will cause a crash.
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.GetGridRegions",
+ throw new MgException(L"MgCoordinateSystemMgrs.GetGridRegions",
__LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
@@ -449,7 +449,7 @@
if (m_GridBoundary == 0)
{
// Proceeding without a grid boundary will cause a crash.
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.GetGridRegions",
+ throw new MgException(L"MgCoordinateSystemMgrs.GetGridRegions",
__LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
@@ -669,7 +669,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
else
{
@@ -698,7 +698,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
}
else
{
@@ -717,7 +717,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
else
{
@@ -743,7 +743,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
else
{
@@ -777,7 +777,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
else
{
@@ -791,7 +791,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
else
{
@@ -818,7 +818,7 @@
{
if (m_bExceptionsOn)
{
- throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+ throw new MgException(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 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -150,7 +150,7 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterCount", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterCount", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
// for each possible parameter.
int parmIdx = 0;
@@ -174,13 +174,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.IsUsingParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.IsUsingParameter", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterCount", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterCount", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
int nResult = CS_prjprm(NULL, nProjectionCode, ulIndex-1);
@@ -245,12 +245,12 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -263,12 +263,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMin", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -283,12 +283,12 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -301,12 +301,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParameterMax", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -328,13 +328,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -347,12 +347,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamDefault", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -377,13 +377,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -396,12 +396,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamLogicalType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -425,13 +425,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Get information about the parameter
@@ -444,12 +444,12 @@
break;
case 0:
//The projection does not use this parameter.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
break;
case -1:
default:
//Not a valid projection.
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamFormatType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -475,13 +475,13 @@
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
if ((ulIndex < 1) || (ulIndex > knCsNumParams))
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//MENTOR_MAINTENANCE
@@ -497,12 +497,12 @@
}
if (mp->prj_code == cs_PRJCOD_END)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
nIndex = mp->prm_types[ulIndex-1];
if (nIndex <= 0)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
}
paramType = static_cast<INT32>(nIndex);
@@ -535,7 +535,7 @@
{
if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
{
- throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetTagString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemProjectionInformation.GetTagString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
wchar_t* pszTag=Convert_Ascii_To_Wide(StringFromProjection(nProjectionCode));
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -103,7 +103,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.IsValidPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.IsValidPoint", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
//Test the point
@@ -397,7 +397,7 @@
if(NULL == coordinate)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.TransformCoordinate", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.TransformCoordinate", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
m_nTransformStatus = TransformOk; // until we know different
@@ -499,7 +499,7 @@
else
{
// What dimension is this?
- throw new MgApplicationException(L"MgCoordinateSystemTransform.TransformCoordinate", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.TransformCoordinate", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
if (status != TransformOk)
{
@@ -525,7 +525,7 @@
if(NULL == coordinate)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Need to determine type of coordinate to transform
if(coordinate->GetDimension() == MgCoordinateDimension::XY)
@@ -551,7 +551,7 @@
else
{
// What dimension is this?
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
return pCoordinate;
@@ -610,7 +610,7 @@
if(NULL == envelope)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Extract the two defining corners of this envelope.
@@ -745,7 +745,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.GetSource", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.GetSource", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
return SAFE_ADDREF(m_pCsSource.p);
@@ -760,7 +760,7 @@
//Make sure we're initialized
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.GetTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.GetTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
return SAFE_ADDREF(m_pCsTarget.p);
@@ -781,7 +781,7 @@
{
if (NULL == pSource || NULL == pTarget)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
bool bValid;
@@ -790,14 +790,14 @@
bValid = pSource->IsValid();
if (!bValid)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Make sure the destination coordinate system is valid
bValid = pTarget->IsValid();
if (!bValid)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Build Mentor structs out of the source and destination
@@ -805,12 +805,12 @@
bool bResult = BuildCsprmFromInterface(pSource, srcCsprm);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
bResult = BuildCsprmFromInterface(pTarget, dstCsprm);
if (!bResult)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
//Attempt to set up a datum conversion.
@@ -824,7 +824,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 MgApplicationException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.SetSourceAndTarget", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemGeodeticTransformationSetupException", NULL);
}
//Okay, we're all set! Uninitialize ourselves, and
@@ -867,17 +867,17 @@
MgCoordinateSystemGeodeticTransformDef* CCoordinateSystemTransform::GetGeodeticTransformation (INT32 index)
{
if (index < 0 || index >= this->GetGeodeticTransformationCount())
- throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"ArgumentOutOfRange", NULL);
+ throw new MgException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"ArgumentOutOfRange", NULL);
// indexparameter is valid, get a pointer to the appropriate
// CS-MAP transformation object.
cs_GxXform_ *xfrmPtr = m_pDtcprm->xforms [index];
if (NULL == xfrmPtr)
- throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
cs_GeodeticTransform_* xfrmDefPtr = &xfrmPtr->gxDef;
if (NULL == xfrmDefPtr)
- throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
// Extract the name of the transformation.
Ptr<MgCoordinateSystemGeodeticTransformDef> catalogTransformationDef;
@@ -905,7 +905,7 @@
//in this case, CSMAP returns a [xfrmDefPtr] but the actual (explicit) transformation definition
//doesn't exist in the dictionaries
if (NULL == catalogTransformationDef)
- throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemLoadFailed", NULL);
MG_CATCH(L"GetGeodeticTransformation.GetGeodeticTransformation")
@@ -1012,7 +1012,7 @@
assert(NULL != y);
if (NULL == x || NULL == y)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1062,7 +1062,7 @@
assert(NULL != y);
if (NULL == x || NULL == y)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1074,7 +1074,7 @@
assert(IsInitialized());
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
dCoords [2] = 0.0;
@@ -1136,7 +1136,7 @@
assert(NULL != y);
if (NULL == x || NULL == y)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1187,7 +1187,7 @@
assert(NULL != m);
if (NULL == x || NULL == y || NULL == m)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1199,7 +1199,7 @@
assert(IsInitialized());
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
dCoords [2] = 0.0;
@@ -1265,7 +1265,7 @@
assert(NULL != z);
if (NULL == x || NULL == y || NULL == z)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1316,7 +1316,7 @@
assert(NULL != z);
if (NULL == x || NULL == y || NULL == z)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1328,7 +1328,7 @@
assert(IsInitialized());
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
m_nTransformStatus = TransformOk;
@@ -1395,7 +1395,7 @@
assert(NULL != m);
if (NULL == x || NULL == y || NULL == z || NULL == m)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1447,7 +1447,7 @@
assert(NULL != m);
if (NULL == x || NULL == y || NULL == z || NULL == m)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
// Optimization
@@ -1459,7 +1459,7 @@
assert(IsInitialized());
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
m_nTransformStatus = TransformOk;
@@ -1526,17 +1526,17 @@
assert(NULL != xy);
if (NULL == xy)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
assert(pointCount > 0);
if (0 >= pointCount)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
assert(IsInitialized());
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
// Optimization
@@ -1579,7 +1579,7 @@
}
if (TransformTotalFailure <= status)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
}
return;
}
@@ -1594,17 +1594,17 @@
assert(NULL != xyz);
if (NULL == xyz)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
assert(pointCount > 0);
if (0 >= pointCount)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
assert(IsInitialized());
if (!IsInitialized())
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
// Optimization
@@ -1647,7 +1647,7 @@
}
if (TransformTotalFailure <= status)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
}
return;
}
@@ -1892,7 +1892,7 @@
else
{
// Invalid argument value.
- throw new MgApplicationException(L"MgCoordinateSystemTransform.PositionOfValue",
+ throw new MgException(L"MgCoordinateSystemTransform.PositionOfValue",
__LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
@@ -2232,7 +2232,7 @@
if (status == TransformTotalFailure)
{
m_nTransformStatus = TransformTotalFailure;
- throw new MgApplicationException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
}
else if (status == TransformDatumShiftWarning)
{
@@ -2242,7 +2242,7 @@
}
if (!m_bIgnoreDatumShiftWarning)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionWarningException", NULL);
}
}
else if (status != TransformOk)
@@ -2253,7 +2253,7 @@
}
if(!m_bIgnoreOutsideDomainWarning)
{
- throw new MgApplicationException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
+ throw new MgException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemConversionExtentException", NULL);
}
}
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -143,14 +143,14 @@
{
MgStringCollection arguments;
arguments.Add(L""); // dummy argument
- throw new MgApplicationException(L"MgCoordinateSystemUnitInformation.GetScale", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemUnknownUnit", NULL);
+ throw new MgException(L"MgCoordinateSystemUnitInformation.GetScale", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemUnknownUnit", NULL);
}
if (desiredUnitType != unitType)
{
MgStringCollection arguments;
arguments.Add(L""); // dummy argument
- throw new MgApplicationException(L"MgCoordinateSystemUnitInformation.GetScale", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotLinearUnit", NULL);
+ throw new MgException(L"MgCoordinateSystemUnitInformation.GetScale", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotLinearUnit", NULL);
}
return dScale;
@@ -251,7 +251,7 @@
if (NULL == kpTag)
{
//Unknown unit type.
- throw new MgApplicationException(L"MgCoordinateSystemUnitInformation.GetAbbreviation", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemUnitInformation.GetAbbreviation", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Look it up in Mentor's table
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -73,14 +73,14 @@
case kFileIsValid:
break;
case kFileInvalidEmptyString:
- throw new MgApplicationException(wszMethodName, __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(wszMethodName, __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
case kFileInvalidNotADir:
case kFileInvalidIsADir:
{
MgStringCollection arguments;
arguments.Add(sPathName);
- throw new MgApplicationException(wszMethodName, __LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
+ throw new MgException(wszMethodName, __LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
}
break;
case kFileInvalidPath:
@@ -88,16 +88,16 @@
{
MgStringCollection arguments;
arguments.Add(sPathName);
- throw new MgApplicationException(wszMethodName, __LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
+ throw new MgException(wszMethodName, __LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
}
break;
case kFileInvalidCantRead:
case kFileInvalidCantWrite:
- throw new MgApplicationException(wszMethodName, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemCatalogFileLockedException", NULL);
+ throw new MgException(wszMethodName, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemCatalogFileLockedException", NULL);
break;
default:
assert(0);
- throw new MgApplicationException(wszMethodName, __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgException(wszMethodName, __LINE__, __WFILE__, NULL, L"", NULL);
break;
}
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -93,7 +93,7 @@
{
if (key.empty() || NULL == mgException)
{
- throw new MgApplicationException(L"CCoordinateSystemWktFailureCache.Set",
+ throw new MgException(L"CCoordinateSystemWktFailureCache.Set",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -123,7 +123,7 @@
if (key.empty())
{
- throw new MgApplicationException(L"CCoordinateSystemWktFailureCache.Has",
+ throw new MgException(L"CCoordinateSystemWktFailureCache.Has",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -153,7 +153,7 @@
{
if (key.empty())
{
- throw new MgApplicationException(L"CCoordinateSystemWktFailureCache.Get",
+ throw new MgException(L"CCoordinateSystemWktFailureCache.Get",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -58,7 +58,7 @@
bWriting = true;
break;
default:
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
}
@@ -74,7 +74,7 @@
switch (reason)
{
case kFileInvalidEmptyString:
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
break;
case kFileInvalidPath:
case kFileInvalidDoesNotExist:
@@ -82,18 +82,18 @@
{
MgStringCollection arguments;
arguments.Add(kpPath);
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
}
break;
case kFileInvalidCantWrite:
{
MgStringCollection arguments;
arguments.Add(kpPath);
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemDictionaryReadOnlyException", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemDictionaryReadOnlyException", NULL);
}
break;
default:
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"", NULL);
break;
}
//return;
@@ -104,7 +104,7 @@
GetFileModes(nOpenMode, szMode);
if (NULL==(pFile=OpenDictionaryFile(kpPath, szMode, lMagic, ValidMagic)))
{
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryOpenFailedException", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryOpenFailedException", NULL);
}
//If the Mentor version is anything other than current, we're not allowed
@@ -114,7 +114,7 @@
//Sorry, old version. Write access not allowed.
CS_fclose(pFile);
pFile=NULL;
- throw new MgApplicationException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryNoWriteToOldException", NULL);
+ throw new MgException(L"MentorDictionary.Open", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryNoWriteToOldException", NULL);
}
return pFile;
@@ -152,7 +152,7 @@
if (sDirectory.empty())
{
//Directory hasn't been specified yet.
- throw new MgApplicationException(kpMethodName, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+ throw new MgException(kpMethodName, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
}
STRING sPath = sDirectory + sFileName;
@@ -172,7 +172,7 @@
//Try to open the dictionary file
if (!GetMagicFromDictionaryFile(sPath.c_str(), lMagic, ValidMagic))
{
- throw new MgApplicationException(kpMethodName, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryOpenFailedException", NULL);
+ throw new MgException(kpMethodName, __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryOpenFailedException", NULL);
}
}//if dictionary is specified
Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -63,7 +63,7 @@
return false;
//i.e. nResult < 0
- throw new MgApplicationException(L"MentorDictionary.GetNextEntry", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
+ throw new MgException(L"MentorDictionary.GetNextEntry", __LINE__, __WFILE__, NULL, L"FileIo", NULL);
}
//iterates through all entries return a vector of definitions in the same order as they've been returned by CsMap
@@ -90,7 +90,7 @@
return allDictEntries.release();
}
- catch(MgApplicationException* ioException)
+ catch(MgException* ioException)
{
ioException->Release();
}
@@ -122,7 +122,7 @@
allDefs.reset(MentorDictionary::ReadDictionaryEntries<T>(pFile, CS_Trd));
if (NULL == allDefs.get())
- throw new MgApplicationException(L"MentorDictionary.ReadDictionaryEntries", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MentorDictionary.ReadDictionaryEntries", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDictionaryCloseFailedException", NULL);
+ throw new MgException(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 MgApplicationException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
if (0 != definitions.size())
- throw new MgApplicationException(L"MentorDictionary.ReadAllDefinitions", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MentorDictionary.FilterDefinitions", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MentorDictionary.FilterDefinitions", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
//method pointer checks
if (NULL == GetMgItem || NULL == CS_Trd)
- throw new MgApplicationException(L"MentorDictionary.ReadAllDefinitionsCascaded", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(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 MgApplicationException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemDictionary.ReadAllCoordinateSystems", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
const bool doPostProcess = (NULL != PostProcess);
Ptr<MgDisposableCollection> filteredDefinitions = new MgDisposableCollection();
@@ -326,13 +326,13 @@
assert(NULL != kpDef);
if (NULL == kpDef)
{
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
//Make sure the def they've given us is valid
if (NULL != isValid && !CALL_MEMBER_FN(kpDef, isValid)())
{
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Build a definition from the interface
@@ -340,7 +340,7 @@
bool bResult = BuildDefFromInterface(kpDef, def);
if (!bResult)
{
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
const char* keyName = key(def);
@@ -374,7 +374,7 @@
if (bActuallyExists && !bAlreadyExists)
{
//It already exists, but it's not supposed to.
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemDuplicateException", NULL);
}
else if (!bActuallyExists && bAlreadyExists)
{
@@ -382,7 +382,7 @@
STRING message = MgUtil::MultiByteToWideChar(string(keyName));
MgStringCollection arguments;
arguments.Add(message);
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, &arguments, L"CoordinateSystemLoadFailed", NULL);
}
if (verifyNotProtected)
@@ -390,7 +390,7 @@
//If it already exists, make sure it's not protected.
if ((bAlreadyExists) && (IsReallyProtected(sProtect)))
{
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
}
@@ -406,7 +406,7 @@
{
case -1:
//Some sort of Mentor error occurred.
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
return;
case 0:
//The new object was added to the dictionary.
@@ -465,7 +465,7 @@
default:
//This should never happen.
assert(0);
- throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"", NULL);
} //for each possible result of the update
}
@@ -511,7 +511,7 @@
//there. We can return failure without the
//overhead of searching the disk file.
delete [] pName;
- throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
}
//Get def from disk file. We need to do this even if
@@ -525,14 +525,14 @@
STRING message = MgUtil::MultiByteToWideChar(string(pName));
MgStringCollection arguments;
arguments.Add(message);
- throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+ throw new MgException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
}
//Make sure it's not protected
if (IsReallyProtected(pDef->protect))
{
CS_free(pDef);
- throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+ throw new MgException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
}
//Go ahead and attempt to delete it
@@ -550,7 +550,7 @@
else
{
//Failed.
- throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+ throw new MgException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
}
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -1407,14 +1407,14 @@
const wchar_t* context)
{
if (NULL == MagicNumberCallback || NULL == FileNameTarget)
- throw new MgApplicationException(L"MentorUtil.SetDictionaryFileName", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorUtil.SetDictionaryFileName", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
if (sFileName.empty() || dictionaryPath.empty())
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgApplicationException(L"MentorUtil.SetDictionaryFileName", __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL);
+ throw new MgException(L"MentorUtil.SetDictionaryFileName", __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL);
}
char* szCs = NULL;
@@ -1428,7 +1428,7 @@
{
MgStringCollection arguments;
arguments.Add(sFileName);
- throw new MgApplicationException(/*context */ L"MentorUtil.SetDictionaryFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
+ throw new MgException(/*context */ L"MentorUtil.SetDictionaryFileName", __LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
STRING fileNameSet;
@@ -1654,13 +1654,13 @@
if (NULL==pDest)
{
- throw new MgApplicationException(L"MentorSetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MentorSetString", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
if (!IsLegalString(sSrc.c_str(), nMaxSize))
{
//Can't set string, caller gave us an illegal value
- throw new MgApplicationException(L"MentorSetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MentorSetString", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
//Convert to a C++ string, for Mentor's sake
Modified: sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Data/NamedCollection.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -112,7 +112,7 @@
{
MgNamedSerializable* item = FindItem(name);
if (!item)
- throw new MgApplicationException(L"GetItem", __LINE__, __WFILE__, NULL, L"ObjectNotFound", NULL); // EXC::Create(Exception::NLSGetMessage(NLSID(38_ITEMNOTFOUND),name));
+ throw new MgException(L"GetItem", __LINE__, __WFILE__, NULL, L"ObjectNotFound", NULL); // EXC::Create(Exception::NLSGetMessage(NLSID(38_ITEMNOTFOUND),name));
return item;
}
@@ -383,7 +383,7 @@
arguments.Add(L"1");
arguments.Add(MgResources::BlankArgument);
- throw new MgApplicationException(L"MgNamedCollection.IndexOf",
+ throw new MgException(L"MgNamedCollection.IndexOf",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL); // EXC::Create(Exception::NLSGetMessage(NLSID(2_BADPARAMETER)));
}
@@ -493,7 +493,7 @@
foundItem2 = GetItem(index);
if ((foundItem1 != NULL) && (foundItem1.p != foundItem2.p))
- throw new MgApplicationException(L"CheckDuplicate", __LINE__, __WFILE__, NULL, L"DuplicateObject", NULL);
+ throw new MgException(L"CheckDuplicate", __LINE__, __WFILE__, NULL, L"DuplicateObject", NULL);
}
}
Modified: sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Data/NullableProperty.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -70,7 +70,7 @@
MgStringCollection arguments;
arguments.Add(this->GetName());
- throw new MgApplicationException(L"MgNullableProperty.CheckNull",
+ throw new MgException(L"MgNullableProperty.CheckNull",
__LINE__, __WFILE__, &arguments, L"NullPropertyValue", NULL);
}
}
Modified: sandbox/adsk/vik/Common/Foundation/Data/Property.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/Property.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Data/Property.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -70,7 +70,7 @@
arguments.Add(L"1");
arguments.Add(MgResources::BlankArgument);
- throw new MgApplicationException(L"MgProperty.SetName",
+ throw new MgException(L"MgProperty.SetName",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
Modified: sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Data/PropertyDefinition.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -52,7 +52,7 @@
if (propType.empty())
{
- throw new MgApplicationException(L"MgPropertyDefinition.MgPropertyDefinition", __LINE__, __WFILE__, NULL, L"InvalidPropertyType", NULL);
+ throw new MgException(L"MgPropertyDefinition.MgPropertyDefinition", __LINE__, __WFILE__, NULL, L"InvalidPropertyType", NULL);
}
m_propertyType = type;
Modified: sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Data/StringCollection.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -351,7 +351,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgStringCollection.ValidateIndex",
+ throw new MgException(L"MgStringCollection.ValidateIndex",
__LINE__, __WFILE__, &arguments, L"MgInvalidValueTooBig", NULL);
}
else if (index < 0)
@@ -363,7 +363,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgStringCollection.ValidateIndex",
+ throw new MgException(L"MgStringCollection.ValidateIndex",
__LINE__, __WFILE__, &arguments, L"MgInvalidValueTooSmall", NULL);
}
}
Deleted: sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -1,41 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "stdafx.h"
-#include "Foundation.h"
-
-IMPLEMENT_EXCEPTION_DEFAULTS(MgApplicationException, MgException)
-
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Construct a MgApplicationException object.
-///
-MgApplicationException::MgApplicationException(CREFSTRING methodName,
- INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
- CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
- MgException(methodName, lineNumber, fileName,
- whatArguments, whyMessageId, whyArguments)
-{
-}
-
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Destruct the object.
-///
-MgApplicationException::~MgApplicationException() throw()
-{
-}
Deleted: sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Exception/ApplicationException.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -1,72 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef MG_APPLICATION_EXCEPTION_H_
-#define MG_APPLICATION_EXCEPTION_H_
-
-/// \ingroup Exceptions_Module
-
-///////////////////////////////////////////////////////////////////////////////
-/// \brief
-/// Base class for all exceptions representing an application error.
-///
-/// \remarks
-/// This exception is not thrown directly.
-/// Instead an exception derived from it is used, such as
-/// MgConnectionFailedException.
-///
-class MG_FOUNDATION_API MgApplicationException : public MgException
-{
-EXTERNAL_API:
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Destructor for a MgApplicationException object.
- ///
- virtual ~MgApplicationException() throw();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Construct a MgApplicationException object.
- ///
- /// \param methodName
- /// Name of the method where the exception occurred.
- /// \param lineNumber
- /// Line number where the exception occurred.
- /// \param fileName
- /// File name where the exception occurred.
- /// \param whatArguments
- /// Collection of arguments used to format the message that describes what the exception is.
- /// \param whyMessageId
- /// ID of the message that describes why the exception occurs.
- /// \param whyArguments
- /// Collection of arguments used to format the message that describes why the exception occurs.
- ///
- MgApplicationException(CREFSTRING methodName, INT32 lineNumber,
- CREFSTRING fileName, MgStringCollection* whatArguments,
- CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
-
-INTERNAL_API:
-
- DECLARE_EXCEPTION_DEFAULTS(MgApplicationException)
-
-CLASS_ID:
-
- static const INT32 m_cls_id = Foundation_Exception_MgApplicationException;
-};
-
-#endif
Modified: sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Exception/Exception.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -19,8 +19,6 @@
#include "Foundation.h"
-IMPLEMENT_EXCEPTION_ABSTRACT(MgException)
-
MgException::LocaleCallbackFunc MgException::sm_localeCallbackFunc = NULL;
///////////////////////////////////////////////////////////////////////////////
@@ -616,3 +614,9 @@
{
sm_localeCallbackFunc = func;
}
+
+//MgObject Defaults
+MgException::MgException() throw() {}
+MgObject* MgException::CreateObject() { return new MgException(); }
+INT32 MgException::GetClassId() { return m_cls_id; }
+void MgException::Raise() { throw this; }
Modified: sandbox/adsk/vik/Common/Foundation/Exception/Exception.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/Exception.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Exception/Exception.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -35,6 +35,28 @@
///////////////////////////////////////////////////////////////////////////
/// \brief
+ /// Construct the object.
+ ///
+ /// \param methodName
+ /// Name of the method where the exception occurred.
+ /// \param lineNumber
+ /// Line number where the exception occurred.
+ /// \param fileName
+ /// File name where the exception occurred.
+ /// \param whatArguments
+ /// Collection of arguments used to format the message that describes what the exception is.
+ /// \param whyMessageId
+ /// ID of the message that describes why the exception occurs.
+ /// \param whyArguments
+ /// Collection of arguments used to format the message that describes why the exception occurs.
+ ///
+ MgException(CREFSTRING methodName, INT32 lineNumber,
+ CREFSTRING fileName, MgStringCollection* whatArguments,
+ CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
+
+
+ ///////////////////////////////////////////////////////////////////////////
+ /// \brief
/// Retrieve the formatted exception message. This is the localized and
/// end user readable string.
///
@@ -207,27 +229,6 @@
///////////////////////////////////////////////////////////////////////////
/// \brief
- /// Construct the object.
- ///
- /// \param methodName
- /// Name of the method where the exception occurred.
- /// \param lineNumber
- /// Line number where the exception occurred.
- /// \param fileName
- /// File name where the exception occurred.
- /// \param whatArguments
- /// Collection of arguments used to format the message that describes what the exception is.
- /// \param whyMessageId
- /// ID of the message that describes why the exception occurs.
- /// \param whyArguments
- /// Collection of arguments used to format the message that describes why the exception occurs.
- ///
- MgException(CREFSTRING methodName, INT32 lineNumber,
- CREFSTRING fileName, MgStringCollection* whatArguments,
- CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
/// Dispose this object.
///
/// \return
@@ -358,9 +359,13 @@
///
static void RegisterLocaleCallback(LocaleCallbackFunc func);
+ //MgObject defaults
+ static MgObject* CreateObject();
+ virtual INT32 GetClassId();
+ virtual void Raise();
+ protected:
+ MgException() throw();
- DECLARE_EXCEPTION_ABSTRACT(MgException)
-
private:
static LocaleCallbackFunc sm_localeCallbackFunc;
Modified: sandbox/adsk/vik/Common/Foundation/Exception/ExceptionDefs.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/ExceptionDefs.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Exception/ExceptionDefs.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -19,30 +19,6 @@
#define MG_EXCEPTION_DEFS_H_
-#define DECLARE_EXCEPTION_ABSTRACT(className) \
- virtual INT32 GetClassId(); \
- virtual void Raise() = 0; \
- protected: \
- className() throw();
-
-#define IMPLEMENT_EXCEPTION_ABSTRACT(className) \
- className::className() throw() {} \
- INT32 className::GetClassId() { return m_cls_id; }
-
-#define DECLARE_EXCEPTION_DEFAULTS(className) \
- static MgObject* CreateObject(); \
- virtual INT32 GetClassId(); \
- virtual void Raise(); \
- protected: \
- className() throw();
-
-#define IMPLEMENT_EXCEPTION_DEFAULTS(className, parentClassName) \
- className::className() throw() {} \
- MgObject* className::CreateObject() { return new className(); } \
- INT32 className::GetClassId() { return m_cls_id; } \
- void className::Raise() { throw this; } \
-
-
////////////////////////////////////////////////////////////////////////////////////////////
/// MapGuide try/catch/throw macros.
///
@@ -62,11 +38,11 @@
} \
catch (exception& ) \
{ \
- mgException = new MgApplicationException(methodName, __LINE__, __WFILE__, NULL, L"STL Exception", NULL); \
+ mgException = new MgException(methodName, __LINE__, __WFILE__, NULL, L"STL Exception", NULL); \
} \
catch (...) \
{ \
- mgException = new MgApplicationException(methodName, __LINE__, __WFILE__, NULL, L"", NULL); \
+ mgException = new MgException(methodName, __LINE__, __WFILE__, NULL, L"", NULL); \
} \
#define MG_THROW() \
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -195,7 +195,6 @@
// Base exception classes and defines
#include "Exception/ExceptionDefs.h"
#include "Exception/Exception.h"
-#include "Exception/ApplicationException.h"
#include "System/Mutex.h"
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj 2011-12-08 17:44:30 UTC (rev 6316)
@@ -194,7 +194,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="Exception\ApplicationException.cpp" />
<ClCompile Include="Exception\Exception.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
@@ -241,7 +240,6 @@
<ClCompile Include="System\Util.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Exception\ApplicationException.h" />
<ClInclude Include="Exception\Exception.h" />
<ClInclude Include="Exception\ExceptionDefs.h" />
<ClInclude Include="Data\BatchPropertyCollection.h" />
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters 2011-12-08 17:44:30 UTC (rev 6316)
@@ -12,9 +12,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="Exception\ApplicationException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\Exception.cpp">
<Filter>Exception</Filter>
</ClCompile>
@@ -90,9 +87,6 @@
<ClCompile Include="stdafx.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Exception\ApplicationException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\Exception.h">
<Filter>Exception</Filter>
</ClInclude>
Modified: sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/Disposable.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -65,7 +65,7 @@
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Error in MgDisposable::Addref(). Class Name: %W. Called with Reference Count = 0.\n"), GetClassName().c_str()));
#endif
- throw new MgApplicationException(L"MgDisposable.AddRef", __LINE__, __WFILE__, NULL, L"Logic", NULL);
+ throw new MgException(L"MgDisposable.AddRef", __LINE__, __WFILE__, NULL, L"Logic", NULL);
}
return ++m_refCount;
@@ -98,7 +98,7 @@
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Error in MgDisposable::Release(). Class Name: %W. Called with Reference Count <= 0.\n"), GetClassName().c_str()));
#endif
- throw new MgApplicationException(L"MgDisposable.Release", __LINE__, __WFILE__, NULL, L"Logic", NULL);
+ throw new MgException(L"MgDisposable.Release", __LINE__, __WFILE__, NULL, L"Logic", NULL);
}
--m_refCount;
Modified: sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/DisposableCollection.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -79,7 +79,7 @@
MgDisposable* MgDisposableCollection::GetItem(INT32 index) const
{
if (index >= m_size || index < 0)
- throw new MgApplicationException(L"GetItem",__LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
+ throw new MgException(L"GetItem",__LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
// EXC::Create(Exception::NLSGetMessage(_NLSID(_5_INDEXOUTOFBOUNDS)));
return SAFE_ADDREF(m_list[index]);
@@ -102,7 +102,7 @@
m_list[index] = SAFE_ADDREF(value);
}
else
- throw new MgApplicationException(L"SetItem", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
+ throw new MgException(L"SetItem", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
// EXC::Create(GisException::NLSGetMessage(GIS_NLSID(GIS_5_INDEXOUTOFBOUNDS)));
}
@@ -148,7 +148,7 @@
m_size++;
}
else
- throw new MgApplicationException(L"Insert", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
+ throw new MgException(L"Insert", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
// EXC::Create(GisException::NLSGetMessage(GIS_NLSID(GIS_5_INDEXOUTOFBOUNDS)));
}
@@ -222,7 +222,7 @@
m_list[--m_size] = NULL;
}
else
- throw new MgApplicationException(L"RemoveAt", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
+ throw new MgException(L"RemoveAt", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
}
@@ -282,7 +282,7 @@
/// </returns>
MgByteReader* MgDisposableCollection::ToXml()
{
- throw new MgApplicationException(L"MgDisposableCollection.ToXml", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgDisposableCollection.ToXml", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
return NULL;
}
@@ -296,7 +296,7 @@
/// <returns>Returns nothing.</returns>
void MgDisposableCollection::Serialize(MgStream* stream)
{
- throw new MgApplicationException(L"MgDisposableCollection.Serialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgDisposableCollection.Serialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
@@ -308,7 +308,7 @@
/// <returns>Returns nothing.</returns>
void MgDisposableCollection::Deserialize(MgStream* stream)
{
- throw new MgApplicationException(L"MgDisposableCollection.Deserialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgDisposableCollection.Deserialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
Modified: sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -75,7 +75,7 @@
arguments.Add(L"1");
arguments.Add(MgResources::BlankArgument);
- throw new MgApplicationException(
+ throw new MgException(
L"MgFileUtil.ValidateFileName",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
@@ -89,7 +89,7 @@
MgStringCollection whyArguments;
whyArguments.Add(sm_reservedCharacters);
- throw new MgApplicationException(
+ throw new MgException(
L"MgFileUtil.ValidateFileName",
__LINE__, __WFILE__, &arguments, L"MgStringContainsReservedCharacters", &whyArguments);
}
@@ -100,7 +100,7 @@
arguments.Add(L"1");
arguments.Add(fileName);
- throw new MgApplicationException(
+ throw new MgException(
L"MgFileUtil.ValidateFileName",
__LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
}
@@ -148,7 +148,7 @@
{
if (pathname.empty() || extension.empty())
{
- throw new MgApplicationException(L"MgFileUtil.EndsWithExtension",
+ throw new MgException(L"MgFileUtil.EndsWithExtension",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -215,7 +215,7 @@
if (pathname.empty())
{
- throw new MgApplicationException(L"MgFileUtil.GetFileStatus",
+ throw new MgException(L"MgFileUtil.GetFileStatus",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -241,7 +241,7 @@
MgStringCollection arguments;
arguments.Add(pathname);
- throw new MgApplicationException(L"MgFileUtil.GetFileStatus",
+ throw new MgException(L"MgFileUtil.GetFileStatus",
__LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
@@ -390,7 +390,7 @@
MgStringCollection arguments;
arguments.Add(path);
- throw new MgApplicationException(L"MgFileUtil.CreateDirectory",
+ throw new MgException(L"MgFileUtil.CreateDirectory",
__LINE__, __WFILE__, &arguments, L"DuplicateDirectory", NULL);
}
@@ -455,7 +455,7 @@
case ENOENT:
case EACCES:
default:
- throw new MgApplicationException(L"MgFileUtil.MkDir",
+ throw new MgException(L"MgFileUtil.MkDir",
__LINE__, __WFILE__, &arguments, L"FileIo", NULL);
break;
}
@@ -830,7 +830,7 @@
MgStringCollection arguments;
arguments.Add(path);
- throw new MgApplicationException(L"MgFileUtil.ChangeDirectory",
+ throw new MgException(L"MgFileUtil.ChangeDirectory",
__LINE__, __WFILE__, &arguments, L"FileIo", NULL);
}
@@ -843,7 +843,7 @@
MgStringCollection arguments;
arguments.Add(path);
- throw new MgApplicationException(L"MgFileUtil.ChangeDirectory",
+ throw new MgException(L"MgFileUtil.ChangeDirectory",
__LINE__, __WFILE__, &arguments, L"DirectoryNotFound", NULL);
}
@@ -895,7 +895,7 @@
MgStringCollection arguments;
arguments.Add(pathname);
- throw new MgApplicationException(L"MgFileUtil.DeleteFile",
+ throw new MgException(L"MgFileUtil.DeleteFile",
__LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
}
@@ -919,7 +919,7 @@
case ENOENT: // PathnameExists is more reliable. It gets called above, so this error should not be detected.
case EACCES:
default:
- throw new MgApplicationException(L"MgFileUtil.DeleteFile",
+ throw new MgException(L"MgFileUtil.DeleteFile",
__LINE__, __WFILE__, &arguments, L"FileIo", NULL);
break;
}
@@ -945,7 +945,7 @@
{
if (path.empty() || oldFileName.empty() || newFileName.empty())
{
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -977,7 +977,7 @@
{
if (oldPathname.empty() || newPathname.empty())
{
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -986,7 +986,7 @@
MgStringCollection arguments;
arguments.Add(newPathname);
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, &arguments, L"DuplicateFile", NULL);
}
@@ -1001,7 +1001,7 @@
MgStringCollection arguments;
arguments.Add(newPathname);
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, &arguments, L"DuplicateFile", NULL);
}
@@ -1020,7 +1020,7 @@
{
case ENOENT: // File or path specified by oldname not found.
arguments.Add(oldPathname);
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, &arguments, L"FileNotFound", NULL);
break;
@@ -1035,7 +1035,7 @@
MgStringCollection whyArguments;
whyArguments.Add(L"");
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, &arguments, L"MgStringContainsReservedCharacters", &whyArguments);
}
break;
@@ -1046,7 +1046,7 @@
// different path.
default:
arguments.Add(newPathname);
- throw new MgApplicationException(L"MgFileUtil.RenameFile",
+ throw new MgException(L"MgFileUtil.RenameFile",
__LINE__, __WFILE__, &arguments, L"FileIo", NULL);
break;
}
@@ -1109,7 +1109,7 @@
if (0 == tempFileName)
{
- throw new MgApplicationException(
+ throw new MgException(
L"MgFileUtil.GenerateTempFileName", __LINE__, __WFILE__, NULL, L"TemporaryFileNotAvailable", NULL);
}
@@ -1202,7 +1202,7 @@
if (pathname.empty())
{
- throw new MgApplicationException(L"MgFileUtil.IsFileInUse",
+ throw new MgException(L"MgFileUtil.IsFileInUse",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
Modified: sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/FoundationClassId.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -43,58 +43,7 @@
#define Foundation_Data_Stream FOUNDATION_DATA_ID+8
// Foundation Exception
-#define Foundation_Exception_MgApplicationException FOUNDATION_EXCEPTION_ID+0
-#define Foundation_Exception_MgArgumentOutOfRangeException FOUNDATION_EXCEPTION_ID+1
-#define Foundation_Exception_MgClassNotFoundException FOUNDATION_EXCEPTION_ID+2
-#define Foundation_Exception_MgConfigurationException FOUNDATION_EXCEPTION_ID+3
-#define Foundation_Exception_MgConfigurationLoadFailedException FOUNDATION_EXCEPTION_ID+4
-#define Foundation_Exception_MgConfigurationSaveFailedException FOUNDATION_EXCEPTION_ID+5
-#define Foundation_Exception_MgDateTimeException FOUNDATION_EXCEPTION_ID+6
-#define Foundation_Exception_MgDecryptionException FOUNDATION_EXCEPTION_ID+7
-#define Foundation_Exception_MgDirectoryNotFoundException FOUNDATION_EXCEPTION_ID+8
-#define Foundation_Exception_MgDivideByZeroException FOUNDATION_EXCEPTION_ID+9
-#define Foundation_Exception_MgDomainException FOUNDATION_EXCEPTION_ID+10
-#define Foundation_Exception_MgDuplicateDirectoryException FOUNDATION_EXCEPTION_ID+11
-#define Foundation_Exception_MgDuplicateFileException FOUNDATION_EXCEPTION_ID+12
-#define Foundation_Exception_MgDuplicateObjectException FOUNDATION_EXCEPTION_ID+13
-#define Foundation_Exception_MgEncryptionException FOUNDATION_EXCEPTION_ID+14
-#define Foundation_Exception_MgException FOUNDATION_EXCEPTION_ID+15
-#define Foundation_Exception_MgFileIoException FOUNDATION_EXCEPTION_ID+16
-#define Foundation_Exception_MgFileNotFoundException FOUNDATION_EXCEPTION_ID+17
-#define Foundation_Exception_MgIndexOutOfRangeException FOUNDATION_EXCEPTION_ID+18
-#define Foundation_Exception_MgInvalidArgumentException FOUNDATION_EXCEPTION_ID+19
-#define Foundation_Exception_MgInvalidCastException FOUNDATION_EXCEPTION_ID+20
-#define Foundation_Exception_MgInvalidMimeTypeException FOUNDATION_EXCEPTION_ID+21
-#define Foundation_Exception_MgInvalidOperationException FOUNDATION_EXCEPTION_ID+22
-#define Foundation_Exception_MgInvalidPropertyTypeException FOUNDATION_EXCEPTION_ID+23
-#define Foundation_Exception_MgInvalidStreamHeaderException FOUNDATION_EXCEPTION_ID+24
-#define Foundation_Exception_MgIoException FOUNDATION_EXCEPTION_ID+25
-#define Foundation_Exception_MgLengthException FOUNDATION_EXCEPTION_ID+26
-#define Foundation_Exception_MgLogicException FOUNDATION_EXCEPTION_ID+27
-#define Foundation_Exception_MgNotFiniteNumberException FOUNDATION_EXCEPTION_ID+28
-#define Foundation_Exception_MgNotImplementedException FOUNDATION_EXCEPTION_ID+29
-#define Foundation_Exception_MgNullArgumentException FOUNDATION_EXCEPTION_ID+30
-#define Foundation_Exception_MgNullPropertyValueException FOUNDATION_EXCEPTION_ID+31
-#define Foundation_Exception_MgNullReferenceException FOUNDATION_EXCEPTION_ID+32
-#define Foundation_Exception_MgObjectNotFoundException FOUNDATION_EXCEPTION_ID+33
-#define Foundation_Exception_MgOutOfMemoryException FOUNDATION_EXCEPTION_ID+34
-#define Foundation_Exception_MgOutOfRangeException FOUNDATION_EXCEPTION_ID+35
-#define Foundation_Exception_MgOverflowException FOUNDATION_EXCEPTION_ID+36
-#define Foundation_Exception_MgPlatformNotSupportedException FOUNDATION_EXCEPTION_ID+37
-#define Foundation_Exception_MgResourcesException FOUNDATION_EXCEPTION_ID+38
-#define Foundation_Exception_MgResourcesLoadFailedException FOUNDATION_EXCEPTION_ID+39
-#define Foundation_Exception_MgResourceTagNotFoundException FOUNDATION_EXCEPTION_ID+40
-#define Foundation_Exception_MgRuntimeException FOUNDATION_EXCEPTION_ID+41
-#define Foundation_Exception_MgStreamIoException FOUNDATION_EXCEPTION_ID+42
-#define Foundation_Exception_MgSystemException FOUNDATION_EXCEPTION_ID+43
-#define Foundation_Exception_MgTemporaryFileNotAvailableException FOUNDATION_EXCEPTION_ID+44
-#define Foundation_Exception_MgThirdPartyException FOUNDATION_EXCEPTION_ID+45
-#define Foundation_Exception_MgUnauthorizedAccessException FOUNDATION_EXCEPTION_ID+46
-#define Foundation_Exception_MgUnclassifiedException FOUNDATION_EXCEPTION_ID+47
-#define Foundation_Exception_MgUnderflowException FOUNDATION_EXCEPTION_ID+48
-#define Foundation_Exception_MgXmlException FOUNDATION_EXCEPTION_ID+49
-#define Foundation_Exception_MgXmlParserException FOUNDATION_EXCEPTION_ID+50
-#define Foundation_Exception_MgGridDensityException FOUNDATION_EXCEPTION_ID+51
+#define Foundation_Exception_MgException FOUNDATION_EXCEPTION_ID+0
// Foundation Property
Modified: sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -41,7 +41,7 @@
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Error in MgGuardDisposable::Addref(). Class Name: %W. Called with Reference Count = 0.\n"), GetClassName().c_str()));
#endif
- throw new MgApplicationException(L"MgGuardDisposable.AddRef", __LINE__, __WFILE__, NULL, L"Logic", NULL);
+ throw new MgException(L"MgGuardDisposable.AddRef", __LINE__, __WFILE__, NULL, L"Logic", NULL);
}
return ++m_refCount;
@@ -62,7 +62,7 @@
ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%t) ************ Error in MgGuardDisposable::Release(). Class Name: %W. Called with Reference Count <= 0.\n"), GetClassName().c_str()));
#endif
- throw new MgApplicationException(L"MgGuardDisposable.Release", __LINE__, __WFILE__, NULL, L"Logic", NULL);
+ throw new MgException(L"MgGuardDisposable.Release", __LINE__, __WFILE__, NULL, L"Logic", NULL);
}
--m_refCount;
Modified: sandbox/adsk/vik/Common/Foundation/System/Util.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Util.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/Util.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -203,7 +203,7 @@
arguments.Add(L"1");
arguments.Add(wcStr);
- throw new MgApplicationException(L"MgUtil.WideCharToMultiByte",
+ throw new MgException(L"MgUtil.WideCharToMultiByte",
__LINE__, __WFILE__, &arguments, L"MgInvalidStringConversion", NULL);
}
}
@@ -242,7 +242,7 @@
arguments.Add(L"1");
arguments.Add((NULL == wcBuf) ? L"" : wcBuf);
- throw new MgApplicationException(L"MgUtil.WideCharToMultiByte",
+ throw new MgException(L"MgUtil.WideCharToMultiByte",
__LINE__, __WFILE__, &arguments, L"MgInvalidStringConversion", NULL);
}
@@ -308,7 +308,7 @@
arguments.Add(L"1");
arguments.Add(L"const string&");
- throw new MgApplicationException(L"MgUtil.WideCharToMultiByte",
+ throw new MgException(L"MgUtil.WideCharToMultiByte",
__LINE__, __WFILE__, &arguments, L"MgInvalidStringConversion", NULL);
}
}
@@ -347,7 +347,7 @@
arguments.Add(L"1");
arguments.Add(L"const char*");
- throw new MgApplicationException(L"MgUtil.WideCharToMultiByte",
+ throw new MgException(L"MgUtil.WideCharToMultiByte",
__LINE__, __WFILE__, &arguments, L"MgInvalidStringConversion", NULL);
}
@@ -506,7 +506,7 @@
MgStringCollection whyArguments;
whyArguments.Add(reservedChars);
- throw new MgApplicationException(L"CheckReseveredCharater",
+ throw new MgException(L"CheckReseveredCharater",
__LINE__, __WFILE__, &arguments, L"MgStringContainsReservedCharacters", &whyArguments);
}
}
@@ -552,7 +552,7 @@
arguments.Add(L"1");
arguments.Add(str);
- throw new MgApplicationException(L"MgUtil.CheckBeginEnd",
+ throw new MgException(L"MgUtil.CheckBeginEnd",
__LINE__, __WFILE__, &arguments, L"MgInvalidStringTrim", NULL);
}
}
@@ -592,7 +592,7 @@
{
if (NULL == oldValue || NULL == newValue)
{
- throw new MgApplicationException(L"MgUtil.ReplaceString",
+ throw new MgException(L"MgUtil.ReplaceString",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -759,7 +759,7 @@
if (0 == str)
{
- throw new MgApplicationException(L"MgUtil.GenerateUuid",
+ throw new MgException(L"MgUtil.GenerateUuid",
__LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
}
Modified: sandbox/adsk/vik/Common/Foundation/System/Util.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Util.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Foundation/System/Util.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -591,14 +591,14 @@
#define CHECKNULL(pointer, methodname) \
if (pointer == NULL) \
{ \
- throw new MgApplicationException(methodname, \
+ throw new MgException(methodname, \
__LINE__, __WFILE__, NULL, L"NullReference", NULL); \
}
#define CHECKARGUMENTNULL(pointer, methodname) \
if (pointer == NULL) \
{ \
- throw new MgApplicationException(methodname, \
+ throw new MgException(methodname, \
__LINE__, __WFILE__, NULL, L"NullArgument", NULL); \
}
@@ -607,7 +607,7 @@
{ \
if (NULL != methodName) \
{ \
- throw new MgApplicationException( \
+ throw new MgException( \
methodName, __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL); \
} \
else if (value < min) \
Modified: sandbox/adsk/vik/Common/Geometry/Buffer/MgBuffer.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Buffer/MgBuffer.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Buffer/MgBuffer.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -181,7 +181,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgBuffer.BufferGeometry",
+ throw new MgException(L"MgBuffer.BufferGeometry",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryType", NULL);
}
}
Modified: sandbox/adsk/vik/Common/Geometry/Buffer/oobject.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Buffer/oobject.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Buffer/oobject.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -88,7 +88,7 @@
void *newMemPtr = ::realloc(memPtr, nBytes);
if (!newMemPtr && nBytes != 0)
{
- throw new MgApplicationException(L"OpsObject.ReallocMem", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
+ throw new MgException(L"OpsObject.ReallocMem", __LINE__, __WFILE__, NULL, L"OutOfMemory", NULL);
}
return newMemPtr;
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -90,7 +90,7 @@
{
if (key.empty() || NULL == value)
{
- throw new MgApplicationException(L"MgCoordinateSystemCache.Set",
+ throw new MgException(L"MgCoordinateSystemCache.Set",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -118,7 +118,7 @@
{
if (key.empty())
{
- throw new MgApplicationException(L"MgCoordinateSystemCache.Get",
+ throw new MgException(L"MgCoordinateSystemCache.Get",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -98,7 +98,7 @@
if (NULL == sm_pCatalog)
{
- throw new MgApplicationException(
+ throw new MgException(
L"MgCoordinateSystemFactory.Create",
__LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
@@ -132,7 +132,7 @@
if (NULL == sm_pCatalog)
{
- throw new MgApplicationException(
+ throw new MgException(
L"MgCoordinateSystemFactory.CreateFromCode",
__LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
@@ -185,7 +185,7 @@
{
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.GetCatalog", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.GetCatalog", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return SAFE_ADDREF((MgCoordinateSystemCatalog*)sm_pCatalog);
@@ -219,12 +219,12 @@
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertWktToCoordinateSystemCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertWktToCoordinateSystemCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertWktToCoordinateSystemCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertWktToCoordinateSystemCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
code=pConverter->WktToCode(MgCoordinateSystemWktFlavor::Unknown, wkt, MgCoordinateSystemCodeFormat::Mentor);
@@ -248,12 +248,12 @@
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertCoordinateSystemCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertCoordinateSystemCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertCoordinateSystemCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertCoordinateSystemCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
// Check to see if this is an EPSG code. ie: "EPSG:4326"
@@ -288,12 +288,12 @@
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemCategoryDictionary> pCtDict=sm_pCatalog->GetCategoryDictionary();
if (!pCtDict)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
}
Ptr<MgCoordinateSystemEnum> pEnum=pCtDict->GetEnum();
@@ -301,7 +301,7 @@
categoryNames=pEnum->NextName(nNbCategories);
if (categoryNames->GetCount()!=nNbCategories)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
return categoryNames.Detach();
@@ -326,22 +326,22 @@
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemCategoryDictionary> pCtDict=sm_pCatalog->GetCategoryDictionary();
if (!pCtDict)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
}
Ptr<MgCoordinateSystemCategory> pCategory=pCtDict->GetCategory(category);
if (!pCategory)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryInDictionaryException", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryInDictionaryException", NULL);
}
Ptr<MgCoordinateSystemEnum> pEnum=pCategory->GetEnum();
if (!pEnum)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
for ( ; ; )
@@ -414,12 +414,12 @@
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertEpsgCodeToWkt", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
wchar_t wszEpsg[255];
#ifdef _WIN32
@@ -450,12 +450,12 @@
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.ConvertWktToEpsgCode", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(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);
@@ -481,13 +481,13 @@
{
if (!sm_pCatalog)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
Ptr<MgCoordinateSystemFormatConverter> pConverter=sm_pCatalog->GetFormatConverter();
if (!pConverter)
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.IsValid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
}
try
@@ -534,7 +534,7 @@
// Check the consistency of all these parameters.
if (!gridSpecification->IsConsistent ())
{
- throw new MgApplicationException(L"MgCoordinateSystemFactory.GridSpecification", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgCoordinateSystemFactory.GridSpecification", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
}
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -60,7 +60,7 @@
MgCurveRing* MgCurvePolygon::GetInteriorRing(INT32 index)
{
if (m_innerRings == NULL)
- throw new MgApplicationException(L"MgCurvePolygon.GetInteriorRing", __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL);
+ throw new MgException(L"MgCurvePolygon.GetInteriorRing", __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL);
return m_innerRings->GetItem(index);
}
Modified: sandbox/adsk/vik/Common/Geometry/CurveString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveString.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/CurveString.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -32,7 +32,7 @@
arguments.Add(L"1");
arguments.Add(L"0");
- throw new MgApplicationException(L"MgCurveString.MgCurveString",
+ throw new MgException(L"MgCurveString.MgCurveString",
__LINE__, __WFILE__, &arguments, L"MgGeometryEmpty", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/Envelope.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Envelope.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Envelope.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -59,7 +59,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgEnvelope.MgEnvelope",
+ throw new MgException(L"MgEnvelope.MgEnvelope",
__LINE__, __WFILE__, &arguments, L"MgCoordinateDimensionDifferent", NULL);
}
@@ -78,7 +78,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgEnvelope.MgEnvelope",
+ throw new MgException(L"MgEnvelope.MgEnvelope",
__LINE__, __WFILE__, &arguments, L"MgInvalidEnvelopeCoordinates", NULL);
}
@@ -100,7 +100,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgEnvelope.MgEnvelope",
+ throw new MgException(L"MgEnvelope.MgEnvelope",
__LINE__, __WFILE__, &arguments, L"MgInvalidEnvelopeCoordinates", NULL);
}
@@ -139,7 +139,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgEnvelope.MgEnvelope",
+ throw new MgException(L"MgEnvelope.MgEnvelope",
__LINE__, __WFILE__, &arguments, L"MgInvalidEnvelopeCoordinates", NULL);
}
@@ -155,7 +155,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgEnvelope.MgEnvelope",
+ throw new MgException(L"MgEnvelope.MgEnvelope",
__LINE__, __WFILE__, &arguments, L"MgInvalidEnvelopeCoordinates", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -31,7 +31,7 @@
//
MgGeometricPathIterator* MgGeometricEntity::GetPath()
{
- throw new MgApplicationException(L"MgGeometricEntityImpl.GetPath", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgGeometricEntityImpl.GetPath", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
//////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -235,7 +235,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgGeometry.Buffer",
+ throw new MgException(L"MgGeometry.Buffer",
__LINE__, __WFILE__, &arguments, L"MgValueCannotBeZero", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/LineString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineString.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/LineString.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -35,7 +35,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgLineString.MgLineString",
+ throw new MgException(L"MgLineString.MgLineString",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryTooFewCoordinates", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/LinearRing.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRing.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/LinearRing.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -33,7 +33,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgLinearRing.MgLinearRing",
+ throw new MgException(L"MgLinearRing.MgLinearRing",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryTooFewCoordinates", NULL);
}
@@ -161,7 +161,7 @@
{
//should not be called on geometry components
//components are serialized by the containing geometries
- throw new MgApplicationException(L"MgLinearRing.Serialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgLinearRing.Serialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
//////////////////////////////////////////////////////////////////
@@ -171,7 +171,7 @@
{
//should not be called on geometry components
//components are deserialized by the containing geometries
- throw new MgApplicationException(L"MgLinearRing.Deserialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
+ throw new MgException(L"MgLinearRing.Deserialize", __LINE__, __WFILE__, NULL, L"NotImplemented", NULL);
}
///////////////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -34,7 +34,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgLinearSegment.MgLinearSegment",
+ throw new MgException(L"MgLinearSegment.MgLinearSegment",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryTooFewCoordinates", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/Parse/Array.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Parse/Array.h 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Parse/Array.h 2011-12-08 17:44:30 UTC (rev 6316)
@@ -335,7 +335,7 @@
T& GisArray<T>::GetValue(INT32 i)
{
if (i >= GetCount() || i < 0)
- throw new MgApplicationException(L"GisArray<T>.GetValue", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
+ throw new MgException(L"GisArray<T>.GetValue", __LINE__, __WFILE__, NULL, L"IndexOutOfRange", NULL);
return *(this->GetData()+i);
}
Modified: sandbox/adsk/vik/Common/Geometry/Parse/ArrayHelper.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Parse/ArrayHelper.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Parse/ArrayHelper.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -27,7 +27,7 @@
{
// Disallow possible re-allocation if object is shared.
if (array->m_metadata.refCount > 1)
- throw new MgApplicationException(L"GisArrayHelper.Append", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(L"GisArrayHelper.Append", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
if ( array->m_metadata.size + numElements > array->m_metadata.alloc )
array = AllocMore(array, numElements, false /*exactly*/, elementSize); // We could calculate the difference here, allocating less.
@@ -44,7 +44,7 @@
{
// Disallow possible re-allocation if object is shared.
if (array->m_metadata.refCount > 1)
- throw new MgApplicationException(L"GisArrayHelper.SetSize", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(L"GisArrayHelper.SetSize", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
if ( numElements > array->m_metadata.alloc )
{
@@ -67,10 +67,10 @@
{
// Disallow possible re-allocation if object is shared.
if (array->m_metadata.refCount > 1)
- throw new MgApplicationException(L"GisArrayHelper.SetAlloc", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(L"GisArrayHelper.SetAlloc", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
if (numElements < array->m_metadata.size || numElements < MIN_ALLOC)
- throw new MgApplicationException(L"GisArrayHelper.SetAlloc", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
+ throw new MgException(L"GisArrayHelper.SetAlloc", __LINE__, __WFILE__, NULL, L"InvalidOperation", NULL);
if (array->m_metadata.alloc != numElements)
{
Modified: sandbox/adsk/vik/Common/Geometry/Parse/LexAwkt.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Parse/LexAwkt.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Parse/LexAwkt.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -321,7 +321,7 @@
if (!iswdigit(m_ch))
{
// Exponent shall contain digits
- throw new MgApplicationException(L"GisLexAwkt.getnumber", __LINE__, __WFILE__, NULL, L"NotFiniteNumber", NULL);
+ throw new MgException(L"GisLexAwkt.getnumber", __LINE__, __WFILE__, NULL, L"NotFiniteNumber", NULL);
}
pstr = getdigits(pstr);
*pstr = CHR_NULL;
Modified: sandbox/adsk/vik/Common/Geometry/Parse/ParseAwkt.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Parse/ParseAwkt.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Parse/ParseAwkt.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -81,7 +81,7 @@
if (NULL == pwzAwkt)
{
- throw new MgApplicationException(L"MgParseAwkt.ParseAwkt", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgParseAwkt.ParseAwkt", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
m_lex = new GisLexAwkt(pwzAwkt);
@@ -97,7 +97,7 @@
arguments.Add(L"1");
arguments.Add(pwzAwkt);
- throw new MgApplicationException(L"MgParseAwkt.ParseAwkt",
+ throw new MgException(L"MgParseAwkt.ParseAwkt",
__LINE__, __WFILE__, &arguments, L"MgInvalidAgfText", NULL);
}
@@ -547,7 +547,7 @@
m_types->GetCount() != m_dims->GetCount() ||
m_types->GetCount() != m_starts->GetCount())
{
- throw new MgApplicationException(L"MgParseAwkt.ParseAwkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgParseAwkt.ParseAwkt", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
_types type = (_types) (*m_types)[0];
@@ -620,7 +620,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgParseAwkt.SetGeometryType",
+ throw new MgException(L"MgParseAwkt.SetGeometryType",
__LINE__, __WFILE__, &arguments, L"MgInvalidAgfText", NULL);
}
break;
@@ -807,7 +807,7 @@
arguments.Add(L"0");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgParseAwkt.ParseAwkt",
+ throw new MgException(L"MgParseAwkt.ParseAwkt",
__LINE__, __WFILE__, &arguments, L"MgInvalidAgfText", NULL);
}
break;
Modified: sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -63,7 +63,7 @@
if (ordinates == NULL)
{
- throw new MgApplicationException(L"MgParseAwktUtil.CreateCoordinateCollection", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"MgParseAwktUtil.CreateCoordinateCollection", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
Ptr<MgCoordinateCollection> coordCol = new MgCoordinateCollection();
Modified: sandbox/adsk/vik/Common/Geometry/Polygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Polygon.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Polygon.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -60,7 +60,7 @@
MgLinearRing* MgPolygon::GetInteriorRing(INT32 index)
{
if (m_innerRings == NULL)
- throw new MgApplicationException(L"MgPolygon.GetInteriorRing", __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL);
+ throw new MgException(L"MgPolygon.GetInteriorRing", __LINE__, __WFILE__, NULL, L"ArgumentOutOfRange", NULL);
return m_innerRings->GetItem(index);
}
Modified: sandbox/adsk/vik/Common/Geometry/Spatial/MathUtility.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Spatial/MathUtility.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Spatial/MathUtility.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -79,7 +79,7 @@
// initialize static vars
if (a == NULL || eindex == NULL)
- throw new MgApplicationException(L"GisMathUtility.LUDecompose", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
+ throw new MgException(L"GisMathUtility.LUDecompose", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
if (n <= 0)
{
@@ -90,7 +90,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"GisMathUtility.LUDecompose",
+ throw new MgException(L"GisMathUtility.LUDecompose",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryNoDimension", NULL);
}
@@ -185,7 +185,7 @@
arguments.Add(L"3");
arguments.Add(buffer);
- throw new MgApplicationException(L"GisMathUtility.LUDecompose",
+ throw new MgException(L"GisMathUtility.LUDecompose",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryBadProportion", NULL);
}
Modified: sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -49,7 +49,7 @@
if ( geometry == NULL )
{
- throw new MgApplicationException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
+ throw new MgException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
__LINE__, __WFILE__, NULL, L"NullArgument", NULL);
}
@@ -62,7 +62,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
+ throw new MgException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
__LINE__, __WFILE__, &arguments, L"MgValueCannotBeLessThanZero", NULL);
}
@@ -75,7 +75,7 @@
arguments.Add(L"3");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
+ throw new MgException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
__LINE__, __WFILE__, &arguments, L"MgValueCannotBeLessThanZero", NULL);
}
@@ -174,7 +174,7 @@
arguments.Add(L"1");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
+ throw new MgException(L"MgSpatialUtility.ApproximateGeometryWithLineStrings",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryType", NULL);
}
}
@@ -251,7 +251,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtility.AppendLinearizedCurveSegmentsToDistinctCollection",
+ throw new MgException(L"MgSpatialUtility.AppendLinearizedCurveSegmentsToDistinctCollection",
__LINE__, __WFILE__, &arguments, L"MgInvalidGeometryComponentType", NULL);
}
}
@@ -562,7 +562,7 @@
CHECKNULL(seg2To, L"MgSpatialUtility.SegmentIntersection")
if (magnitude < 1.0E-04)
{
- throw new MgApplicationException(L"MgSpatialUtility.SegmentIntersection", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
+ throw new MgException(L"MgSpatialUtility.SegmentIntersection", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
}
// Compute a tolerance which is appropriate for the data we are working
Modified: sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp 2011-12-08 17:27:20 UTC (rev 6315)
+++ sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp 2011-12-08 17:44:30 UTC (rev 6316)
@@ -339,7 +339,7 @@
if (MgMathUtility::LUDecompose(3, a, eindex ) == 0)
{
// Zero result means that points were collinear.
- throw new MgApplicationException(L"MgSpatialUtilityCircularArc.ComputeCenterFromThreePositions", __LINE__, __WFILE__, NULL, L"CollinearPoints", NULL);
+ throw new MgException(L"MgSpatialUtilityCircularArc.ComputeCenterFromThreePositions", __LINE__, __WFILE__, NULL, L"CollinearPoints", NULL);
}
/* Perform row exchanges for b */
@@ -388,7 +388,7 @@
arguments.Add(L"2");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtilityCircularArc.Linearize",
+ throw new MgException(L"MgSpatialUtilityCircularArc.Linearize",
__LINE__, __WFILE__, &arguments, L"MgValueCannotBeLessThanZero", NULL);
}
@@ -401,7 +401,7 @@
arguments.Add(L"3");
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtilityCircularArc.Linearize",
+ throw new MgException(L"MgSpatialUtilityCircularArc.Linearize",
__LINE__, __WFILE__, &arguments, L"MgValueCannotBeLessThanZero", NULL);
}
@@ -540,7 +540,7 @@
MgStringCollection arguments;
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtilityCircularArc.BestArcStep", __LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
+ throw new MgException(L"MgSpatialUtilityCircularArc.BestArcStep", __LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
}
if (MgMathUtility::SnapToZero(maximumError) <= 0.0)
@@ -550,7 +550,7 @@
MgStringCollection arguments;
arguments.Add(buffer);
- throw new MgApplicationException(L"MgSpatialUtilityCircularArc.BestArcStep", __LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
+ throw new MgException(L"MgSpatialUtilityCircularArc.BestArcStep", __LINE__, __WFILE__, &arguments, L"InvalidArgument", NULL);
}
double arcStep = 0.0;
More information about the mapguide-commits
mailing list