[mapguide-commits] r9798 - in sandbox/jng/vanilla_swig: Common/Foundation/Data Common/Foundation/System Common/Geometry Common/Geometry/CoordinateSystem Common/MapGuideCommon/Controller Common/MapGuideCommon/Services Common/MapGuideCommon/System Common/PlatformBase/Data Common/PlatformBase/Services Common/PlatformBase/Services/PrintLayoutService Server/src/Common/Manager Server/src/Core Server/src/Services/Resource Web/src/HttpHandler Web/src/WebApp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Nov 20 06:36:22 PST 2020
Author: jng
Date: 2020-11-20 06:36:21 -0800 (Fri, 20 Nov 2020)
New Revision: 9798
Modified:
sandbox/jng/vanilla_swig/Common/Foundation/Data/NamedCollection.h
sandbox/jng/vanilla_swig/Common/Foundation/System/DisposableCollection.h
sandbox/jng/vanilla_swig/Common/Foundation/System/FoundationClassId.h
sandbox/jng/vanilla_swig/Common/Foundation/System/Stream.h
sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h
sandbox/jng/vanilla_swig/Common/Geometry/GeometryClassId.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/Controller.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/DwfController.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/HtmlController.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/Command.cpp
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ConnectionProperties.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/PrintLayout.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerConnection.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerInformation.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/SqlResult.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/CryptographyManager.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonClassId.h
sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonFactory.cpp
sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Margin.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Point3D.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Data/SerializableCollection.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Size2D.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Vector3D.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSet.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LockFeatures.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LongTransactionData.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PlatformBaseClassId.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapView.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementCollection.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMappingCollection.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ServiceRegistry.cpp
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/SpatialContextData.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Transaction.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/UnlockFeatures.h
sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Warnings.h
sandbox/jng/vanilla_swig/Server/src/Common/Manager/LoadBalanceManager.cpp
sandbox/jng/vanilla_swig/Server/src/Common/Manager/ServiceManager.cpp
sandbox/jng/vanilla_swig/Server/src/Core/OperationThread.cpp
sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp
sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpHandlerClassId.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebAppClassId.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebBufferCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandCollection.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandWidget.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebContextMenu.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebFlyoutWidget.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebGetPrintablePageCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebHelpCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebInformationPane.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeScriptCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeUrlCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebMeasureCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebPrintCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebSearchCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebSelectWithinCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebSeparatorWidget.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBar.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBarWidget.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskPane.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebToolbar.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiPane.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiSizablePane.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiTargetCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebViewOptionsCommand.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidget.h
sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidgetCollection.h
Log:
With the advent of generating class id maps automatically via SWIG's XML mode + ClassMapGen tool, it has revealed several inconsistencies in class id naming conventions that would've been brought up earlier had we not been using a heavily modified version of swig to read and generate this class id information previously.
This submission renames several sets of class ids to:
1. Indicate it is not actually used by anything (these are prefixed with UNUSED_)
2. Indicate it is used by a class that is not exposed to the public MapGuide API surface (these are prefixed with INTERNAL_)
3. Indicate it is used by a proxy class (these are prefixed with PROXY_)
4. Be consistent with the expecting naming convention of: <Library>_<Category>_<ClassName> or <Library>_<ClassName>
Our ClassMapGen tool is already written to only process class ids with this naming convention, thus adding the UNUSED_ or INTERNAL_ or PROXY_ prefix will result in these ids being skipped and not be written to the final class id mapping file in java/php/.net
All our exception class ids (with the exception (pun intended) of MgException) have been prefixed with UNUSED_. In the process of doing this, we inadvertently exposed several cases in the networking layer where we were catching exceptions and was still interrogating its type by class id instead of by the new GetExceptionCode() API. This may we be the cause of some site service failures we had to previously disable. Will check up later on to see if this the case.
Modified: sandbox/jng/vanilla_swig/Common/Foundation/Data/NamedCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/Data/NamedCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/Foundation/Data/NamedCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -317,7 +317,7 @@
bool m_bCheckDuplicate;
CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_NamedCollection;
+ static const INT32 m_cls_id = INTERNAL_Foundation_Collection_NamedCollection;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/Foundation/System/DisposableCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/System/DisposableCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/Foundation/System/DisposableCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -250,7 +250,7 @@
INT32 m_size;
CLASS_ID:
- static const INT32 m_cls_id = Foundation_Collection_Collection;
+ static const INT32 m_cls_id = Foundation_Collection_DisposableCollection;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/Foundation/System/FoundationClassId.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/System/FoundationClassId.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/Foundation/System/FoundationClassId.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -24,8 +24,8 @@
#define FOUNDATION_SYSTEM_ID 2250
// Foundation Collection
-#define Foundation_Collection_Collection FOUNDATION_COLLECTION_ID+0
-#define Foundation_Collection_NamedCollection FOUNDATION_COLLECTION_ID+1
+#define Foundation_Collection_DisposableCollection FOUNDATION_COLLECTION_ID+0
+#define INTERNAL_Foundation_Collection_NamedCollection FOUNDATION_COLLECTION_ID+1
#define Foundation_Collection_PropertyCollection FOUNDATION_COLLECTION_ID+2
#define Foundation_Collection_StringCollection FOUNDATION_COLLECTION_ID+3
#define Foundation_Collection_StringPropertyCollection FOUNDATION_COLLECTION_ID+4
@@ -32,72 +32,72 @@
#define Foundation_Collection_BatchPropertyCollection FOUNDATION_COLLECTION_ID+5
// Foundation Data
-#define Foundation_Data_ByteReader FOUNDATION_DATA_ID+0
-#define Foundation_Data_ByteSource FOUNDATION_DATA_ID+1
-#define Foundation_Data_ByteSourceFileImpl FOUNDATION_DATA_ID+2
-#define Foundation_Data_ByteSourceImpl FOUNDATION_DATA_ID+3
-#define Foundation_Data_ByteSourceMemoryImpl FOUNDATION_DATA_ID+4
-#define Foundation_Data_ByteSourceSocketStreamImpl FOUNDATION_DATA_ID+5
-#define Foundation_Data_DateTime FOUNDATION_DATA_ID+6
-#define Foundation_Data_ByteSink FOUNDATION_DATA_ID+7
-#define Foundation_Data_Stream FOUNDATION_DATA_ID+8
+#define Foundation_Data_ByteReader FOUNDATION_DATA_ID+0
+#define Foundation_Data_ByteSource FOUNDATION_DATA_ID+1
+#define UNUSED_Foundation_Data_ByteSourceFileImpl FOUNDATION_DATA_ID+2
+#define UNUSED_Foundation_Data_ByteSourceImpl FOUNDATION_DATA_ID+3
+#define UNUSED_Foundation_Data_ByteSourceMemoryImpl FOUNDATION_DATA_ID+4
+#define UNUSED_Foundation_Data_ByteSourceSocketStreamImpl FOUNDATION_DATA_ID+5
+#define Foundation_Data_DateTime FOUNDATION_DATA_ID+6
+#define Foundation_Data_ByteSink FOUNDATION_DATA_ID+7
+#define INTERNAL_Foundation_Data_Stream FOUNDATION_DATA_ID+8
// Foundation Exception
//
// NOTE: Although we removed these exceptions, we are keeping the ids in to prevent these ids from being
// accidentally used for new classes in the future
-#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 UNUSED_Foundation_Exception_MgApplicationException FOUNDATION_EXCEPTION_ID+0
+#define UNUSED_Foundation_Exception_MgArgumentOutOfRangeException FOUNDATION_EXCEPTION_ID+1
+#define UNUSED_Foundation_Exception_MgClassNotFoundException FOUNDATION_EXCEPTION_ID+2
+#define UNUSED_Foundation_Exception_MgConfigurationException FOUNDATION_EXCEPTION_ID+3
+#define UNUSED_Foundation_Exception_MgConfigurationLoadFailedException FOUNDATION_EXCEPTION_ID+4
+#define UNUSED_Foundation_Exception_MgConfigurationSaveFailedException FOUNDATION_EXCEPTION_ID+5
+#define UNUSED_Foundation_Exception_MgDateTimeException FOUNDATION_EXCEPTION_ID+6
+#define UNUSED_Foundation_Exception_MgDecryptionException FOUNDATION_EXCEPTION_ID+7
+#define UNUSED_Foundation_Exception_MgDirectoryNotFoundException FOUNDATION_EXCEPTION_ID+8
+#define UNUSED_Foundation_Exception_MgDivideByZeroException FOUNDATION_EXCEPTION_ID+9
+#define UNUSED_Foundation_Exception_MgDomainException FOUNDATION_EXCEPTION_ID+10
+#define UNUSED_Foundation_Exception_MgDuplicateDirectoryException FOUNDATION_EXCEPTION_ID+11
+#define UNUSED_Foundation_Exception_MgDuplicateFileException FOUNDATION_EXCEPTION_ID+12
+#define UNUSED_Foundation_Exception_MgDuplicateObjectException FOUNDATION_EXCEPTION_ID+13
+#define UNUSED_Foundation_Exception_MgEncryptionException FOUNDATION_EXCEPTION_ID+14
+#define Foundation_Exception_MgException FOUNDATION_EXCEPTION_ID+15
+#define UNUSED_Foundation_Exception_MgFileIoException FOUNDATION_EXCEPTION_ID+16
+#define UNUSED_Foundation_Exception_MgFileNotFoundException FOUNDATION_EXCEPTION_ID+17
+#define UNUSED_Foundation_Exception_MgIndexOutOfRangeException FOUNDATION_EXCEPTION_ID+18
+#define UNUSED_Foundation_Exception_MgInvalidArgumentException FOUNDATION_EXCEPTION_ID+19
+#define UNUSED_Foundation_Exception_MgInvalidCastException FOUNDATION_EXCEPTION_ID+20
+#define UNUSED_Foundation_Exception_MgInvalidMimeTypeException FOUNDATION_EXCEPTION_ID+21
+#define UNUSED_Foundation_Exception_MgInvalidOperationException FOUNDATION_EXCEPTION_ID+22
+#define UNUSED_Foundation_Exception_MgInvalidPropertyTypeException FOUNDATION_EXCEPTION_ID+23
+#define UNUSED_Foundation_Exception_MgInvalidStreamHeaderException FOUNDATION_EXCEPTION_ID+24
+#define UNUSED_Foundation_Exception_MgIoException FOUNDATION_EXCEPTION_ID+25
+#define UNUSED_Foundation_Exception_MgLengthException FOUNDATION_EXCEPTION_ID+26
+#define UNUSED_Foundation_Exception_MgLogicException FOUNDATION_EXCEPTION_ID+27
+#define UNUSED_Foundation_Exception_MgNotFiniteNumberException FOUNDATION_EXCEPTION_ID+28
+#define UNUSED_Foundation_Exception_MgNotImplementedException FOUNDATION_EXCEPTION_ID+29
+#define UNUSED_Foundation_Exception_MgNullArgumentException FOUNDATION_EXCEPTION_ID+30
+#define UNUSED_Foundation_Exception_MgNullPropertyValueException FOUNDATION_EXCEPTION_ID+31
+#define UNUSED_Foundation_Exception_MgNullReferenceException FOUNDATION_EXCEPTION_ID+32
+#define UNUSED_Foundation_Exception_MgObjectNotFoundException FOUNDATION_EXCEPTION_ID+33
+#define UNUSED_Foundation_Exception_MgOutOfMemoryException FOUNDATION_EXCEPTION_ID+34
+#define UNUSED_Foundation_Exception_MgOutOfRangeException FOUNDATION_EXCEPTION_ID+35
+#define UNUSED_Foundation_Exception_MgOverflowException FOUNDATION_EXCEPTION_ID+36
+#define UNUSED_Foundation_Exception_MgPlatformNotSupportedException FOUNDATION_EXCEPTION_ID+37
+#define UNUSED_Foundation_Exception_MgResourcesException FOUNDATION_EXCEPTION_ID+38
+#define UNUSED_Foundation_Exception_MgResourcesLoadFailedException FOUNDATION_EXCEPTION_ID+39
+#define UNUSED_Foundation_Exception_MgResourceTagNotFoundException FOUNDATION_EXCEPTION_ID+40
+#define UNUSED_Foundation_Exception_MgRuntimeException FOUNDATION_EXCEPTION_ID+41
+#define UNUSED_Foundation_Exception_MgStreamIoException FOUNDATION_EXCEPTION_ID+42
+#define UNUSED_Foundation_Exception_MgSystemException FOUNDATION_EXCEPTION_ID+43
+#define UNUSED_Foundation_Exception_MgTemporaryFileNotAvailableException FOUNDATION_EXCEPTION_ID+44
+#define UNUSED_Foundation_Exception_MgThirdPartyException FOUNDATION_EXCEPTION_ID+45
+#define UNUSED_Foundation_Exception_MgUnauthorizedAccessException FOUNDATION_EXCEPTION_ID+46
+#define UNUSED_Foundation_Exception_MgUnclassifiedException FOUNDATION_EXCEPTION_ID+47
+#define UNUSED_Foundation_Exception_MgUnderflowException FOUNDATION_EXCEPTION_ID+48
+#define UNUSED_Foundation_Exception_MgXmlException FOUNDATION_EXCEPTION_ID+49
+#define UNUSED_Foundation_Exception_MgXmlParserException FOUNDATION_EXCEPTION_ID+50
+#define UNUSED_Foundation_Exception_MgGridDensityException FOUNDATION_EXCEPTION_ID+51
// Foundation Property
@@ -108,4 +108,4 @@
// Foundation System
#define Foundation_System_Disposable FOUNDATION_SYSTEM_ID+1
#define Foundation_System_Object FOUNDATION_SYSTEM_ID+2
-#define Foundation_System_CryptographyManager FOUNDATION_SYSTEM_ID+3
+#define INTERNAL_Foundation_System_CryptographyManager FOUNDATION_SYSTEM_ID+3
Modified: sandbox/jng/vanilla_swig/Common/Foundation/System/Stream.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/System/Stream.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/Foundation/System/Stream.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -88,7 +88,7 @@
CLASS_ID:
- static const INT32 m_cls_id = Foundation_Data_Stream;
+ static const INT32 m_cls_id = INTERNAL_Foundation_Data_Stream;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemGridGeneric.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -30,7 +30,7 @@
INT32 GetClassId(){return m_cls_id;};
CLASS_ID:
- static const INT32 m_cls_id = CoordinateSystem_CoordinateSystemGridGeneric;
+ static const INT32 m_cls_id = INTERNAL_CoordinateSystem_CoordinateSystemGridGeneric;
};
#endif //_MGCOORDINATESYSTEMGRIDGENERIC_H_
Modified: sandbox/jng/vanilla_swig/Common/Geometry/GeometryClassId.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Geometry/GeometryClassId.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/Geometry/GeometryClassId.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -28,7 +28,7 @@
#define Geometry_AgfReaderWriter GEOMETRY_ID+4
#define Geometry_AggregateGeometry GEOMETRY_ID+5
#define Geometry_ArcSegment GEOMETRY_ID+6
-#define Geometry_CloseInstruction GEOMETRY_ID+7
+#define UNUSED_Geometry_CloseInstruction GEOMETRY_ID+7
#define Geometry_CoordinateCollection GEOMETRY_ID+8
#define Geometry_CoordinateIterator GEOMETRY_ID+9
#define Geometry_Curve GEOMETRY_ID+10
@@ -36,10 +36,10 @@
#define Geometry_CurveRing GEOMETRY_ID+12
#define Geometry_CurveSegment GEOMETRY_ID+13
#define Geometry_CurveString GEOMETRY_ID+14
-#define Geometry_GeometricDimension GEOMETRY_ID+15
+#define UNUSED_Geometry_GeometricDimension GEOMETRY_ID+15
#define Geometry_GeometricEntity GEOMETRY_ID+16
-#define Geometry_GeometricPathInstruction GEOMETRY_ID+17
-#define Geometry_GeometricPathIterator GEOMETRY_ID+18
+#define UNUSED_Geometry_GeometricPathInstruction GEOMETRY_ID+17
+#define UNUSED_Geometry_GeometricPathIterator GEOMETRY_ID+18
#define Geometry_Geometry GEOMETRY_ID+19
#define Geometry_GeometryCollection GEOMETRY_ID+20
#define Geometry_GeometryComponent GEOMETRY_ID+21
@@ -46,10 +46,10 @@
//unused GEOMETRY_ID+22
#define Geometry_LinearRing GEOMETRY_ID+23
#define Geometry_LinearSegment GEOMETRY_ID+24
-#define Geometry_LinearString GEOMETRY_ID+25
-#define Geometry_LineToInstrution GEOMETRY_ID+26
+#define UNUSED_Geometry_LinearString GEOMETRY_ID+25
+#define UNUSED_Geometry_LineToInstrution GEOMETRY_ID+26
#define Geometry_Measure GEOMETRY_ID+27
-#define Geometry_MoveToInstruction GEOMETRY_ID+28
+#define UNUSED_Geometry_MoveToInstruction GEOMETRY_ID+28
#define Geometry_MultiCurvePolygon GEOMETRY_ID+29
#define Geometry_MultiCurveString GEOMETRY_ID+30
#define Geometry_MultiGeometry GEOMETRY_ID+31
@@ -57,7 +57,7 @@
#define Geometry_MultiPoint GEOMETRY_ID+33
#define Geometry_MultiPolygon GEOMETRY_ID+34
#define Geometry_Polygon GEOMETRY_ID+35
-#define Geometry_QuadToInstruction GEOMETRY_ID+36
+#define UNUSED_Geometry_QuadToInstruction GEOMETRY_ID+36
#define Geometry_Region GEOMETRY_ID+37
#define Geometry_Ring GEOMETRY_ID+38
#define Geometry_Transform GEOMETRY_ID+39
@@ -106,7 +106,7 @@
#define CoordinateSystem_CoordinateSystemDictionaryUtility GEOMETRY_COORDINATE_SYSTEM_ID+21
#define CoordinateSystem_CoordinateSystemMgrs GEOMETRY_COORDINATE_SYSTEM_ID+22
-#define CoordinateSystem_CoordinateSystemGridGeneric GEOMETRY_COORDINATE_SYSTEM_ID+23
+#define INTERNAL_CoordinateSystem_CoordinateSystemGridGeneric GEOMETRY_COORDINATE_SYSTEM_ID+23
#define CoordinateSystem_CoordinateSystemGridBoundary GEOMETRY_COORDINATE_SYSTEM_ID+24
#define CoordinateSystem_CoordinateSystemGridSpecification GEOMETRY_COORDINATE_SYSTEM_ID+25
#define CoordinateSystem_CoordinateSystemGridLineCollection GEOMETRY_COORDINATE_SYSTEM_ID+26
@@ -122,9 +122,9 @@
#define CoordinateSystem_CoordinateSystemGeodeticPathDictionary GEOMETRY_COORDINATE_SYSTEM_ID+35
#define CoordinateSystem_CoordinateSystemGeodeticTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+36
-#define CoordinateSystem_CoordinateSystemGeodeticAnalyticalTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+37
-#define CoordinateSystem_CoordinateSystemGeodeticInterpolationTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+38
-#define CoordinateSystem_CoordinateSystemGeodeticMultipleRegressionTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+39
+#define UNUSED_CoordinateSystem_CoordinateSystemGeodeticAnalyticalTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+37
+#define UNUSED_CoordinateSystem_CoordinateSystemGeodeticInterpolationTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+38
+#define UNUSED_CoordinateSystem_CoordinateSystemGeodeticMultipleRegressionTransformDef GEOMETRY_COORDINATE_SYSTEM_ID+39
#define CoordinateSystem_CoordinateSystemGeodeticTransformDefDictionary GEOMETRY_COORDINATE_SYSTEM_ID+40
#define CoordinateSystem_CoordinateSystemGeodeticTransformDefParams GEOMETRY_COORDINATE_SYSTEM_ID+41
@@ -138,16 +138,13 @@
//
// NOTE: Although we removed these exceptions, we are keeping the ids in to prevent these ids from being
// accidentally used for new classes in the future
-#define Geometry_Exception_MgCoordinateSystemComputationFailedException GEOMETRY_EXCEPTION_ID+0
-#define Geometry_Exception_MgCoordinateSystemConversionFailedException GEOMETRY_EXCEPTION_ID+1
-#define Geometry_Exception_MgCoordinateSystemInitializationFailedException GEOMETRY_EXCEPTION_ID+2
-#define Geometry_Exception_MgCoordinateSystemLoadFailedException GEOMETRY_EXCEPTION_ID+3
-#define Geometry_Exception_MgCoordinateSystemMeasureFailedException GEOMETRY_EXCEPTION_ID+4
-#define Geometry_Exception_MgCoordinateSystemTransformFailedException GEOMETRY_EXCEPTION_ID+5
-#define Geometry_Exception_MgGeometryException GEOMETRY_EXCEPTION_ID+6
-#define Geometry_Exception_MgInvalidCoordinateSystemException GEOMETRY_EXCEPTION_ID+7
-#define Geometry_Exception_MgInvalidCoordinateSystemTypeException GEOMETRY_EXCEPTION_ID+8
-#define Geometry_Exception_MgInvalidCoordinateSystemUnitsException GEOMETRY_EXCEPTION_ID+9
-
-
-
+#define UNUSED_Geometry_Exception_MgCoordinateSystemComputationFailedException GEOMETRY_EXCEPTION_ID+0
+#define UNUSED_Geometry_Exception_MgCoordinateSystemConversionFailedException GEOMETRY_EXCEPTION_ID+1
+#define UNUSED_Geometry_Exception_MgCoordinateSystemInitializationFailedException GEOMETRY_EXCEPTION_ID+2
+#define UNUSED_Geometry_Exception_MgCoordinateSystemLoadFailedException GEOMETRY_EXCEPTION_ID+3
+#define UNUSED_Geometry_Exception_MgCoordinateSystemMeasureFailedException GEOMETRY_EXCEPTION_ID+4
+#define UNUSED_Geometry_Exception_MgCoordinateSystemTransformFailedException GEOMETRY_EXCEPTION_ID+5
+#define UNUSED_Geometry_Exception_MgGeometryException GEOMETRY_EXCEPTION_ID+6
+#define UNUSED_Geometry_Exception_MgInvalidCoordinateSystemException GEOMETRY_EXCEPTION_ID+7
+#define UNUSED_Geometry_Exception_MgInvalidCoordinateSystemTypeException GEOMETRY_EXCEPTION_ID+8
+#define UNUSED_Geometry_Exception_MgInvalidCoordinateSystemUnitsException GEOMETRY_EXCEPTION_ID+9
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/Controller.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/Controller.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/Controller.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -106,7 +106,7 @@
MgEnvelope* ParseEnvelope(CREFSTRING strEnvelope);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_MapLayer_Controller;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_MapLayer_Controller;
protected:
static const STRING m_mapCmdSetViewCenterX;
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/DwfController.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/DwfController.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/DwfController.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -117,7 +117,7 @@
virtual void ApplyMapViewCommands(MgMap* map, MgPropertyCollection* mapViewCommands);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_MapLayer_AdvController;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_MapLayer_AdvController;
private:
typedef enum OperationType
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/HtmlController.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/HtmlController.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Controller/HtmlController.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -343,7 +343,7 @@
MgFeatureService* featureService);
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_MapLayer_ZcvController;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_MapLayer_ZcvController;
};
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/Command.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/Command.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/Command.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -121,7 +121,7 @@
if (NULL != mgException)
{
- if (mgException->IsOfClass(MapGuide_Exception_MgConnectionFailedException))
+ if (mgException->GetExceptionCode() == MgExceptionCodes::MgConnectionFailedException)
{
// The server didn't respond so it needs to be marked as unavailable in the list of servers.
// We will check to see if it can be made available later.
@@ -192,8 +192,8 @@
if (NULL != mgException)
{
// Close the connection if the stream is corrupted or of newer version.
- if (mgException->IsOfClass(Foundation_Exception_MgInvalidStreamHeaderException)
- || mgException->IsOfClass(Foundation_Exception_MgStreamIoException))
+ if (mgException->GetExceptionCode() == MgExceptionCodes::MgInvalidStreamHeaderException ||
+ mgException->GetExceptionCode() == MgExceptionCodes::MgStreamIoException)
{
connection->Close();
}
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ConnectionProperties.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ConnectionProperties.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ConnectionProperties.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -158,7 +158,7 @@
INT32 m_port;
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Service_ConnectionProperties;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_Service_ConnectionProperties;
};
#endif // MG_CONNECTION_PROPERTIES_H_
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/PrintLayout.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/PrintLayout.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/PrintLayout.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -209,7 +209,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_MappingService_PrintLayout;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_MappingService_PrintLayout;
INTERNAL_API:
/// Layout element constants
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerConnection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerConnection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerConnection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -213,7 +213,7 @@
///
MgStreamHelper* GetMgStreamHelper();
- static const INT32 m_cls_id = MapGuide_Service_ServerConnection;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_Service_ServerConnection;
static const time_t sm_kStaleTime;
static ACE_Recursive_Thread_Mutex sm_mutex;
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerInformation.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerInformation.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/ServerInformation.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -427,7 +427,7 @@
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Service_ServerInformation;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_Service_ServerInformation;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/SqlResult.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/SqlResult.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/Services/SqlResult.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -73,7 +73,7 @@
Ptr<MgSqlDataReader> m_reader;
CLASS_ID:
- static const INT32 m_cls_id = MapGuide_Service_SqlResult;
+ static const INT32 m_cls_id = INTERNAL_MapGuide_Service_SqlResult;
};
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/CryptographyManager.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/CryptographyManager.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/CryptographyManager.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -348,7 +348,7 @@
CLASS_ID:
- static const INT32 m_cls_id = Foundation_System_CryptographyManager;
+ static const INT32 m_cls_id = INTERNAL_Foundation_System_CryptographyManager;
private:
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonClassId.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonClassId.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonClassId.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -36,64 +36,64 @@
//
// NOTE: Although we removed these exceptions, we are keeping the ids in to prevent these ids from being
// accidentally used for new classes in the future
-#define MapGuide_Exception_MgAuthenticationFailedException MAPGUIDE_EXCEPTION_ID+0
-#define MapGuide_Exception_MgConnectionFailedException MAPGUIDE_EXCEPTION_ID+1
-#define MapGuide_Exception_MgConnectionNotOpenException MAPGUIDE_EXCEPTION_ID+2
-#define MapGuide_Exception_MgDbException MAPGUIDE_EXCEPTION_ID+3
-#define MapGuide_Exception_MgDbXmlException MAPGUIDE_EXCEPTION_ID+4
-#define MapGuide_Exception_MgDuplicateGroupException MAPGUIDE_EXCEPTION_ID+5
-#define MapGuide_Exception_MgDuplicateNameException MAPGUIDE_EXCEPTION_ID+6
-#define MapGuide_Exception_MgDuplicateParameterException MAPGUIDE_EXCEPTION_ID+7
-#define MapGuide_Exception_MgDuplicateRepositoryException MAPGUIDE_EXCEPTION_ID+8
-#define MapGuide_Exception_MgDuplicateRoleException MAPGUIDE_EXCEPTION_ID+9
-#define MapGuide_Exception_MgDuplicateServerException MAPGUIDE_EXCEPTION_ID+10
-#define MapGuide_Exception_MgDuplicateSessionException MAPGUIDE_EXCEPTION_ID+11
-#define MapGuide_Exception_MgDuplicateUserException MAPGUIDE_EXCEPTION_ID+12
-#define MapGuide_Exception_MgDwfException MAPGUIDE_EXCEPTION_ID+13
-#define MapGuide_Exception_MgDwfSectionNotFoundException MAPGUIDE_EXCEPTION_ID+14
-#define MapGuide_Exception_MgDwfSectionResourceNotFoundException MAPGUIDE_EXCEPTION_ID+15
-#define MapGuide_Exception_MgEndOfStreamException MAPGUIDE_EXCEPTION_ID+16
-#define MapGuide_Exception_MgEvaluationExpiredException MAPGUIDE_EXCEPTION_ID+17
-#define MapGuide_Exception_MgGroupNotFoundException MAPGUIDE_EXCEPTION_ID+18
-#define MapGuide_Exception_MgInvalidDwfPackageException MAPGUIDE_EXCEPTION_ID+19
-#define MapGuide_Exception_MgInvalidDwfSectionException MAPGUIDE_EXCEPTION_ID+20
-#define MapGuide_Exception_MgInvalidFeatureSourceException MAPGUIDE_EXCEPTION_ID+21
-#define MapGuide_Exception_MgInvalidIpAddressException MAPGUIDE_EXCEPTION_ID+22
-#define MapGuide_Exception_MgInvalidLicenseException MAPGUIDE_EXCEPTION_ID+23
-#define MapGuide_Exception_MgInvalidLogEntryException MAPGUIDE_EXCEPTION_ID+24
-#define MapGuide_Exception_MgInvalidOperationVersionException MAPGUIDE_EXCEPTION_ID+25
-#define MapGuide_Exception_MgInvalidPasswordException MAPGUIDE_EXCEPTION_ID+26
-#define MapGuide_Exception_MgInvalidPrintLayoutFontSizeUnitsException MAPGUIDE_EXCEPTION_ID+27
-#define MapGuide_Exception_MgInvalidPrintLayoutPositionUnitsException MAPGUIDE_EXCEPTION_ID+28
-#define MapGuide_Exception_MgInvalidPrintLayoutSizeUnitsException MAPGUIDE_EXCEPTION_ID+29
-#define MapGuide_Exception_MgInvalidSerialNumberException MAPGUIDE_EXCEPTION_ID+30
-#define MapGuide_Exception_MgInvalidServerNameException MAPGUIDE_EXCEPTION_ID+31
-#define MapGuide_Exception_MgLicenseException MAPGUIDE_EXCEPTION_ID+32
-#define MapGuide_Exception_MgLicenseExpiredException MAPGUIDE_EXCEPTION_ID+33
-#define MapGuide_Exception_MgLogOpenFailedException MAPGUIDE_EXCEPTION_ID+34
-#define MapGuide_Exception_MgOperationProcessingException MAPGUIDE_EXCEPTION_ID+35
-#define MapGuide_Exception_MgParameterNotFoundException MAPGUIDE_EXCEPTION_ID+36
-#define MapGuide_Exception_MgPathTooLongException MAPGUIDE_EXCEPTION_ID+37
-#define MapGuide_Exception_MgPermissionDeniedException MAPGUIDE_EXCEPTION_ID+38
-#define MapGuide_Exception_MgPortNotAvailableException MAPGUIDE_EXCEPTION_ID+39
-#define MapGuide_Exception_MgPrintToScaleModeNotSelectedException MAPGUIDE_EXCEPTION_ID+40
-#define MapGuide_Exception_MgRepositoryCreationFailedException MAPGUIDE_EXCEPTION_ID+41
-#define MapGuide_Exception_MgRepositoryNotFoundException MAPGUIDE_EXCEPTION_ID+42
-#define MapGuide_Exception_MgRepositoryNotOpenException MAPGUIDE_EXCEPTION_ID+43
-#define MapGuide_Exception_MgRepositoryOpenFailedException MAPGUIDE_EXCEPTION_ID+44
-#define MapGuide_Exception_MgRoleNotFoundException MAPGUIDE_EXCEPTION_ID+45
-#define MapGuide_Exception_MgServerNotFoundException MAPGUIDE_EXCEPTION_ID+46
-#define MapGuide_Exception_MgServerNotOnlineException MAPGUIDE_EXCEPTION_ID+47
-#define MapGuide_Exception_MgSessionExpiredException MAPGUIDE_EXCEPTION_ID+48
-#define MapGuide_Exception_MgUnauthorizedAccessException MAPGUIDE_EXCEPTION_ID+49
-#define MapGuide_Exception_MgUriFormatException MAPGUIDE_EXCEPTION_ID+50
-#define MapGuide_Exception_MgStylizeLayerFailedException MAPGUIDE_EXCEPTION_ID+51
-#define MapGuide_Exception_MgSessionNotFoundException MAPGUIDE_EXCEPTION_ID+52
-#define MapGuide_Exception_MgUnsupportedProviderThreadModelException MAPGUIDE_EXCEPTION_ID+53
-#define MapGuide_Exception_MgAllProviderConnectionsUsedException MAPGUIDE_EXCEPTION_ID+54
-#define MapGuide_Exception_MgRasterTransformationNotSupportedException MAPGUIDE_EXCEPTION_ID+55
-#define MapGuide_Exception_MgUnknownTileProviderException MAPGUIDE_EXCEPTION_ID+56
-#define MapGuide_Exception_MgUnsupportedTileProviderException MAPGUIDE_EXCEPTION_ID+57
+#define UNUSED_MapGuide_Exception_MgAuthenticationFailedException MAPGUIDE_EXCEPTION_ID+0
+#define UNUSED_MapGuide_Exception_MgConnectionFailedException MAPGUIDE_EXCEPTION_ID+1
+#define UNUSED_MapGuide_Exception_MgConnectionNotOpenException MAPGUIDE_EXCEPTION_ID+2
+#define UNUSED_MapGuide_Exception_MgDbException MAPGUIDE_EXCEPTION_ID+3
+#define UNUSED_MapGuide_Exception_MgDbXmlException MAPGUIDE_EXCEPTION_ID+4
+#define UNUSED_MapGuide_Exception_MgDuplicateGroupException MAPGUIDE_EXCEPTION_ID+5
+#define UNUSED_MapGuide_Exception_MgDuplicateNameException MAPGUIDE_EXCEPTION_ID+6
+#define UNUSED_MapGuide_Exception_MgDuplicateParameterException MAPGUIDE_EXCEPTION_ID+7
+#define UNUSED_MapGuide_Exception_MgDuplicateRepositoryException MAPGUIDE_EXCEPTION_ID+8
+#define UNUSED_MapGuide_Exception_MgDuplicateRoleException MAPGUIDE_EXCEPTION_ID+9
+#define UNUSED_MapGuide_Exception_MgDuplicateServerException MAPGUIDE_EXCEPTION_ID+10
+#define UNUSED_MapGuide_Exception_MgDuplicateSessionException MAPGUIDE_EXCEPTION_ID+11
+#define UNUSED_MapGuide_Exception_MgDuplicateUserException MAPGUIDE_EXCEPTION_ID+12
+#define UNUSED_MapGuide_Exception_MgDwfException MAPGUIDE_EXCEPTION_ID+13
+#define UNUSED_MapGuide_Exception_MgDwfSectionNotFoundException MAPGUIDE_EXCEPTION_ID+14
+#define UNUSED_MapGuide_Exception_MgDwfSectionResourceNotFoundException MAPGUIDE_EXCEPTION_ID+15
+#define UNUSED_MapGuide_Exception_MgEndOfStreamException MAPGUIDE_EXCEPTION_ID+16
+#define UNUSED_MapGuide_Exception_MgEvaluationExpiredException MAPGUIDE_EXCEPTION_ID+17
+#define UNUSED_MapGuide_Exception_MgGroupNotFoundException MAPGUIDE_EXCEPTION_ID+18
+#define UNUSED_MapGuide_Exception_MgInvalidDwfPackageException MAPGUIDE_EXCEPTION_ID+19
+#define UNUSED_MapGuide_Exception_MgInvalidDwfSectionException MAPGUIDE_EXCEPTION_ID+20
+#define UNUSED_MapGuide_Exception_MgInvalidFeatureSourceException MAPGUIDE_EXCEPTION_ID+21
+#define UNUSED_MapGuide_Exception_MgInvalidIpAddressException MAPGUIDE_EXCEPTION_ID+22
+#define UNUSED_MapGuide_Exception_MgInvalidLicenseException MAPGUIDE_EXCEPTION_ID+23
+#define UNUSED_MapGuide_Exception_MgInvalidLogEntryException MAPGUIDE_EXCEPTION_ID+24
+#define UNUSED_MapGuide_Exception_MgInvalidOperationVersionException MAPGUIDE_EXCEPTION_ID+25
+#define UNUSED_MapGuide_Exception_MgInvalidPasswordException MAPGUIDE_EXCEPTION_ID+26
+#define UNUSED_MapGuide_Exception_MgInvalidPrintLayoutFontSizeUnitsException MAPGUIDE_EXCEPTION_ID+27
+#define UNUSED_MapGuide_Exception_MgInvalidPrintLayoutPositionUnitsException MAPGUIDE_EXCEPTION_ID+28
+#define UNUSED_MapGuide_Exception_MgInvalidPrintLayoutSizeUnitsException MAPGUIDE_EXCEPTION_ID+29
+#define UNUSED_MapGuide_Exception_MgInvalidSerialNumberException MAPGUIDE_EXCEPTION_ID+30
+#define UNUSED_MapGuide_Exception_MgInvalidServerNameException MAPGUIDE_EXCEPTION_ID+31
+#define UNUSED_MapGuide_Exception_MgLicenseException MAPGUIDE_EXCEPTION_ID+32
+#define UNUSED_MapGuide_Exception_MgLicenseExpiredException MAPGUIDE_EXCEPTION_ID+33
+#define UNUSED_MapGuide_Exception_MgLogOpenFailedException MAPGUIDE_EXCEPTION_ID+34
+#define UNUSED_MapGuide_Exception_MgOperationProcessingException MAPGUIDE_EXCEPTION_ID+35
+#define UNUSED_MapGuide_Exception_MgParameterNotFoundException MAPGUIDE_EXCEPTION_ID+36
+#define UNUSED_MapGuide_Exception_MgPathTooLongException MAPGUIDE_EXCEPTION_ID+37
+#define UNUSED_MapGuide_Exception_MgPermissionDeniedException MAPGUIDE_EXCEPTION_ID+38
+#define UNUSED_MapGuide_Exception_MgPortNotAvailableException MAPGUIDE_EXCEPTION_ID+39
+#define UNUSED_MapGuide_Exception_MgPrintToScaleModeNotSelectedException MAPGUIDE_EXCEPTION_ID+40
+#define UNUSED_MapGuide_Exception_MgRepositoryCreationFailedException MAPGUIDE_EXCEPTION_ID+41
+#define UNUSED_MapGuide_Exception_MgRepositoryNotFoundException MAPGUIDE_EXCEPTION_ID+42
+#define UNUSED_MapGuide_Exception_MgRepositoryNotOpenException MAPGUIDE_EXCEPTION_ID+43
+#define UNUSED_MapGuide_Exception_MgRepositoryOpenFailedException MAPGUIDE_EXCEPTION_ID+44
+#define UNUSED_MapGuide_Exception_MgRoleNotFoundException MAPGUIDE_EXCEPTION_ID+45
+#define UNUSED_MapGuide_Exception_MgServerNotFoundException MAPGUIDE_EXCEPTION_ID+46
+#define UNUSED_MapGuide_Exception_MgServerNotOnlineException MAPGUIDE_EXCEPTION_ID+47
+#define UNUSED_MapGuide_Exception_MgSessionExpiredException MAPGUIDE_EXCEPTION_ID+48
+#define UNUSED_MapGuide_Exception_MgUnauthorizedAccessException MAPGUIDE_EXCEPTION_ID+49
+#define UNUSED_MapGuide_Exception_MgUriFormatException MAPGUIDE_EXCEPTION_ID+50
+#define UNUSED_MapGuide_Exception_MgStylizeLayerFailedException MAPGUIDE_EXCEPTION_ID+51
+#define UNUSED_MapGuide_Exception_MgSessionNotFoundException MAPGUIDE_EXCEPTION_ID+52
+#define UNUSED_MapGuide_Exception_MgUnsupportedProviderThreadModelException MAPGUIDE_EXCEPTION_ID+53
+#define UNUSED_MapGuide_Exception_MgAllProviderConnectionsUsedException MAPGUIDE_EXCEPTION_ID+54
+#define UNUSED_MapGuide_Exception_MgRasterTransformationNotSupportedException MAPGUIDE_EXCEPTION_ID+55
+#define UNUSED_MapGuide_Exception_MgUnknownTileProviderException MAPGUIDE_EXCEPTION_ID+56
+#define UNUSED_MapGuide_Exception_MgUnsupportedTileProviderException MAPGUIDE_EXCEPTION_ID+57
// MapLayer API
@@ -100,22 +100,22 @@
#define MapGuide_MapLayer_Map MAPGUIDE_MAPLAYER_ID+0
#define MapGuide_MapLayer_Layer MAPGUIDE_MAPLAYER_ID+1
#define MapGuide_MapLayer_Selection MAPGUIDE_MAPLAYER_ID+2
-#define MapGuide_MapLayer_Controller MAPGUIDE_MAPLAYER_ID+3
-#define MapGuide_MapLayer_AdvController MAPGUIDE_MAPLAYER_ID+4
-#define MapGuide_MapLayer_ZcvController MAPGUIDE_MAPLAYER_ID+5
+#define INTERNAL_MapGuide_MapLayer_Controller MAPGUIDE_MAPLAYER_ID+3
+#define INTERNAL_MapGuide_MapLayer_AdvController MAPGUIDE_MAPLAYER_ID+4
+#define INTERNAL_MapGuide_MapLayer_ZcvController MAPGUIDE_MAPLAYER_ID+5
//Basic Service functionality
-#define MapGuide_Service_ServerConnection MAPGUIDE_SERVICE_ID+0
+#define INTERNAL_MapGuide_Service_ServerConnection MAPGUIDE_SERVICE_ID+0
#define MapGuide_Service_SiteConnection MAPGUIDE_SERVICE_ID+1
-#define MapGuide_Service_ConnectionProperties MAPGUIDE_SERVICE_ID+2
-#define MapGuide_Service_ServerInformation MAPGUIDE_SERVICE_ID+3
+#define INTERNAL_MapGuide_Service_ConnectionProperties MAPGUIDE_SERVICE_ID+2
+#define INTERNAL_MapGuide_Service_ServerInformation MAPGUIDE_SERVICE_ID+3
#define MapGuide_Service_PackageStatusInformation MAPGUIDE_SERVICE_ID+4
#define MapGuide_Service_Site MAPGUIDE_SERVICE_ID+5
#define MapGuide_Service_UserInformation MAPGUIDE_SERVICE_ID+6
#define MapGuide_Service_ServerAdmin MAPGUIDE_SERVICE_ID+7
#define MapGuide_Service_SiteInfo MAPGUIDE_SERVICE_ID+8
-#define MapGuide_Service_SqlResult MAPGUIDE_SERVICE_ID+9
+#define INTERNAL_MapGuide_Service_SqlResult MAPGUIDE_SERVICE_ID+9
// Drawing Service
#define MapGuide_DrawingService_DrawingService MAPGUIDE_DRAWINGSERVICE_ID+0
@@ -124,7 +124,7 @@
#define MapGuide_MappingService_MappingService MAPGUIDE_MAPPINGSERVICE_ID+0
#define MapGuide_MappingService_DwfVersion MAPGUIDE_MAPPINGSERVICE_ID+1
#define MapGuide_MappingService_PlotSpecification MAPGUIDE_MAPPINGSERVICE_ID+2
-#define MapGuide_MappingService_PrintLayout MAPGUIDE_MAPPINGSERVICE_ID+3
+#define INTERNAL_MapGuide_MappingService_PrintLayout MAPGUIDE_MAPPINGSERVICE_ID+3
#define MapGuide_MappingService_Layout MAPGUIDE_MAPPINGSERVICE_ID+4
#define MapGuide_MappingService_MapPlot MAPGUIDE_MAPPINGSERVICE_ID+5
#define MapGuide_MappingService_MapPlotCollection MAPGUIDE_MAPPINGSERVICE_ID+6
@@ -136,9 +136,8 @@
#define MapGuide_RenderingService_Metatile MAPGUIDE_RENDERINGSERVICE_ID+3
// Resource Service
-#define MapGuide_ResourceService_ResourceService MAPGUIDE_RESOURCESERVICE_ID+0
+#define PROXY_MapGuide_ResourceService_ResourceService MAPGUIDE_RESOURCESERVICE_ID+0
-
// Tile Service
#define MapGuide_TileService_TileService MAPGUIDE_TILESERVICE_ID+0
Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonFactory.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonFactory.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/System/MapGuideCommonFactory.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -39,7 +39,7 @@
fact->Register(MapGuide_MapLayer_Map, MgMap::CreateObject);
fact->Register(MapGuide_MapLayer_Layer, MgLayer::CreateObject);
fact->Register(MapGuide_MapLayer_Selection, MgSelection::CreateObject);
- fact->Register(MapGuide_Service_ServerInformation, MgServerInformation::CreateObject);
+ fact->Register(INTERNAL_MapGuide_Service_ServerInformation, MgServerInformation::CreateObject);
fact->Register(MapGuide_Service_PackageStatusInformation, MgPackageStatusInformation::CreateObject);
fact->Register(MapGuide_Service_UserInformation, MgUserInformation::CreateObject);
fact->Register(MapGuide_Service_SiteInfo, MgSiteInfo::CreateObject);
@@ -49,14 +49,14 @@
fact->Register(PlatformBase_FeatureService_SqlDataReader, MgProxySqlDataReader::CreateObject);
fact->Register(MapGuide_MappingService_DwfVersion, MgDwfVersion::CreateObject);
fact->Register(MapGuide_MappingService_PlotSpecification, MgPlotSpecification::CreateObject);
- fact->Register(MapGuide_MappingService_PrintLayout, MgPrintLayout::CreateObject);
+ fact->Register(INTERNAL_MapGuide_MappingService_PrintLayout, MgPrintLayout::CreateObject);
fact->Register(MapGuide_MappingService_Layout, MgLayout::CreateObject);
fact->Register(MapGuide_MappingService_MapPlotCollection, MgMapPlotCollection::CreateObject);
fact->Register(MapGuide_RenderingService_FeatureInformation, MgFeatureInformation::CreateObject);
fact->Register(MapGuide_RenderingService_RenderingOptions, MgRenderingOptions::CreateObject);
fact->Register(MapGuide_RenderingService_Metatile, MgMetatile::CreateObject);
- fact->Register(PlatformBase_FeatureService_FeatureTransaction, MgProxyFeatureTransaction::CreateObject);
- fact->Register(MapGuide_Service_SqlResult, MgSqlResult::CreateObject);
+ fact->Register(PlatformBase_FeatureService_Transaction, MgProxyFeatureTransaction::CreateObject);
+ fact->Register(INTERNAL_MapGuide_Service_SqlResult, MgSqlResult::CreateObject);
MgServiceRegistry* registry = MgServiceRegistry::GetInstance();
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Margin.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Margin.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Margin.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -167,7 +167,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_Data_Margin;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_Data_Margin;
private:
//-------------------------------------------------------
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Point3D.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Point3D.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Point3D.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -233,7 +233,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_Data_Point3D;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_Data_Point3D;
private:
//-------------------------------------------------------
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/SerializableCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/SerializableCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/SerializableCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -229,7 +229,7 @@
Ptr<MgDisposableCollection> m_collection;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_Collection_SerializableCollection;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_Collection_SerializableCollection;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Size2D.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Size2D.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Size2D.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -153,7 +153,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_Data_Size2D;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_Data_Size2D;
private:
//-------------------------------------------------------
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Vector3D.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Vector3D.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/Vector3D.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -233,7 +233,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_Data_Vector3D;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_Data_Vector3D;
private:
//-------------------------------------------------------
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSet.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSet.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSet.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -255,7 +255,7 @@
Ptr<MgClassDefinition> m_classDefinition;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_FeatureSet;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_FeatureService_FeatureSet;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LockFeatures.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LockFeatures.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LockFeatures.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -140,7 +140,7 @@
void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_LockFeatures;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_FeatureService_LockFeatures;
private:
STRING m_className;
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LongTransactionData.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LongTransactionData.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/LongTransactionData.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -81,7 +81,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_LongTransactionData;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_FeatureService_LongTransactionData;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PlatformBaseClassId.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PlatformBaseClassId.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PlatformBaseClassId.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -32,7 +32,9 @@
// Platform Collection
#define PlatformBase_Collection_IntCollection PLATFORMBASE_COLLECTION_ID+0
#define PlatformBase_Collection_PropertyDefinitionCollection PLATFORMBASE_COLLECTION_ID+1
-#define PlatformBase_Collection_SerializableCollection PLATFORMBASE_COLLECTION_ID+2
+// This class has the markings of a class that should be in the MapGuide public API surface (usages
+// of EXTERNAL_API), but it isn't so we'll treat as internal
+#define INTERNAL_PlatformBase_Collection_SerializableCollection PLATFORMBASE_COLLECTION_ID+2
#define PlatformBase_Collection_StringPropertyCollection PLATFORMBASE_COLLECTION_ID+3
#define PlatformBase_Collection_ParameterCollection PLATFORMBASE_COLLECTION_ID+4
@@ -49,40 +51,40 @@
#define PlatformBase_Property_Int32Property PLATFORMBASE_DATA_ID+9
#define PlatformBase_Property_Int64Property PLATFORMBASE_DATA_ID+10
#define PlatformBase_Property_SingleProperty PLATFORMBASE_DATA_ID+11
-#define PlatformBase_Data_Point3D PLATFORMBASE_DATA_ID+12
-#define PlatformBase_Data_Vector3D PLATFORMBASE_DATA_ID+13
-#define PlatformBase_Data_Size2D PLATFORMBASE_DATA_ID+14
-#define PlatformBase_Data_Margin PLATFORMBASE_DATA_ID+15
+#define INTERNAL_PlatformBase_Data_Point3D PLATFORMBASE_DATA_ID+12
+#define INTERNAL_PlatformBase_Data_Vector3D PLATFORMBASE_DATA_ID+13
+#define INTERNAL_PlatformBase_Data_Size2D PLATFORMBASE_DATA_ID+14
+#define INTERNAL_PlatformBase_Data_Margin PLATFORMBASE_DATA_ID+15
// Platform Exceptions
//
// NOTE: Although we removed these exceptions, we are keeping the ids in to prevent these ids from being
// accidentally used for new classes in the future
-#define PlatformBase_Exception_MgArrayTypeMismatchException PLATFORMBASE_EXCEPTION_ID+0
-#define PlatformBase_Exception_MgDuplicateResourceDataException PLATFORMBASE_EXCEPTION_ID+1
-#define PlatformBase_Exception_MgDuplicateResourceException PLATFORMBASE_EXCEPTION_ID+2
-#define PlatformBase_Exception_MgEmptyFeatureSetException PLATFORMBASE_EXCEPTION_ID+3
-#define PlatformBase_Exception_MgFdoException PLATFORMBASE_EXCEPTION_ID+4
-#define PlatformBase_Exception_MgFeatureServiceException PLATFORMBASE_EXCEPTION_ID+5
-#define PlatformBase_Exception_MgInvalidLayerDefinitionException PLATFORMBASE_EXCEPTION_ID+6
-#define PlatformBase_Exception_MgInvalidMapDefinitionException PLATFORMBASE_EXCEPTION_ID+7
-#define PlatformBase_Exception_MgInvalidRepositoryNameException PLATFORMBASE_EXCEPTION_ID+8
-#define PlatformBase_Exception_MgInvalidRepositoryTypeException PLATFORMBASE_EXCEPTION_ID+9
-#define PlatformBase_Exception_MgInvalidResourceDataNameException PLATFORMBASE_EXCEPTION_ID+10
-#define PlatformBase_Exception_MgInvalidResourceDataTypeException PLATFORMBASE_EXCEPTION_ID+11
-#define PlatformBase_Exception_MgInvalidResourceNameException PLATFORMBASE_EXCEPTION_ID+12
-#define PlatformBase_Exception_MgInvalidResourcePathException PLATFORMBASE_EXCEPTION_ID+13
-#define PlatformBase_Exception_MgInvalidResourcePreProcessingTypeException PLATFORMBASE_EXCEPTION_ID+14
-#define PlatformBase_Exception_MgInvalidResourceTypeException PLATFORMBASE_EXCEPTION_ID+15
-#define PlatformBase_Exception_MgInvalidSymbolDefinitionException PLATFORMBASE_EXCEPTION_ID+16
-#define PlatformBase_Exception_MgLayerNotFoundException PLATFORMBASE_EXCEPTION_ID+17
-#define PlatformBase_Exception_MgResourceBusyException PLATFORMBASE_EXCEPTION_ID+18
-#define PlatformBase_Exception_MgResourceDataNotFoundException PLATFORMBASE_EXCEPTION_ID+19
-#define PlatformBase_Exception_MgResourceNotFoundException PLATFORMBASE_EXCEPTION_ID+20
-#define PlatformBase_Exception_MgServiceNotAvailableException PLATFORMBASE_EXCEPTION_ID+21
-#define PlatformBase_Exception_MgServiceNotSupportedException PLATFORMBASE_EXCEPTION_ID+22
-#define PlatformBase_Exception_MgUserNotFoundException PLATFORMBASE_EXCEPTION_ID+23
-#define PlatformBase_Exception_MgInvalidWatermarkDefinitionException PLATFORMBASE_EXCEPTION_ID+24
+#define UNUSED_PlatformBase_Exception_MgArrayTypeMismatchException PLATFORMBASE_EXCEPTION_ID+0
+#define UNUSED_PlatformBase_Exception_MgDuplicateResourceDataException PLATFORMBASE_EXCEPTION_ID+1
+#define UNUSED_PlatformBase_Exception_MgDuplicateResourceException PLATFORMBASE_EXCEPTION_ID+2
+#define UNUSED_PlatformBase_Exception_MgEmptyFeatureSetException PLATFORMBASE_EXCEPTION_ID+3
+#define UNUSED_PlatformBase_Exception_MgFdoException PLATFORMBASE_EXCEPTION_ID+4
+#define UNUSED_PlatformBase_Exception_MgFeatureServiceException PLATFORMBASE_EXCEPTION_ID+5
+#define UNUSED_PlatformBase_Exception_MgInvalidLayerDefinitionException PLATFORMBASE_EXCEPTION_ID+6
+#define UNUSED_PlatformBase_Exception_MgInvalidMapDefinitionException PLATFORMBASE_EXCEPTION_ID+7
+#define UNUSED_PlatformBase_Exception_MgInvalidRepositoryNameException PLATFORMBASE_EXCEPTION_ID+8
+#define UNUSED_PlatformBase_Exception_MgInvalidRepositoryTypeException PLATFORMBASE_EXCEPTION_ID+9
+#define UNUSED_PlatformBase_Exception_MgInvalidResourceDataNameException PLATFORMBASE_EXCEPTION_ID+10
+#define UNUSED_PlatformBase_Exception_MgInvalidResourceDataTypeException PLATFORMBASE_EXCEPTION_ID+11
+#define UNUSED_PlatformBase_Exception_MgInvalidResourceNameException PLATFORMBASE_EXCEPTION_ID+12
+#define UNUSED_PlatformBase_Exception_MgInvalidResourcePathException PLATFORMBASE_EXCEPTION_ID+13
+#define UNUSED_PlatformBase_Exception_MgInvalidResourcePreProcessingTypeException PLATFORMBASE_EXCEPTION_ID+14
+#define UNUSED_PlatformBase_Exception_MgInvalidResourceTypeException PLATFORMBASE_EXCEPTION_ID+15
+#define UNUSED_PlatformBase_Exception_MgInvalidSymbolDefinitionException PLATFORMBASE_EXCEPTION_ID+16
+#define UNUSED_PlatformBase_Exception_MgLayerNotFoundException PLATFORMBASE_EXCEPTION_ID+17
+#define UNUSED_PlatformBase_Exception_MgResourceBusyException PLATFORMBASE_EXCEPTION_ID+18
+#define UNUSED_PlatformBase_Exception_MgResourceDataNotFoundException PLATFORMBASE_EXCEPTION_ID+19
+#define UNUSED_PlatformBase_Exception_MgResourceNotFoundException PLATFORMBASE_EXCEPTION_ID+20
+#define UNUSED_PlatformBase_Exception_MgServiceNotAvailableException PLATFORMBASE_EXCEPTION_ID+21
+#define UNUSED_PlatformBase_Exception_MgServiceNotSupportedException PLATFORMBASE_EXCEPTION_ID+22
+#define UNUSED_PlatformBase_Exception_MgUserNotFoundException PLATFORMBASE_EXCEPTION_ID+23
+#define UNUSED_PlatformBase_Exception_MgInvalidWatermarkDefinitionException PLATFORMBASE_EXCEPTION_ID+24
// MapLayer API
#define PlatformBase_MapLayer_MapBase PLATFORMBASE_MAPLAYER_ID+0
@@ -95,34 +97,34 @@
#define PlatformBase_MapLayer_SelectionBase PLATFORMBASE_MAPLAYER_ID+7
// Core Service
-#define PlatformBase_Service_ServerConnection PLATFORMBASE_CORESERVICE_ID+0
+#define UNUSED_PlatformBase_Service_ServerConnection PLATFORMBASE_CORESERVICE_ID+0
#define PlatformBase_Service_Service PLATFORMBASE_CORESERVICE_ID+1
-#define PlatformBase_Service_Stream PLATFORMBASE_CORESERVICE_ID+2
-#define PlatformBase_Service_MgSiteConnection PLATFORMBASE_CORESERVICE_ID+3
-#define PlatformBase_Service_MgConnectionProperties PLATFORMBASE_CORESERVICE_ID+4
-#define PlatformBase_Service_MgServerInformation PLATFORMBASE_CORESERVICE_ID+5
-#define PlatformBase_Service_MgPackageStatusInformation PLATFORMBASE_CORESERVICE_ID+6
-#define PlatformBase_Service_Warning PLATFORMBASE_CORESERVICE_ID+7
+#define UNUSED_PlatformBase_Service_Stream PLATFORMBASE_CORESERVICE_ID+2
+#define UNUSED_PlatformBase_Service_MgSiteConnection PLATFORMBASE_CORESERVICE_ID+3
+#define UNUSED_PlatformBase_Service_MgConnectionProperties PLATFORMBASE_CORESERVICE_ID+4
+#define UNUSED_PlatformBase_Service_MgServerInformation PLATFORMBASE_CORESERVICE_ID+5
+#define UNUSED_PlatformBase_Service_MgPackageStatusInformation PLATFORMBASE_CORESERVICE_ID+6
+#define PlatformBase_Service_Warnings PLATFORMBASE_CORESERVICE_ID+7
// Feature Service
#define PlatformBase_FeatureService_ClassDefinition PLATFORMBASE_FEATURESERVICE_ID+0
#define PlatformBase_FeatureService_DataPropertyDefinition PLATFORMBASE_FEATURESERVICE_ID+1
-#define PlatformBase_FeatureService_FeatureConnection PLATFORMBASE_FEATURESERVICE_ID+2
+#define UNUSED_PlatformBase_FeatureService_FeatureConnection PLATFORMBASE_FEATURESERVICE_ID+2
#define PlatformBase_FeatureService_FeatureReader PLATFORMBASE_FEATURESERVICE_ID+3
#define PlatformBase_FeatureService_FeatureService PLATFORMBASE_FEATURESERVICE_ID+4
-#define PlatformBase_FeatureService_FeatureServiceCommon PLATFORMBASE_FEATURESERVICE_ID+5
+#define UNUSED_PlatformBase_FeatureService_FeatureServiceCommon PLATFORMBASE_FEATURESERVICE_ID+5
#define PlatformBase_FeatureService_GeometricPropertyDefinition PLATFORMBASE_FEATURESERVICE_ID+6
#define PlatformBase_FeatureService_Geometry PLATFORMBASE_FEATURESERVICE_ID+7
#define PlatformBase_FeatureService_GeometryProperty PLATFORMBASE_FEATURESERVICE_ID+8
#define PlatformBase_FeatureService_ObjectPropertyDefinition PLATFORMBASE_FEATURESERVICE_ID+9
-#define PlatformBase_FeatureService_SpatialContextExtentType PLATFORMBASE_FEATURESERVICE_ID+10
+#define UNUSED_PlatformBase_FeatureService_SpatialContextExtentType PLATFORMBASE_FEATURESERVICE_ID+10
#define PlatformBase_FeatureService_SpatialContextReader PLATFORMBASE_FEATURESERVICE_ID+11
#define PlatformBase_FeatureService_SqlDataReader PLATFORMBASE_FEATURESERVICE_ID+12
-#define PlatformBase_FeatureService_FeatureSet PLATFORMBASE_FEATURESERVICE_ID+13
+#define INTERNAL_PlatformBase_FeatureService_FeatureSet PLATFORMBASE_FEATURESERVICE_ID+13
#define PlatformBase_FeatureService_FeatureProperty PLATFORMBASE_FEATURESERVICE_ID+14
-#define PlatformBase_FeatureService_SpatialContextData PLATFORMBASE_FEATURESERVICE_ID+15
+#define INTERNAL_PlatformBase_FeatureService_SpatialContextData PLATFORMBASE_FEATURESERVICE_ID+15
#define PlatformBase_FeatureService_LongTransactionReader PLATFORMBASE_FEATURESERVICE_ID+16
-#define PlatformBase_FeatureService_LongTransactionData PLATFORMBASE_FEATURESERVICE_ID+17
+#define INTERNAL_PlatformBase_FeatureService_LongTransactionData PLATFORMBASE_FEATURESERVICE_ID+17
#define PlatformBase_FeatureService_RasterPropertyDefinition PLATFORMBASE_FEATURESERVICE_ID+18
#define PlatformBase_FeatureService_Raster PLATFORMBASE_FEATURESERVICE_ID+19
#define PlatformBase_FeatureService_RasterProperty PLATFORMBASE_FEATURESERVICE_ID+20
@@ -137,11 +139,13 @@
#define PlatformBase_FeatureService_FeatureSchemaCollection PLATFORMBASE_FEATURESERVICE_ID+29
#define PlatformBase_FeatureService_ClassDefinitionCollection PLATFORMBASE_FEATURESERVICE_ID+30
#define PlatformBase_FeatureService_GwsFeatureReader PLATFORMBASE_FEATURESERVICE_ID+32
-#define PlatformBase_FeatureService_LockFeatures PLATFORMBASE_FEATURESERVICE_ID+33
-#define PlatformBase_FeatureService_UnlockFeatures PLATFORMBASE_FEATURESERVICE_ID+34
+// Technically these 2 are public APIs, but this was never exposed to the MapGuide public API surface
+// in any targeted language, so we're treating this as internal until further notice
+#define INTERNAL_PlatformBase_FeatureService_LockFeatures PLATFORMBASE_FEATURESERVICE_ID+33
+#define INTERNAL_PlatformBase_FeatureService_UnlockFeatures PLATFORMBASE_FEATURESERVICE_ID+34
#define PlatformBase_FeatureService_GeometryTypeInfo PLATFORMBASE_FEATURESERVICE_ID+35
#define PlatformBase_FeatureService_FileFeatureSourceParams PLATFORMBASE_FEATURESERVICE_ID+36
-#define PlatformBase_FeatureService_FeatureTransaction PLATFORMBASE_FEATURESERVICE_ID+37
+#define PlatformBase_FeatureService_Transaction PLATFORMBASE_FEATURESERVICE_ID+37
#define PlatformBase_FeatureService_Parameter PLATFORMBASE_FEATURESERVICE_ID+38
// Resource Service
@@ -150,11 +154,11 @@
#define PlatformBase_ResourceService_Resource PLATFORMBASE_RESOURCESERVICE_ID+26
// Print Layout Service
-#define PlatformBase_PrintLayoutService_PrintLayoutServiceBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+0
-#define PlatformBase_PrintLayoutService_PrintLayoutBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+1
-#define PlatformBase_PrintLayoutService_PrintLayoutElementBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+2
-#define PlatformBase_PrintLayoutService_PrintLayoutElementCollection PLATFORMBASE_PRINTLAYOUTSERVICE_ID+3
-#define PlatformBase_PrintLayoutService_MapViewportBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+4
-#define PlatformBase_PrintLayoutService_MapView PLATFORMBASE_PRINTLAYOUTSERVICE_ID+5
-#define PlatformBase_PrintLayoutService_PropertyMapping PLATFORMBASE_PRINTLAYOUTSERVICE_ID+6
-#define PlatformBase_PrintLayoutService_PropertyMappingCollection PLATFORMBASE_PRINTLAYOUTSERVICE_ID+7
+#define INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutServiceBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+0
+#define INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+1
+#define INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutElementBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+2
+#define INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutElementCollection PLATFORMBASE_PRINTLAYOUTSERVICE_ID+3
+#define INTERNAL_PlatformBase_PrintLayoutService_MapViewportBase PLATFORMBASE_PRINTLAYOUTSERVICE_ID+4
+#define INTERNAL_PlatformBase_PrintLayoutService_MapView PLATFORMBASE_PRINTLAYOUTSERVICE_ID+5
+#define INTERNAL_PlatformBase_PrintLayoutService_PropertyMapping PLATFORMBASE_PRINTLAYOUTSERVICE_ID+6
+#define INTERNAL_PlatformBase_PrintLayoutService_PropertyMappingCollection PLATFORMBASE_PRINTLAYOUTSERVICE_ID+7
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapView.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapView.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapView.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -150,7 +150,7 @@
Ptr<MgVector3D> m_viewDirection;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_MapView;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_MapView;
};
#endif
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/MapViewportBase.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -150,7 +150,7 @@
Ptr<MgStringCollection> m_hiddenLayerNames;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_MapViewportBase;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_MapViewportBase;
};
#endif
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutBase.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -220,7 +220,7 @@
virtual const char* GetResourceTypeName();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_PrintLayoutBase;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutBase;
protected:
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementBase.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -334,7 +334,7 @@
Ptr<MgPropertyMappingCollection> m_propertyMappings;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_PrintLayoutElementBase;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutElementBase;
};
#endif
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutElementCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -429,7 +429,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_PrintLayoutElementCollection;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutElementCollection;
private:
Ptr<MgNamedCollection> m_elements;
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PrintLayoutServiceBase.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -137,7 +137,7 @@
CREFSTRING resourceXml);
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_PrintLayoutServiceBase;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutServiceBase;
protected:
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMapping.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -123,7 +123,7 @@
STRING m_targetProperty;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_PropertyMapping;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_PropertyMapping;
};
/// \}
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMappingCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMappingCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/PrintLayoutService/PropertyMappingCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -357,7 +357,7 @@
Ptr<MgDisposableCollection> m_dCollection;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_PrintLayoutService_PropertyMappingCollection;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_PrintLayoutService_PropertyMappingCollection;
};
/// \}
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ServiceRegistry.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ServiceRegistry.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ServiceRegistry.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -103,15 +103,15 @@
//put in the map any class that can be serialized
fact->Register(PlatformBase_Collection_IntCollection, MgIntCollection::CreateObject);
fact->Register(PlatformBase_Collection_PropertyDefinitionCollection, MgPropertyDefinitionCollection::CreateObject);
- fact->Register(PlatformBase_Collection_SerializableCollection, MgSerializableCollection::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_Collection_SerializableCollection, MgSerializableCollection::CreateObject);
fact->Register(PlatformBase_Collection_StringPropertyCollection, MgStringPropertyCollection::CreateObject);
fact->Register(PlatformBase_Collection_ParameterCollection, MgParameterCollection::CreateObject);
fact->Register(PlatformBase_Data_Color, MgColor::CreateObject);
- fact->Register(PlatformBase_Data_Point3D, MgPoint3D::CreateObject);
- fact->Register(PlatformBase_Data_Size2D, MgSize2D::CreateObject);
- fact->Register(PlatformBase_Data_Margin, MgMargin::CreateObject);
- fact->Register(PlatformBase_Data_Vector3D, MgVector3D::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_Data_Point3D, MgPoint3D::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_Data_Size2D, MgSize2D::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_Data_Margin, MgMargin::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_Data_Vector3D, MgVector3D::CreateObject);
fact->Register(PlatformBase_Property_PropertyDefinition, MgPropertyDefinition::CreateObject);
fact->Register(PlatformBase_Property_BlobProperty, MgBlobProperty::CreateObject);
@@ -125,7 +125,7 @@
fact->Register(PlatformBase_Property_Int64Property, MgInt64Property::CreateObject);
fact->Register(PlatformBase_Property_SingleProperty, MgSingleProperty::CreateObject);
- fact->Register(PlatformBase_Service_Warning, MgWarnings::CreateObject);
+ fact->Register(PlatformBase_Service_Warnings, MgWarnings::CreateObject);
fact->Register(PlatformBase_FeatureService_ClassDefinition, MgClassDefinition::CreateObject);
fact->Register(PlatformBase_FeatureService_DataPropertyDefinition, MgDataPropertyDefinition::CreateObject);
@@ -134,11 +134,11 @@
fact->Register(PlatformBase_FeatureService_ObjectPropertyDefinition, MgObjectPropertyDefinition::CreateObject);
fact->Register(PlatformBase_FeatureService_Parameter, MgParameter::CreateObject);
fact->Register(PlatformBase_FeatureService_SpatialContextReader, MgSpatialContextReader::CreateObject);
- fact->Register(PlatformBase_FeatureService_FeatureSet, MgFeatureSet::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_FeatureService_FeatureSet, MgFeatureSet::CreateObject);
fact->Register(PlatformBase_FeatureService_FeatureProperty, MgFeatureProperty::CreateObject);
- fact->Register(PlatformBase_FeatureService_SpatialContextData, MgSpatialContextData::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_FeatureService_SpatialContextData, MgSpatialContextData::CreateObject);
fact->Register(PlatformBase_FeatureService_LongTransactionReader, MgLongTransactionReader::CreateObject);
- fact->Register(PlatformBase_FeatureService_LongTransactionData, MgLongTransactionData::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_FeatureService_LongTransactionData, MgLongTransactionData::CreateObject);
fact->Register(PlatformBase_FeatureService_RasterPropertyDefinition, MgRasterPropertyDefinition::CreateObject);
fact->Register(PlatformBase_FeatureService_Raster, MgRaster::CreateObject);
fact->Register(PlatformBase_FeatureService_RasterProperty, MgRasterProperty::CreateObject);
@@ -148,8 +148,8 @@
fact->Register(PlatformBase_FeatureService_DeleteFeatures, MgDeleteFeatures::CreateObject);
fact->Register(PlatformBase_FeatureService_InsertFeatures, MgInsertFeatures::CreateObject);
fact->Register(PlatformBase_FeatureService_UpdateFeatures, MgUpdateFeatures::CreateObject);
- fact->Register(PlatformBase_FeatureService_LockFeatures, MgLockFeatures::CreateObject);
- fact->Register(PlatformBase_FeatureService_UnlockFeatures, MgUnlockFeatures::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_FeatureService_LockFeatures, MgLockFeatures::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_FeatureService_UnlockFeatures, MgUnlockFeatures::CreateObject);
fact->Register(PlatformBase_FeatureService_FeatureSchema, MgFeatureSchema::CreateObject);
fact->Register(PlatformBase_FeatureService_FeatureSchemaCollection, MgFeatureSchemaCollection::CreateObject);
fact->Register(PlatformBase_FeatureService_ClassDefinitionCollection, MgClassDefinitionCollection::CreateObject);
@@ -162,13 +162,13 @@
fact->Register(PlatformBase_MapLayer_LayerBase, MgLayerBase::CreateObject);
fact->Register(PlatformBase_MapLayer_SelectionBase, MgSelectionBase::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_PrintLayoutBase, MgPrintLayoutBase::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_PrintLayoutElementBase, MgPrintLayoutElementBase::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_MapViewportBase, MgMapViewportBase::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_MapView, MgMapView::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_PropertyMapping, MgPropertyMapping::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_PrintLayoutElementCollection, MgPrintLayoutElementCollection::CreateObject);
- fact->Register(PlatformBase_PrintLayoutService_PropertyMappingCollection, MgPropertyMappingCollection::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutBase, MgPrintLayoutBase::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutElementBase, MgPrintLayoutElementBase::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_MapViewportBase, MgMapViewportBase::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_MapView, MgMapView::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_PropertyMapping, MgPropertyMapping::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_PrintLayoutElementCollection, MgPrintLayoutElementCollection::CreateObject);
+ fact->Register(INTERNAL_PlatformBase_PrintLayoutService_PropertyMappingCollection, MgPropertyMappingCollection::CreateObject);
return true;
}
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/SpatialContextData.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/SpatialContextData.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/SpatialContextData.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -87,7 +87,7 @@
}
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_SpatialContextData;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_FeatureService_SpatialContextData;
};
/// \endcond
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Transaction.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Transaction.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Transaction.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -109,7 +109,7 @@
virtual ~MgTransaction();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_FeatureTransaction;
+ static const INT32 m_cls_id = PlatformBase_FeatureService_Transaction;
};
#endif
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/UnlockFeatures.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/UnlockFeatures.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/UnlockFeatures.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -132,7 +132,7 @@
INT32 GetClassId();
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_FeatureService_UnlockFeatures;
+ static const INT32 m_cls_id = INTERNAL_PlatformBase_FeatureService_UnlockFeatures;
private:
STRING m_className;
Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Warnings.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Warnings.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/Warnings.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -150,7 +150,7 @@
Ptr<MgStringCollection> m_arguments;
CLASS_ID:
- static const INT32 m_cls_id = PlatformBase_Service_Warning;
+ static const INT32 m_cls_id = PlatformBase_Service_Warnings;
};
/// \}
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Manager/LoadBalanceManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Manager/LoadBalanceManager.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Manager/LoadBalanceManager.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -681,8 +681,8 @@
{
success = true;
}
- else if (!mgException->IsOfClass(MapGuide_Exception_MgConnectionFailedException)
- && !mgException->IsOfClass(MapGuide_Exception_MgConnectionNotOpenException))
+ else if (mgException->GetExceptionCode() != MgExceptionCodes::MgConnectionFailedException
+ && mgException->GetExceptionCode() != MgExceptionCodes::MgConnectionNotOpenException)
{
MG_THROW()
}
Modified: sandbox/jng/vanilla_swig/Server/src/Common/Manager/ServiceManager.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Common/Manager/ServiceManager.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Server/src/Common/Manager/ServiceManager.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -197,8 +197,8 @@
if (mgException != NULL)
{
- if (mgException->IsOfClass(MapGuide_Exception_MgConnectionFailedException)
- || mgException->IsOfClass(MapGuide_Exception_MgConnectionNotOpenException))
+ if (mgException->GetExceptionCode() == MgExceptionCodes::MgConnectionFailedException ||
+ mgException->GetExceptionCode() == MgExceptionCodes::MgConnectionNotOpenException)
{
// Remove the server from the queues. Server is down?
for (INT32 i = 0; i < MgServerInformation::sm_knMaxNumberServices; ++i)
@@ -253,8 +253,8 @@
MG_CATCH(L"MgServiceManager.CleanUpRepositories")
if (mgException != NULL // dead locks?
- && !mgException->IsOfClass(PlatformBase_Exception_MgResourceNotFoundException)
- && !mgException->IsOfClass(MapGuide_Exception_MgRepositoryNotFoundException))
+ && mgException->GetExceptionCode() != MgExceptionCodes::MgResourceNotFoundException
+ && mgException->GetExceptionCode() != MgExceptionCodes::MgRepositoryNotFoundException)
{
undeletedSessions->Add(session);
}
Modified: sandbox/jng/vanilla_swig/Server/src/Core/OperationThread.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Core/OperationThread.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Server/src/Core/OperationThread.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -276,7 +276,7 @@
{
// The stream may contain garbage when the connection is dropped for
// some reason. Suppress this exception to reduce noise in the log file.
- if (!mgException->IsOfClass(Foundation_Exception_MgInvalidStreamHeaderException))
+ if (mgException->GetExceptionCode() != MgExceptionCodes::MgInvalidStreamHeaderException)
{
MgServerManager* serverManager = MgServerManager::GetInstance();
STRING locale = (NULL == serverManager) ?
Modified: sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp
===================================================================
--- sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Server/src/Services/Resource/ServerResourceService.cpp 2020-11-20 14:36:21 UTC (rev 9798)
@@ -2617,8 +2617,8 @@
{
permitted = true;
}
- else if (!mgException->IsOfClass(MapGuide_Exception_MgPermissionDeniedException) &&
- !mgException->IsOfClass(MapGuide_Exception_MgUnauthorizedAccessException))
+ else if (mgException->GetExceptionCode() != MgExceptionCodes::MgPermissionDeniedException
+ && mgException->GetExceptionCode() != MgExceptionCodes::MgUnauthorizedAccessException)
{
MG_RESOURCE_SERVICE_THROW()
}
Modified: sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpHandlerClassId.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpHandlerClassId.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/HttpHandler/HttpHandlerClassId.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -28,6 +28,6 @@
#define HttpHandler_MapAgent_HttpRequest HTTPHANDLER_MAPAGENT_ID+4
#define HttpHandler_MapAgent_HttpResponse HTTPHANDLER_MAPAGENT_ID+5
#define HttpHandler_MapAgent_HttpPrimitiveValue HTTPHANDLER_MAPAGENT_ID+6
-#define HttpHandler_MapAgent_Http HTTPHANDLER_MAPAGENT_ID+7
+#define UNUSED_HttpHandler_MapAgent_Http HTTPHANDLER_MAPAGENT_ID+7
#endif
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebAppClassId.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebAppClassId.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebAppClassId.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -21,32 +21,32 @@
#define _WEBAPP_CLASSID_H_
#define WEBAPP_ID 50000
-#define WebApp_Command WEBAPP_ID+0
-#define WebApp_UiTargetCommand WEBAPP_ID+1
-#define WebApp_SearchCommand WEBAPP_ID+2
-#define WebApp_InvokeScriptCommand WEBAPP_ID+3
-#define WebApp_InvokeUrlCommand WEBAPP_ID+4
-#define WebApp_BufferCommand WEBAPP_ID+5
-#define WebApp_SelectWithinCommand WEBAPP_ID+6
-#define WebApp_PrintCommand WEBAPP_ID+7
-#define WebApp_MeasureCommand WEBAPP_ID+8
-#define WebApp_GetPrintablePageCommand WEBAPP_ID+9
-#define WebApp_ViewOptionsCommand WEBAPP_ID+10
-#define WebApp_HelpCommand WEBAPP_ID+11
-#define WebApp_CommandCollection WEBAPP_ID+12
-#define WebApp_Widget WEBAPP_ID+13
-#define WebApp_SeparatorWidget WEBAPP_ID+14
-#define WebApp_CommandWidget WEBAPP_ID+15
-#define WebApp_FlyoutWidget WEBAPP_ID+16
-#define WebApp_TaskBarWidget WEBAPP_ID+17
-#define WebApp_WidgetCollection WEBAPP_ID+18
-#define WebApp_UiPane WEBAPP_ID+19
-#define WebApp_UiSizablePane WEBAPP_ID+20
-#define WebApp_ToolBar WEBAPP_ID+21
-#define WebApp_InformationPane WEBAPP_ID+22
-#define WebApp_TaskBar WEBAPP_ID+23
-#define WebApp_TaskPane WEBAPP_ID+24
-#define WebApp_ContextMenu WEBAPP_ID+25
+#define WebApp_WebCommand WEBAPP_ID+0
+#define WebApp_WebUiTargetCommand WEBAPP_ID+1
+#define WebApp_WebSearchCommand WEBAPP_ID+2
+#define WebApp_WebInvokeScriptCommand WEBAPP_ID+3
+#define WebApp_WebInvokeUrlCommand WEBAPP_ID+4
+#define WebApp_WebBufferCommand WEBAPP_ID+5
+#define WebApp_WebSelectWithinCommand WEBAPP_ID+6
+#define WebApp_WebPrintCommand WEBAPP_ID+7
+#define WebApp_WebMeasureCommand WEBAPP_ID+8
+#define WebApp_WebGetPrintablePageCommand WEBAPP_ID+9
+#define WebApp_WebViewOptionsCommand WEBAPP_ID+10
+#define WebApp_WebHelpCommand WEBAPP_ID+11
+#define WebApp_WebCommandCollection WEBAPP_ID+12
+#define WebApp_WebWidget WEBAPP_ID+13
+#define WebApp_WebSeparatorWidget WEBAPP_ID+14
+#define WebApp_WebCommandWidget WEBAPP_ID+15
+#define WebApp_WebFlyoutWidget WEBAPP_ID+16
+#define WebApp_WebTaskBarWidget WEBAPP_ID+17
+#define WebApp_WebWidgetCollection WEBAPP_ID+18
+#define WebApp_WebUiPane WEBAPP_ID+19
+#define WebApp_WebUiSizablePane WEBAPP_ID+20
+#define WebApp_WebToolBar WEBAPP_ID+21
+#define WebApp_WebInformationPane WEBAPP_ID+22
+#define WebApp_WebTaskBar WEBAPP_ID+23
+#define WebApp_WebTaskPane WEBAPP_ID+24
+#define WebApp_WebContextMenu WEBAPP_ID+25
#define WebApp_WebLayout WEBAPP_ID+26
#endif
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebBufferCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebBufferCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebBufferCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -34,7 +34,7 @@
MgWebBufferCommand();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_BufferCommand;
+ static const INT32 m_cls_id = WebApp_WebBufferCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -130,7 +130,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_Command;
+ static const INT32 m_cls_id = WebApp_WebCommand;
protected:
STRING m_name;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -167,7 +167,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_CommandCollection;
+ static const INT32 m_cls_id = WebApp_WebCommandCollection;
private:
Ptr<MgNamedCollection> m_commands;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandWidget.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandWidget.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebCommandWidget.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -58,7 +58,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_CommandWidget;
+ static const INT32 m_cls_id = WebApp_WebCommandWidget;
private:
Ptr<MgWebCommand> m_command;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebContextMenu.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebContextMenu.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebContextMenu.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -56,7 +56,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_ContextMenu;
+ static const INT32 m_cls_id = WebApp_WebContextMenu;
private:
bool m_visible;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebFlyoutWidget.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebFlyoutWidget.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebFlyoutWidget.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -128,7 +128,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_FlyoutWidget;
+ static const INT32 m_cls_id = WebApp_WebFlyoutWidget;
private:
Ptr<MgWebWidgetCollection> m_subItems;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebGetPrintablePageCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebGetPrintablePageCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebGetPrintablePageCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -34,7 +34,7 @@
MgWebGetPrintablePageCommand();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_GetPrintablePageCommand;
+ static const INT32 m_cls_id = WebApp_WebGetPrintablePageCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebHelpCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebHelpCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebHelpCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -43,7 +43,7 @@
void SetUrl(CREFSTRING url);
CLASS_ID:
- static const INT32 m_cls_id = WebApp_HelpCommand;
+ static const INT32 m_cls_id = WebApp_WebHelpCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebInformationPane.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebInformationPane.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebInformationPane.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -72,7 +72,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_InformationPane;
+ static const INT32 m_cls_id = WebApp_WebInformationPane;
private:
bool m_legendVisible;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeScriptCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeScriptCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeScriptCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -43,7 +43,7 @@
void SetScriptCode(CREFSTRING code);
CLASS_ID:
- static const INT32 m_cls_id = WebApp_InvokeScriptCommand;
+ static const INT32 m_cls_id = WebApp_WebInvokeScriptCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeUrlCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeUrlCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebInvokeUrlCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -123,7 +123,7 @@
MgStringCollection* GetLayers();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_InvokeUrlCommand;
+ static const INT32 m_cls_id = WebApp_WebInvokeUrlCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebMeasureCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebMeasureCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebMeasureCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -34,7 +34,7 @@
MgWebMeasureCommand();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_MeasureCommand;
+ static const INT32 m_cls_id = WebApp_WebMeasureCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebPrintCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebPrintCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebPrintCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -58,7 +58,7 @@
MgStringCollection* GetPrintLayouts();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_PrintCommand;
+ static const INT32 m_cls_id = WebApp_WebPrintCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebSearchCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebSearchCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebSearchCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -119,7 +119,7 @@
MgPropertyCollection* GetResultColumns();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_SearchCommand;
+ static const INT32 m_cls_id = WebApp_WebSearchCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebSelectWithinCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebSelectWithinCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebSelectWithinCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -34,7 +34,7 @@
MgWebSelectWithinCommand();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_SelectWithinCommand;
+ static const INT32 m_cls_id = WebApp_WebSelectWithinCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebSeparatorWidget.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebSeparatorWidget.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebSeparatorWidget.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -47,7 +47,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_SeparatorWidget;
+ static const INT32 m_cls_id = WebApp_WebSeparatorWidget;
};
#endif // _MGWEBSEPARATORWIDGET_
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBar.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBar.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBar.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -62,7 +62,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_TaskBar;
+ static const INT32 m_cls_id = WebApp_WebTaskBar;
private:
Ptr<MgWebWidgetCollection> m_taskList;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBarWidget.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBarWidget.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskBarWidget.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -114,7 +114,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_TaskBarWidget;
+ static const INT32 m_cls_id = WebApp_WebTaskBarWidget;
private:
STRING m_name;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskPane.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskPane.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebTaskPane.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -67,7 +67,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_TaskPane;
+ static const INT32 m_cls_id = WebApp_WebTaskPane;
private:
Ptr<MgWebTaskBar> m_taskBar;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebToolbar.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebToolbar.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebToolbar.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -52,7 +52,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_ToolBar;
+ static const INT32 m_cls_id = WebApp_WebToolBar;
private:
Ptr<MgWebWidgetCollection> m_widgets;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiPane.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiPane.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiPane.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -56,7 +56,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_UiPane;
+ static const INT32 m_cls_id = WebApp_WebUiPane;
protected:
bool m_visible;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiSizablePane.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiSizablePane.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiSizablePane.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -57,7 +57,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_UiSizablePane;
+ static const INT32 m_cls_id = WebApp_WebUiSizablePane;
protected:
INT32 m_width;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiTargetCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiTargetCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebUiTargetCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -58,7 +58,7 @@
void SetTargetName(STRING targetName);
CLASS_ID:
- static const INT32 m_cls_id = WebApp_UiTargetCommand;
+ static const INT32 m_cls_id = WebApp_WebUiTargetCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebViewOptionsCommand.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebViewOptionsCommand.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebViewOptionsCommand.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -34,7 +34,7 @@
MgWebViewOptionsCommand();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_ViewOptionsCommand;
+ static const INT32 m_cls_id = WebApp_WebViewOptionsCommand;
protected:
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidget.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidget.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidget.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -55,7 +55,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_Widget;
+ static const INT32 m_cls_id = WebApp_WebWidget;
protected:
INT32 m_type;
Modified: sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidgetCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidgetCollection.h 2020-11-20 14:21:54 UTC (rev 9797)
+++ sandbox/jng/vanilla_swig/Web/src/WebApp/WebWidgetCollection.h 2020-11-20 14:36:21 UTC (rev 9798)
@@ -141,7 +141,7 @@
virtual void Dispose();
CLASS_ID:
- static const INT32 m_cls_id = WebApp_WidgetCollection;
+ static const INT32 m_cls_id = WebApp_WebWidgetCollection;
private:
Ptr<MgDisposableCollection> m_widgets;
More information about the mapguide-commits
mailing list