[mapguide-commits] r1370 - in trunk/MgDev/Common: MapGuideCommon/MapLayer PlatformBase/MapLayer

[svn_mapguide at osgeo.org]

Author: stevedang
Date: 2007-03-25 11:54:09 -0400 (Sun, 25 Mar 2007)
New Revision: 1370

Modified:
   trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp
   trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp
   trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp
   trunk/MgDev/Common/PlatformBase/MapLayer/MapBase.cpp
Log:
Some code cleanups in Map Layer projects.

Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp	2007-03-25 02:55:09 UTC (rev 1369)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp	2007-03-25 15:54:09 UTC (rev 1370)
@@ -60,7 +60,7 @@
 
     if (NULL == baseMap)
     {
-        throw new MgNullReferenceException(L"MgLayerBase.GetMap",
+        throw new MgNullReferenceException(L"MgLayer.GetMap",
             __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
@@ -120,7 +120,8 @@
                 Ptr<MgDataPropertyDefinition> prop = dynamic_cast<MgDataPropertyDefinition*>(idProps->GetItem(nIds));
                 if (0 == (MgDataPropertyDefinition*)prop)
                 {
-                    throw new MgInvalidCastException(L"MgLayer::GetLayerInfoFromDefinition", __LINE__, __WFILE__, NULL, L"", NULL);
+                    throw new MgInvalidCastException(L"MgLayer.GetLayerInfoFromDefinition",
+                        __LINE__, __WFILE__, NULL, L"", NULL);
                 }
                 MgLayer::IdProperty idProp;
                 idProp.type = prop->GetDataType();

Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp	2007-03-25 02:55:09 UTC (rev 1369)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Map.cpp	2007-03-25 15:54:09 UTC (rev 1370)
@@ -89,7 +89,7 @@
 {
     if (NULL == m_siteConnection.p)
     {
-        throw new MgNullReferenceException(L"MgMap.GetSiteConnection",
+        throw new MgNullReferenceException(L"MgMap.GetService",
             __LINE__, __WFILE__, NULL, L"", NULL);
     }
 

Modified: trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp	2007-03-25 02:55:09 UTC (rev 1369)
+++ trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp	2007-03-25 15:54:09 UTC (rev 1370)
@@ -171,7 +171,8 @@
 {
     if (m_type == MgLayerType::BaseMap)
     {
-        throw new MgInvalidOperationException(L"MgLayer.SetVisible", __LINE__, __WFILE__, NULL, L"", NULL);
+        throw new MgInvalidOperationException(L"MgLayerBase.SetVisible",
+            __LINE__, __WFILE__, NULL, L"", NULL);
     }
 
     ForceVisible(visible);

Modified: trunk/MgDev/Common/PlatformBase/MapLayer/MapBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/MapLayer/MapBase.cpp	2007-03-25 02:55:09 UTC (rev 1369)
+++ trunk/MgDev/Common/PlatformBase/MapLayer/MapBase.cpp	2007-03-25 15:54:09 UTC (rev 1370)
@@ -277,8 +277,12 @@
 double MgMapBase::GetFiniteDisplayScaleAt(INT32 index)
 {
     INT32 scaleCount = (INT32)m_finiteDisplayScales.size();
+
     if (index >= scaleCount || index < 0)
-        throw new MgIndexOutOfRangeException(L"GetFiniteDisplayScaleAt", __LINE__, __WFILE__, NULL, L"", NULL);
+    {
+        throw new MgIndexOutOfRangeException(L"MgMapBase.GetFiniteDisplayScaleAt",
+            __LINE__, __WFILE__, NULL, L"", NULL);
+    }
 
     return m_finiteDisplayScales.at(index);
 }