[mapguide-commits] r6305 - in sandbox/adsk/vik/Common: CoordinateSystem Geometry/CoordinateSystem

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Dec 8 00:39:51 EST 2011


Author: traianstanev
Date: 2011-12-07 21:39:51 -0800 (Wed, 07 Dec 2011)
New Revision: 6305

Modified:
   sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
   sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.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/CoordSysGeodeticPathDictionary.cpp
   sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.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/MentorDictionary.h
   sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
Log:
Some more varied exception throws replaced by MgApplicationException. Still hundreds more to go.

Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -1554,7 +1554,7 @@
     bool bResult = BuildCsDefFromInterface(pCsDef, def);
     if (!bResult)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.IsSameAs", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.IsSameAs", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     //And compare with this one!
@@ -1939,7 +1939,7 @@
     if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
     {
         //Projection type hasn't been properly initialized.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.GetProjectionParamCount", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.GetProjectionParamCount", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }
 
     // Now for each possible parameter.
@@ -2022,7 +2022,7 @@
     //Can't change read-only items
     if (Protected())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     //Make sure the parameter is in the valid range
@@ -2052,7 +2052,7 @@
     {
         //The specified parameter isn't used by this
         //projection.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetProjectionParameter", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }
 
     //Okay, at this point we know our projection type
@@ -2095,7 +2095,7 @@
     //Make sure we're not read-only
     if (Protected())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetOriginLongitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetOriginLongitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     m_csprm.csdef.org_lng = dOrgLng;
@@ -2122,7 +2122,7 @@
     //Make sure we're not read-only
     if (Protected())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetOriginLatitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetOriginLatitude", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     m_csprm.csdef.org_lat = dOrgLat;
@@ -2152,7 +2152,7 @@
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetOffsets", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetOffsets", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     m_csprm.csdef.x_off = dXOffset;
@@ -2187,7 +2187,7 @@
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetScaleReduction", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetScaleReduction", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
     INT32 prj = ProjectionFromString(m_csprm.csdef.prj_knm);
     if (ProjectionUsesSclRed(prj))
@@ -2216,7 +2216,7 @@
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetMapScale", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetMapScale", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     m_csprm.csdef.map_scl = dMapScale;
@@ -2248,7 +2248,7 @@
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetZeroes", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetZeroes", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     m_csprm.csdef.zero[0] = (dXZero < 0.0)? 0.0 : dXZero;
@@ -2302,7 +2302,7 @@
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     OrderMinMax(dLonMin, dLonMax);
@@ -2332,7 +2332,7 @@
     if (Protected())
     {
         //Can't modify a read-only object.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.CancelLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.CancelLonLatBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     //it will only be set on CsMap's transformation struct, i.e.
@@ -2357,7 +2357,7 @@
     //Make sure we're not read-only
     if (Protected())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     OrderMinMax(dXMin, dXMax);
@@ -2381,7 +2381,7 @@
     //Make sure we're not read-only
     if (Protected())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.CancelXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.CancelXYBounds", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     m_csprm.min_xy[0] = 0.0;
@@ -2410,7 +2410,7 @@
     //Make sure we're not read-only
     if (Protected())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetQuadrant", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetQuadrant", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
     }
 
     if ((sQuad < -4) || (sQuad > 4) || (0 == sQuad))
@@ -2537,7 +2537,7 @@
     //no DT or EL if NERTH projection is used
     if (ProjectionIsNerthType (GetProjectionCode()))
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumIfArbitraryException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDatumIfArbitraryException", NULL);
     }
 
     //Get information out of the datum def
@@ -2545,7 +2545,7 @@
     bool bResult = BuildDtDefFromInterface(pDatum, dtdef);
     if (!bResult)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     //If the coordinate system is not geodetic we need to switch it
@@ -2573,7 +2573,7 @@
         || (0 != CS_nampp(dtdef.key_nm))
         || (0 != CS_stricmp(m_csprm.csdef.dat_knm, dtdef.key_nm)))
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }
 
     //Get information out of the ellipsoid def
@@ -2581,13 +2581,13 @@
     assert(pEllipsoid);
     if (!pEllipsoid)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
     cs_Eldef_ eldef;
     bResult = BuildElDefFromInterface(pEllipsoid, eldef);
     if (!bResult)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     //Okay, at this point we have a cs_Csdef_, cs_Dtdef_, and cs_Eldef_
