[mapguide-commits] r8278 - in branches/2.6/MgDev/Desktop: . MgDesktop MgDesktop/MapLayer MgDesktop/Services MgDesktop/Services/Feature/Commands
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 4 01:18:40 PDT 2014
Author: jng
Date: 2014-07-04 01:18:40 -0700 (Fri, 04 Jul 2014)
New Revision: 8278
Modified:
branches/2.6/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters
branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h
branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.h
branches/2.6/MgDev/Desktop/MgDesktopApi.sln
Log:
mg-desktop cleanups:
- Add missing Security project to solution
- Change int to INT32 in various public APIs
Modified: branches/2.6/MgDev/Desktop/MgDesktop/MapLayer/Layer.h
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/MapLayer/Layer.h 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/MapLayer/Layer.h 2014-07-04 08:18:40 UTC (rev 8278)
@@ -29,15 +29,15 @@
virtual MgFeatureReader* InsertFeatures(MgPropertyCollection* propertyValues);
- virtual int UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter);
+ virtual INT32 UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter);
- virtual int DeleteFeatures(CREFSTRING filter);
+ virtual INT32 DeleteFeatures(CREFSTRING filter);
virtual MgFeatureReader* InsertFeatures(MgPropertyCollection* propertyValues, MgTransaction* trans);
- virtual int UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 UpdateFeatures(MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- virtual int DeleteFeatures(CREFSTRING filter, MgTransaction* trans);
+ virtual INT32 DeleteFeatures(CREFSTRING filter, MgTransaction* trans);
virtual bool IsPotentiallyVisibleAtScale(double scale, bool bConsiderParentGroupVisibility);
Modified: branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2014-07-04 08:18:40 UTC (rev 8278)
@@ -1137,7 +1137,6 @@
<ClInclude Include="System\TimerUtil.h" />
</ItemGroup>
<ItemGroup>
- <None Include="..\braindump.txt" />
<None Include="Platform.ini" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj.filters 2014-07-04 08:18:40 UTC (rev 8278)
@@ -853,7 +853,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="..\braindump.txt" />
<None Include="Platform.ini" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.cpp 2014-07-04 08:18:40 UTC (rev 8278)
@@ -387,9 +387,9 @@
return ret.Detach();
}
-int MgdUpdateFeaturesCommand::ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdUpdateFeaturesCommand::ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans)
{
- int updated = 0;
+ INT32 updated = 0;
MG_FEATURE_SERVICE_TRY()
@@ -444,9 +444,9 @@
return updated;
}
-int MgdUpdateFeaturesCommand::ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdUpdateFeaturesCommand::ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_FEATURE_SERVICE_TRY()
Modified: branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/Services/Feature/Commands/UpdateFeatures.h 2014-07-04 08:18:40 UTC (rev 8278)
@@ -40,22 +40,14 @@
MgFeatureCommandCollection* commands,
MgTransaction* transaction);
- MgFeatureReader* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues);
-
MgFeatureReader* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, MgTransaction* trans);
- MgPropertyCollection* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues);
-
MgPropertyCollection* ExecuteInsert(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues, MgTransaction* trans);
- int ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
+ INT32 ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- int ExecuteUpdate(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ INT32 ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
- int ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
-
- int ExecuteDelete(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
-
private:
void Connect(MgResourceIdentifier* resource, MgTransaction* transaction);
Modified: branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.cpp 2014-07-04 08:18:40 UTC (rev 8278)
@@ -1143,9 +1143,9 @@
return ret.Detach();
}
-int MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter)
+INT32 MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter)
{
- int ret = 0;
+ INT32 ret = 0;
MG_LOG_OPERATION_MESSAGE(L"UpdateFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1186,9 +1186,9 @@
return ret;
}
-int MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* batchPropertyValues, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdFeatureService::UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* batchPropertyValues, CREFSTRING filter, MgTransaction* trans)
{
- int updated = 0;
+ INT32 updated = 0;
MG_LOG_OPERATION_MESSAGE(L"UpdateFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1233,9 +1233,9 @@
return updated;
}
-int MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter)
+INT32 MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_LOG_OPERATION_MESSAGE(L"DeleteFeatures");
MG_FEATURE_SERVICE_TRY()
@@ -1275,9 +1275,9 @@
return deleted;
}
-int MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
+INT32 MgdFeatureService::DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans)
{
- int deleted = 0;
+ INT32 deleted = 0;
MG_LOG_OPERATION_MESSAGE(L"DeleteFeatures");
MG_FEATURE_SERVICE_TRY()
Modified: branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.h
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.h 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktop/Services/FeatureService.h 2014-07-04 08:18:40 UTC (rev 8278)
@@ -189,13 +189,13 @@
MgPropertyCollection* InsertFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgBatchPropertyCollection* batchPropertyValues, MgTransaction* trans);
- int UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
+ INT32 UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter);
- int UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
+ INT32 UpdateFeatures(MgResourceIdentifier* resource, CREFSTRING className, MgPropertyCollection* propertyValues, CREFSTRING filter, MgTransaction* trans);
- int DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
+ INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter);
- int DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
+ INT32 DeleteFeatures(MgResourceIdentifier* resource, CREFSTRING className, CREFSTRING filter, MgTransaction* trans);
EXTERNAL_API:
void PurgeCache(MgResourceIdentifier* resource);
Modified: branches/2.6/MgDev/Desktop/MgDesktopApi.sln
===================================================================
--- branches/2.6/MgDev/Desktop/MgDesktopApi.sln 2014-07-04 08:15:02 UTC (rev 8277)
+++ branches/2.6/MgDev/Desktop/MgDesktopApi.sln 2014-07-04 08:18:40 UTC (rev 8278)
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Geometry", "..\Common\Geometry\Geometry.vcxproj", "{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}"
@@ -49,6 +49,7 @@
{341D5463-186E-49BA-B942-3D3BE28D65C0} = {341D5463-186E-49BA-B942-3D3BE28D65C0}
{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425} = {A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}
{38161685-88ED-415E-A545-CCC17BE069AE} = {38161685-88ED-415E-A545-CCC17BE069AE}
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B} = {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}
{8F654896-85DC-4F32-99B2-670D66B0FBF1} = {8F654896-85DC-4F32-99B2-670D66B0FBF1}
{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}
{DB2CC2E3-4754-4932-B865-424A44E58FD0} = {DB2CC2E3-4754-4932-B865-424A44E58FD0}
@@ -74,6 +75,8 @@
{C50254F2-654A-48DE-AF5B-20605AEF8D10} = {C50254F2-654A-48DE-AF5B-20605AEF8D10}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Security", "..\Common\Security\Security.vcxproj", "{7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -257,6 +260,14 @@
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.Build.0 = Release|Win32
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|Win32.Build.0 = Debug|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.ActiveCfg = Debug|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Debug|x64.Build.0 = Debug|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.ActiveCfg = Release|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|Win32.Build.0 = Release|Win32
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.ActiveCfg = Release|x64
+ {7C1C5695-C51C-4017-ABEF-BC3032CBAF3B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
More information about the mapguide-commits
mailing list