[mapguide-commits] r1187 - in trunk/MgDev/Server/src:
Common/Manager Services/Feature Services/Mapping
Services/Rendering UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Mar 8 19:13:51 EST 2007
Author: waltweltonlair
Date: 2007-03-08 19:13:51 -0500 (Thu, 08 Mar 2007)
New Revision: 1187
Modified:
trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureDistribution.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureGeometricFunctions.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureManipulationCommand.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureNumericFunctions.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureServiceCommand.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureStringFunctions.cpp
trunk/MgDev/Server/src/Services/Feature/ServerDataProcessor.cpp
trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
trunk/MgDev/Server/src/Services/Feature/ServerSqlProcessor.cpp
trunk/MgDev/Server/src/Services/Feature/ServerUpdateFeatures.cpp
trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp
trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
Log:
Some smart pointer cleanup.
Silly code:
Ptr<MyClass*> myClass = (MyClass*)NULL;
Better code:
Ptr<MyClass*> myClass;
Silly code:
Ptr<MyClass*> myClass = ...;
...
return SAFE_ADDREF((MyClass*)myClass);
Better code:
Ptr<MyClass*> myClass = ...;
...
return myClass.Detach();
Modified: trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Common/Manager/FdoConnectionManager.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -732,7 +732,7 @@
{
STRING message = MgUtil::GetResourceMessage(MgResources::FeatureService, L"MgMissingConfiguration");
- Ptr<MgStringCollection> strCol = (MgStringCollection*)NULL;
+ Ptr<MgStringCollection> strCol;
if (!message.empty())
{
strCol = new MgStringCollection();
@@ -807,7 +807,7 @@
{
STRING message = MgUtil::GetResourceMessage(MgResources::FeatureService, L"MgInvalidFdoProvider");
- Ptr<MgStringCollection> strCol = (MgStringCollection*)NULL;
+ Ptr<MgStringCollection> strCol;
if (!message.empty())
{
strCol = new MgStringCollection();
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureDistribution.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureDistribution.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureDistribution.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -42,7 +42,7 @@
{
STRING propName;
- Ptr<MgFeatureDistribution> featDist = (MgFeatureDistribution*)NULL;
+ Ptr<MgFeatureDistribution> featDist;
INT32 propType = MgServerFeatureUtil::GetPropertyDefinition(reader, propName);
@@ -75,5 +75,5 @@
L"MgFeatureDistribution.CreateDistributionFunction", __LINE__, __WFILE__, NULL, L"", NULL);
}
}
- return SAFE_ADDREF((MgFeatureDistribution*)featDist);
+ return featDist.Detach();
}
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureGeometricFunctions.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureGeometricFunctions.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureGeometricFunctions.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -160,7 +160,7 @@
{
INT32 funcCode = -1;
- Ptr<MgGeometryCollection> result = (MgGeometryCollection*)NULL;
+ Ptr<MgGeometryCollection> result;
// Get the arguments from the FdoFunction
STRING propertyName;
@@ -212,7 +212,7 @@
}
}
- return SAFE_ADDREF((MgGeometryCollection*)result);
+ return result.Detach();
}
// Check whether property type is a supported type
@@ -239,7 +239,7 @@
// Get the value of property
MgGeometry* MgFeatureGeometricFunctions::GetValue()
{
- Ptr<MgGeometry> geom = (MgGeometry*)NULL;
+ Ptr<MgGeometry> geom;
if (!m_reader->IsNull(m_propertyName))
{
@@ -264,7 +264,7 @@
}
}
- return SAFE_ADDREF((MgGeometry*)geom);
+ return geom.Detach();
}
@@ -273,7 +273,7 @@
// Create the reader for string properties
MgReader* MgFeatureGeometricFunctions::GetReader(MgGeometryCollection* geomCol)
{
- Ptr<MgDataReader> dataReader = (MgDataReader*)NULL;
+ Ptr<MgDataReader> dataReader;
switch(m_type)
{
@@ -289,5 +289,5 @@
L"MgFeatureGeometricFunctions.GetReader", __LINE__, __WFILE__, NULL, L"", NULL);
}
}
- return SAFE_ADDREF((MgDataReader*)dataReader);
+ return dataReader.Detach();
}
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureManipulationCommand.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureManipulationCommand.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureManipulationCommand.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -33,7 +33,7 @@
INT32 cmdType = webCmd->GetCommandType();
bool supports = false;
- Ptr<MgFeatureManipulationCommand> command = (MgFeatureManipulationCommand*)NULL;
+ Ptr<MgFeatureManipulationCommand> command;
switch(cmdType)
{
@@ -75,5 +75,5 @@
throw new MgFeatureServiceException(L"MgFeatureManipulationCommand.CreateCommand", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- return SAFE_ADDREF((MgFeatureManipulationCommand*)command);
+ return command.Detach();
}
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureNumericFunctions.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureNumericFunctions.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureNumericFunctions.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -336,7 +336,7 @@
MgReader* MgFeatureNumericFunctions::GetReader(VECTOR& distValues)
{
- Ptr<MgDataReader> dataReader = (MgDataReader*)NULL;
+ Ptr<MgDataReader> dataReader;
switch(m_type)
{
@@ -388,7 +388,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
}
- return SAFE_ADDREF((MgDataReader*)dataReader);
+ return dataReader.Detach();
}
//MgDataReader* MgFeatureNumericFunctions::GetStringReader(std::vector<STRING>& distValues)
@@ -397,7 +397,7 @@
// Ptr<MgDataReader> dataReader = drCreator->Execute(distValues);
// delete drCreator;
//
-// return SAFE_ADDREF((MgDataReader*)dataReader);
+// return dataReader.Detach();
//}
// Calculate Standard Deviation for the values
@@ -405,7 +405,6 @@
double dataMin, double dataMax,
VECTOR &distValues)
{
-
// Expected categories should be more than zero
if (numCats <= 0)
{
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureServiceCommand.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureServiceCommand.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureServiceCommand.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -24,7 +24,7 @@
MgFeatureServiceCommand* MgFeatureServiceCommand::CreateCommand(MgResourceIdentifier* resource, FdoCommandType commandType)
{
- Ptr<MgFeatureServiceCommand> command = (MgFeatureServiceCommand*)NULL;
+ Ptr<MgFeatureServiceCommand> command;
switch(commandType)
{
case FdoCommandType_Select:
@@ -38,7 +38,7 @@
break;
}
}
- return SAFE_ADDREF((MgFeatureServiceCommand*)command);
+ return command.Detach();
}
bool MgFeatureServiceCommand::IsFdoSupportedFunction(FdoIConnection* connection, FdoFunction* fdoFunc)
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureStringFunctions.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureStringFunctions.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureStringFunctions.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -68,10 +68,7 @@
MgFeatureStringFunctions::~MgFeatureStringFunctions()
{
- if (m_customFunction != NULL)
- {
- m_customFunction->Release();
- }
+ SAFE_RELEASE(m_customFunction);
}
// Execute the function
@@ -189,7 +186,7 @@
// Create the reader for string properties
MgReader* MgFeatureStringFunctions::GetReader(std::vector<STRING>& distValues)
{
- Ptr<MgDataReader> dataReader = (MgDataReader*)NULL;
+ Ptr<MgDataReader> dataReader;
switch(m_type)
{
@@ -205,5 +202,5 @@
L"MgFeatureStringFunctions.GetReader", __LINE__, __WFILE__, NULL, L"", NULL);
}
}
- return SAFE_ADDREF((MgDataReader*)dataReader);
+ return dataReader.Detach();
}
Modified: trunk/MgDev/Server/src/Services/Feature/ServerDataProcessor.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerDataProcessor.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/ServerDataProcessor.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -331,7 +331,7 @@
case MgPropertyType::Blob: // BLOB
{
bool isNull = true;
- Ptr<MgByteReader> val = (MgByteReader*)NULL;
+ Ptr<MgByteReader> val;
if (!m_dataReader->IsNull(propName.c_str()))
{
isNull = false;
@@ -344,7 +344,7 @@
case MgPropertyType::Clob: // CLOB
{
bool isNull = true;
- Ptr<MgByteReader> val = (MgByteReader*)NULL;
+ Ptr<MgByteReader> val;
if (!m_dataReader->IsNull(propName.c_str()))
{
isNull = false;
@@ -356,7 +356,7 @@
}
case MgPropertyType::Geometry: // Geometry object
{
- Ptr<MgByteReader> val = (MgByteReader*)NULL;
+ Ptr<MgByteReader> val;
bool isNull = true;
if (!m_dataReader->IsNull(propName.c_str()))
{
@@ -369,7 +369,7 @@
}
case MgPropertyType::Raster: // Raster object
{
- Ptr<MgRaster> val = (MgRaster*)NULL;
+ Ptr<MgRaster> val;
bool isNull = true;
if (!m_dataReader->IsNull(propName.c_str()))
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -1190,7 +1190,7 @@
// 2) The 1st spatial context returned
// 3) FAIL - none of the above could be satisfied
- Ptr<MgCoordinateSystem> layerCs = (MgCoordinateSystem*)NULL;
+ Ptr<MgCoordinateSystem> layerCs;
if (mapCs)
{
Modified: trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -683,8 +683,9 @@
// Set all properties for grouping
ApplyFdoGroupingProperties(strCol);
+
// Set Grouping Filter
- FdoPtr<FdoFilter> filter = (FdoFilter*)NULL;
+ FdoPtr<FdoFilter> filter;
if (!groupFilter.empty())
{
filter = FdoFilter::Parse((FdoString*)groupFilter.c_str());
Modified: trunk/MgDev/Server/src/Services/Feature/ServerSqlProcessor.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSqlProcessor.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSqlProcessor.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -313,7 +313,7 @@
case MgPropertyType::Blob: // BLOB
{
bool isNull = true;
- Ptr<MgByteReader> val = (MgByteReader*)NULL;
+ Ptr<MgByteReader> val;
if (!m_sqlDataReader->IsNull(propName.c_str()))
{
isNull = false;
@@ -326,7 +326,7 @@
case MgPropertyType::Clob: // CLOB
{
bool isNull = true;
- Ptr<MgByteReader> val = (MgByteReader*)NULL;
+ Ptr<MgByteReader> val;
if (!m_sqlDataReader->IsNull(propName.c_str()))
{
isNull = false;
@@ -338,7 +338,7 @@
}
case MgPropertyType::Geometry: // Geometry object
{
- Ptr<MgByteReader> val = (MgByteReader*)NULL;
+ Ptr<MgByteReader> val;
bool isNull = true;
if (!m_sqlDataReader->IsNull(propName.c_str()))
{
Modified: trunk/MgDev/Server/src/Services/Feature/ServerUpdateFeatures.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerUpdateFeatures.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Feature/ServerUpdateFeatures.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -82,7 +82,7 @@
for (INT32 i = 0; i < cnt; i++)
{
- Ptr<MgProperty> result = (MgProperty*)NULL;
+ Ptr<MgProperty> result;
Ptr<MgFeatureCommand> command = commands->GetItem(i);
Ptr<MgFeatureManipulationCommand> fmServerCommand = MgFeatureManipulationCommand::CreateCommand(command, m_SrvrFeatConn, i);
Modified: trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -310,7 +310,7 @@
(*iter)->Release();
}
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -529,11 +529,10 @@
//see also similar code in GenerateMap above
//find the corresponding MgLayer first
- Ptr<MgLayerBase> layerToAdd = (MgLayer*)NULL;
+ Ptr<MgLayerBase> layerToAdd;
for (int i=0; i<layers->GetCount(); i++)
{
Ptr<MgLayerBase> temp = layers->GetItem(i);
-
if (temp->GetObjectId() == changelist->GetObjectId())
{
layerToAdd = temp;
@@ -647,7 +646,7 @@
if (xformToLL)
delete xformToLL;
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -700,7 +699,7 @@
MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GeneratePlot")
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -757,7 +756,7 @@
MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GeneratePlot")
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -830,7 +829,7 @@
MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GeneratePlot")
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -1229,7 +1228,7 @@
MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GenerateMultiPlot")
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -1376,7 +1375,7 @@
MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GenerateLegendPlot")
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
@@ -1510,7 +1509,7 @@
INT32 geomType,
INT32 themeCategory)
{
- Ptr<MgByteReader> byteReader = (MgByteReader*)NULL;
+ Ptr<MgByteReader> byteReader;
MG_SERVER_MAPPING_SERVICE_TRY()
@@ -1628,7 +1627,7 @@
MG_SERVER_MAPPING_SERVICE_CATCH_AND_THROW(L"MgServerMappingService.GenerateLegendImage")
- return SAFE_ADDREF((MgByteReader*)byteReader);
+ return byteReader.Detach();
}
Modified: trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -153,7 +153,7 @@
MdfModel::NameStringPairCollection* mappings = vl->GetPropertyMappings();
//we want to transform from mapping space to layer space
- Ptr<MgCoordinateSystemTransform> trans = (MgCoordinateSystemTransform*)NULL;
+ Ptr<MgCoordinateSystemTransform> trans;
if (mapCs && layerCs)
{
@@ -172,8 +172,6 @@
}
}
-
-
//start with bounds in mapping space
Ptr<MgCoordinate> ll = new MgCoordinateXY(extent.minx, extent.miny);
Ptr<MgCoordinate> ur = new MgCoordinateXY(extent.maxx, extent.maxy);
@@ -259,7 +257,7 @@
options->SetFilter(vl->GetFilter());
}
- Ptr<MgFeatureReader> rdr = (MgFeatureReader*)NULL;
+ Ptr<MgFeatureReader> rdr;
//poor man's substitute for checking capabilities
//try catch until we succeed...
@@ -317,7 +315,7 @@
//MdfModel::NameStringPairCollection* mappings = gl->GetPropertyMappings();
//we want to transform from mapping space to layer space
- Ptr<MgCoordinateSystemTransform> trans = (MgCoordinateSystemTransform*)NULL;
+ Ptr<MgCoordinateSystemTransform> trans;
if (mapCs && layerCs)
{
@@ -411,7 +409,7 @@
else if (!gl->GetFilter().empty())
options->SetFilter(gl->GetFilter());
- Ptr<MgFeatureReader> rdr = (MgFeatureReader*)NULL;
+ Ptr<MgFeatureReader> rdr;
try
{
@@ -488,7 +486,7 @@
// 2) The 1st spatial context returned
// 3) FAIL - none of the above could be satisfied
- Ptr<MgCoordinateSystem> srcCs = (MgCoordinateSystem*)NULL;
+ Ptr<MgCoordinateSystem> srcCs;
if (dstCs)
{
Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -887,22 +887,19 @@
ACE_DEBUG ((LM_DEBUG, ACE_TEXT("RenderForSelection(): Layer: %W Selectable:%W Visible: %W\n"), layer->GetName().c_str(), layer->GetSelectable() ? L"True" : L"False", layer->IsVisibleAtScale(map->GetViewScale()) ? L"True" : L"False"));
+ //do this first - this check is fast
+ if (!layer->GetSelectable())
+ continue;
+
//do we want to select on this layer -- if caller
//gave us a layer name collection, check if the layer
//is in there
if (layerNames && layerNames->GetCount() > 0 && layerNames->IndexOf(layer->GetName()) == -1)
continue;
- if(bIgnoreScaleRange)
- {
- if (!layer->GetSelectable())
- continue;
- }
- else
- {
- if (!layer->GetSelectable() || !layer->IsVisibleAtScale(map->GetViewScale()))
- continue;
- }
+ //check the visibility at scale if we're not ignoring scale ranges
+ if (!bIgnoreScaleRange && !layer->IsVisibleAtScale(map->GetViewScale()))
+ continue;
//have we processed enough features already?
if (maxFeatures <= 0)
@@ -986,7 +983,7 @@
// 2) The 1st spatial context returned
// 3) FAIL - none of the above could be satisfied
- Ptr<MgCoordinateSystem> layerCs = (MgCoordinateSystem*)NULL;
+ Ptr<MgCoordinateSystem> layerCs;
if (mapCs)
{
@@ -1022,7 +1019,7 @@
}
//we want to transform query geometry from mapping space to layer space
- Ptr<MgCoordinateSystemTransform> trans = (MgCoordinateSystemTransform*)NULL;
+ Ptr<MgCoordinateSystemTransform> trans;
if (mapCs && layerCs)
{
Modified: trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2007-03-09 00:12:31 UTC (rev 1186)
+++ trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2007-03-09 00:13:51 UTC (rev 1187)
@@ -356,7 +356,7 @@
MgGeometryFactory factory;
Ptr<MgGeometryCollection> geometries = new MgGeometryCollection();
- Ptr<MgGeometry> geometry = (MgGeometry*)NULL;
+ Ptr<MgGeometry> geometry;
// CurvePolygon
geometry = (MgGeometry*)CreateCurvePolygon(0);
More information about the mapguide-commits
mailing list