@@ -2598,7 +2598,7 @@
     CriticalClass.Leave();
     if (NULL == pCsprm)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
     }
 
     //Everything worked okay!  Copy the data into our member variables.
@@ -2607,7 +2607,7 @@
     Ptr<MgCoordinateSystemDatum> pDatumClone = pDatum->CreateClone();
     if (NULL == pDatumClone.p)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
     m_pDatum = pDatumClone;
 
@@ -2617,7 +2617,7 @@
     //Make sure the coordinate system is valid
     if (!IsValid())
     {
-         throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+         throw new MgApplicationException(L"MgCoordinateSystem.SetDatumDefinition", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
     }
 
     MG_CATCH(L"MgCoordinateSystem.SetDatumDefinition")

Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryBase.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -246,7 +246,7 @@
     {
         MgStringCollection whatArguments;
         whatArguments.Add(sName);
-        throw new MgCoordinateSystemLoadFailedException(L"CCoordinateSystemDictionaryBase.Get", __LINE__, __WFILE__, &whatArguments, L"", NULL);
+        throw new MgApplicationException(L"CCoordinateSystemDictionaryBase.Get", __LINE__, __WFILE__, &whatArguments, L"CoordinateSystemLoadFailed", NULL);
     }
 
     pDefinition = this->NewItem(); //no AddRef; release if needed

Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -1000,7 +1000,7 @@
     else
     {
         //invalid format
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemFormatConverter.IsCodeInDictionary", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemFormatConverter.IsCodeInDictionary", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
     }
 
     MG_CATCH_AND_THROW(L"MgCoordinateSystemFormatConverter.IsCodeInDictionary")
@@ -1046,7 +1046,7 @@
 
     if (NULL == pCsDict.p)
     {
-        throw new MgCoordinateSystemInitializationFailedException(
+        throw new MgApplicationException(
             L"MgCoordinateSystemFormatConverter.GetCoordinateSystem",
             __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoDictionaryException", NULL);
     }
@@ -1075,7 +1075,7 @@
     bool bResult=BuildCsDefFromInterface(pCsDef, def);
     if (!bResult)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFormatConverter.ConvertArbitraryToWkt", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(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 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -103,7 +103,7 @@
         break;
 
     default:
-        throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticAnalyticalTransformDefParams.SetTransformationMethod", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(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 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -79,7 +79,7 @@
     ENSURE_NOT_NULL(gridFiles, L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFileNames");
     const INT32 fileNamesCount = gridFiles->GetCount();
     if (fileNamesCount > csGRIDI1_FILEMAX)
-        throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(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 MgInvalidArgumentException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
 
         //we only allow for setting valid grid files
         if (!gridFileSetting->IsValid())
-            throw new MgInvalidArgumentException(L"CCoordinateSystemGeodeticInterpolationTransformDefParams.SetGridFiles", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(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/CoordSysGeodeticPathDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -182,7 +182,7 @@
     {
         return static_cast<MgCoordinateSystemGeodeticPath*>(this->m_pDictionary->Get(sName));
     }
-    catch(MgCoordinateSystemLoadFailedException* loadFailedException)
+    catch(MgException* loadFailedException)
     {
         //catch only the [MgCoordinateSystemLoadFailedException] and release it right away
         loadFailedException->Release();

Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -352,7 +352,7 @@
     GetUnitInfo(trgUnitCode,&trgUnitType,NULL);
     if (trgUnitType != m_UnitType)
     {
-        throw new MgInvalidCoordinateSystemUnitsException(L"MgCoordinateSystemGridSpecification.ConvertUnitsOfValue", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemGridSpecification.ConvertUnitsOfValue", __LINE__, __WFILE__, NULL, L"InvalidCoordinateSystemUnits", NULL);
     }
 
     // Calculate the appropriate units conversion factor.  Since the unit types

Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -130,7 +130,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.Init", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.Init", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
         }
         else
         {
@@ -158,7 +158,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.InitFromEllipsoid", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.InitFromEllipsoid", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
         }
         else
         {
@@ -186,7 +186,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.InitFromDatum", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.InitFromDatum", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
         }
         else
         {
@@ -365,8 +365,8 @@
     if (m_GridBoundary == 0)
     {
         // Proceeding without a grid boundary will cause a crash.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.GetGridLines",
-                                                                   __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemMgrs.GetGridLines",
+                                                                   __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     MG_TRY ()
@@ -423,8 +423,8 @@
     if (m_GridBoundary == 0)
     {
         // Proceeding without a grid boundary will cause a crash.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.GetGridRegions",
-                                                                   __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemMgrs.GetGridRegions",
+                                                                   __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     MG_TRY ()
@@ -455,8 +455,8 @@
     if (m_GridBoundary == 0)
     {
         // Proceeding without a grid boundary will cause a crash.
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.GetGridRegions",
-                                                                   __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemMgrs.GetGridRegions",
+                                                                   __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     MG_TRY ()
@@ -677,7 +677,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
         }
         else
         {
@@ -706,7 +706,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
         }
         else
         {
@@ -725,7 +725,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgNullArgumentException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertFromLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
         }
         else
         {
@@ -751,7 +751,7 @@
     {
         if (m_bExceptionsOn)
         {
-            throw new MgNullArgumentException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MgCoordinateSystemMgrs.ConvertToLonLat", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
         }
         else
         {

Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -493,13 +493,13 @@
 
     if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
     {
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
     }
 
     assert((ulIndex>=1) && (ulIndex<=knCsNumParams));
     if ((ulIndex < 1) || (ulIndex > knCsNumParams))
     {
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
     }
 
     //MENTOR_MAINTENANCE
@@ -515,12 +515,12 @@
     }
     if (mp->prj_code == cs_PRJCOD_END)
     {
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"InvalidArgument", NULL);
     }
     nIndex = mp->prm_types[ulIndex-1];
     if (nIndex <= 0)
     {
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemProjectionInformation.GetParamType", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemMismatchException", NULL);
     }
 
     paramType = static_cast<INT32>(nIndex);
@@ -554,7 +554,7 @@
 {
     if (MgCoordinateSystemProjectionCode::Unknown == nProjectionCode)
     {
-        throw new MgInvalidArgumentException(L"MgCoordinateSystemProjectionInformation.GetTagString", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(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 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -890,17 +890,17 @@
 MgCoordinateSystemGeodeticTransformDef* CCoordinateSystemTransform::GetGeodeticTransformation (INT32 index)
 {
     if (index < 0 || index >= this->GetGeodeticTransformationCount())
-        throw new MgArgumentOutOfRangeException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(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 MgCoordinateSystemInitializationFailedException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
 
     cs_GeodeticTransform_* xfrmDefPtr = &xfrmPtr->gxDef;
     if (NULL == xfrmDefPtr)
-        throw new MgCoordinateSystemInitializationFailedException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
 
     // Extract the name of the transformation.
     Ptr<MgCoordinateSystemGeodeticTransformDef> catalogTransformationDef;
@@ -928,7 +928,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 MgCoordinateSystemLoadFailedException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"GetGeodeticTransformation.GetGeodeticTransformation",__LINE__,__WFILE__, NULL, L"CoordinateSystemLoadFailed", NULL);
 
     MG_CATCH(L"GetGeodeticTransformation.GetGeodeticTransformation")
 
@@ -1037,7 +1037,7 @@
     assert(NULL != y);
     if (NULL == x || NULL == y)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1090,7 +1090,7 @@
     assert(NULL != y);
     if (NULL == x || NULL == y)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1102,7 +1102,7 @@
     assert(IsInitialized());
     if (!IsInitialized())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
     }
 
     dCoords [2] = 0.0;
@@ -1167,7 +1167,7 @@
     assert(NULL != y);
     if (NULL == x || NULL == y)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1221,7 +1221,7 @@
     assert(NULL != m);
     if (NULL == x || NULL == y || NULL == m)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1233,7 +1233,7 @@
     assert(IsInitialized());
     if (!IsInitialized())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
     }
 
     dCoords [2] = 0.0;
@@ -1302,7 +1302,7 @@
     assert(NULL != z);
     if (NULL == x || NULL == y || NULL == z)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1356,7 +1356,7 @@
     assert(NULL != z);
     if (NULL == x || NULL == y || NULL == z)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1368,7 +1368,7 @@
     assert(IsInitialized());
     if (!IsInitialized())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
     }
 
     m_nTransformStatus = TransformOk;
@@ -1437,7 +1437,7 @@
     assert(NULL != m);
     if (NULL == x || NULL == y || NULL == z || NULL == m)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1491,7 +1491,7 @@
     assert(NULL != m);
     if (NULL == x || NULL == y || NULL == z || NULL == m)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.TransformM", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
 
     // Optimization
@@ -1503,7 +1503,7 @@
     assert(IsInitialized());
     if (!IsInitialized())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
     }
 
     m_nTransformStatus = TransformOk;
@@ -1571,17 +1571,17 @@
     assert(NULL != xy);
     if (NULL == xy)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
     assert(pointCount > 0);
     if (0 >= pointCount)
     {
-        throw new MgNullArgumentException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"NullArgument", NULL);
     }
     assert(IsInitialized());
     if (!IsInitialized())
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.Transform", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNotReadyException", NULL);
     }
 
     // Optimization
@@ -1624,7 +1624,7 @@
     }
     if (TransformTotalFailure <= status)
     {
-        throw new MgCoordinateSystemConversionFailedException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemTransform.InterpretStatus", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoConversionDone", NULL);
     }
     return;
 }

Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.h	2011-12-08 05:39:51 UTC (rev 6305)
@@ -340,7 +340,7 @@
         bool bResult = BuildDefFromInterface(kpDef, def);
         if (!bResult)
         {
-            throw new MgCoordinateSystemInitializationFailedException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"", NULL);
+            throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
         }
 
         const char* keyName = key(def);
@@ -382,7 +382,7 @@
             STRING message = MgUtil::MultiByteToWideChar(string(keyName));
             MgStringCollection arguments;
             arguments.Add(message);
-            throw new MgCoordinateSystemLoadFailedException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, &arguments, L"", NULL);
+            throw new MgApplicationException(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 MgCoordinateSystemInitializationFailedException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+                throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
             }
         }
 
@@ -406,7 +406,7 @@
         {
         case -1:
             //Some sort of Mentor error occurred.
-            throw new MgCoordinateSystemInitializationFailedException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+            throw new MgApplicationException(L"MentorDictionary.UpdateDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
             return;
         case 0:
             //The new object was added to the dictionary.
@@ -511,7 +511,7 @@
                 //there.  We can return failure without the
                 //overhead of searching the disk file.
                 delete [] pName;
-                throw new MgCoordinateSystemLoadFailedException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+                throw new MgApplicationException(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 MgCoordinateSystemLoadFailedException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
+            throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, &arguments, L"MgCoordinateSystemNotFoundException", NULL);
         }
 
         //Make sure it's not protected
         if (IsReallyProtected(pDef->protect))
         {
             CS_free(pDef);
-            throw new MgCoordinateSystemInitializationFailedException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
+            throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemProtectedException", NULL);
         }
 
         //Go ahead and attempt to delete it
@@ -550,7 +550,7 @@
         else
         {
             //Failed.
-            throw new MgCoordinateSystemInitializationFailedException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
+            throw new MgApplicationException(L"MentorDictionary.RemoveDef", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemInternalException", NULL);
         }
     }
 

Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2011-12-08 05:13:34 UTC (rev 6304)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp	2011-12-08 05:39:51 UTC (rev 6305)
@@ -315,12 +315,12 @@
 
     if (!sm_pCatalog)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.ToString", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemFactory.ToString", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
     Ptr<MgCoordinateSystemCategoryDictionary> pCtDict=sm_pCatalog->GetCategoryDictionary();
     if (!pCtDict)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
     }
     Ptr<MgCoordinateSystemEnum> pEnum=pCtDict->GetEnum();
 
@@ -328,7 +328,7 @@
     categoryNames=pEnum->NextName(nNbCategories);
     if (categoryNames->GetCount()!=nNbCategories)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCategories", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
 
     MG_CATCH_AND_THROW(L"MgCoordinateSystemFactory.EnumerateCategories")
@@ -357,12 +357,12 @@
 
     if (!sm_pCatalog)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"CoordinateSystemInitializationFailed", NULL);
     }
     Ptr<MgCoordinateSystemCategoryDictionary> pCtDict=sm_pCatalog->GetCategoryDictionary();
     if (!pCtDict)
     {
-        throw new MgCoordinateSystemInitializationFailedException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
+        throw new MgApplicationException(L"MgCoordinateSystemFactory.EnumerateCoordinateSystems", __LINE__, __WFILE__, NULL, L"MgCoordinateSystemNoCategoryDictionaryException", NULL);
     }
     Ptr<MgCoordinateSystemCategory> pCategory=pCtDict->GetCategory(category);
     if (!pCategory)



More information about the mapguide-commits mailing list