[mapguide-commits] r9966 - in sandbox/jng/vanilla_swig: Bindings Common/Foundation/Data Common/Geometry/CoordinateSystem Common/MapGuideCommon/MapLayer Common/PlatformBase/Data Common/PlatformBase/MapLayer Common/PlatformBase/Services

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Sep 2 08:54:57 PDT 2022


Author: jng
Date: 2022-09-02 08:54:56 -0700 (Fri, 02 Sep 2022)
New Revision: 9966

Modified:
   sandbox/jng/vanilla_swig/Bindings/TODO.txt
   sandbox/jng/vanilla_swig/Common/Foundation/Data/BatchPropertyCollection.h
   sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyCollection.h
   sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyDefinition.h
   sandbox/jng/vanilla_swig/Common/Foundation/Data/StringCollection.h
   sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h
   sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Map.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/Data/IntCollection.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/Data/PropertyDefinitionCollection.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerCollection.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerGroupCollection.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinition.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinitionCollection.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchema.h
   sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchemaCollection.h
Log:
Document the needed method name changes for specific language binding targets

Modified: sandbox/jng/vanilla_swig/Bindings/TODO.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/TODO.txt	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Bindings/TODO.txt	2022-09-02 15:54:56 UTC (rev 9966)
@@ -109,7 +109,7 @@
      - Add assembly reference to netstandard
      - Enable legacy request validation mode
      - Target .net Framework 4.8
- - [ ] Rename various public C++ APIs to avoid language-specific renaming workarounds
+ - [ ] Document cases where APIs have been renamed on certain language targets
    - MgCoordinateSystemMeasure
       - GetDistance -> GetDistanceSimple
       - GetAzimuth -> GetAzimuthSimple

Modified: sandbox/jng/vanilla_swig/Common/Foundation/Data/BatchPropertyCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/Data/BatchPropertyCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/Foundation/Data/BatchPropertyCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -87,12 +87,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// virtual int Add(MgPropertyCollection value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// virtual int Add(MgPropertyCollection value);
+    /// virtual int addItem(MgPropertyCollection value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// virtual int Add(MgPropertyCollection value);

Modified: sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -94,12 +94,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// virtual int Add(MgProperty value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// virtual int Add(MgProperty value);
+    /// virtual int addItem(MgProperty value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// virtual int Add(MgProperty value);

Modified: sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyDefinition.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyDefinition.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/Foundation/Data/PropertyDefinition.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -186,12 +186,15 @@
     /// \brief
     /// Marks the property definition for deletion.
     ///
+    /// \remarks
+    /// This method is called markAsDeleted in Java (to avoid conflicting with a SWIG-generated method of the same name)
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Delete();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Delete();
+    /// void markAsDeleted();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// void Delete();
@@ -201,7 +204,8 @@
     /// Returns nothing.
     ///
     /// \since 2.2
-	///
+    /// \since 4.0 Documented the name change for Java
+    ///
     void Delete();
 
 EXTERNAL_API:

Modified: sandbox/jng/vanilla_swig/Common/Foundation/Data/StringCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/Data/StringCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/Foundation/Data/StringCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -130,12 +130,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// virtual int Add(string value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// virtual int Add(String value);
+    /// virtual int addItem(String value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// virtual int Add(string value);

Modified: sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -128,6 +128,11 @@
     /// \brief
     /// Computes the distance between two coordinates.
     ///
+    /// \remarks
+    /// This method is called GetDistanceSimple in PHP
+    ///
+    /// \since 4.0 Documented method name change for PHP
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     ///  virtual double GetDistance(double x1, double y1, double x2, double y2);
@@ -136,7 +141,7 @@
     ///  virtual double GetDistance(double x1, double y1, double x2, double y2);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    ///  virtual double GetDistance(double x1, double y1, double x2, double y2);
+    ///  virtual double GetDistanceSimple(double x1, double y1, double x2, double y2);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param x1 (double)
@@ -162,7 +167,7 @@
     /// 42.355892) is Boston, Massachusetts. $distance is
     /// 361777.95418396 meters.
     /// \code
-    /// $distance = $coordSysMeasure->Getdistance(-74.806394, 40.714169, -71.061342, 42.355892);
+    /// $distance = $coordSysMeasure->GetDistanceSimple(-74.806394, 40.714169, -71.061342, 42.355892);
     /// \endcode
     /// \htmlinclude ExampleBottom.html
     ////
@@ -273,6 +278,11 @@
     /// Computes the angle with respect to the north of a vector
     /// formed by two coordinates.
     ///
+    /// \remarks
+    /// This method is called GetAzimuthSimple in PHP
+    ///
+    /// \since 4.0 Documented method name change for PHP
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     ///  virtual double GetAzimuth(double lon1, double lat1, double lon2, double lat2);
@@ -281,7 +291,7 @@
     ///  virtual double GetAzimuth(double lon1, double lat1, double lon2, double lat2);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    ///  virtual double GetAzimuth(double lon1, double lat1, double lon2, double lat2);
+    ///  virtual double GetAzimuthSimple(double lon1, double lat1, double lon2, double lat2);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param x1 (double)
@@ -307,8 +317,8 @@
     /// 42.355892) is Boston, Massachusetts. $azimuth12 is
     /// 58.507421025167, and $azimuth21 = -119.00856518347.
     /// \code
-    /// $azimuth12 = $coordSysMeasure->GetAzimuth(-74.806394, 40.714169, -71.061342, 42.355892);
-    /// $azimuth21 = $coordSysMeasure->GetAzimuth(-71.061342, 42.355892, -74.806394, 40.714169);
+    /// $azimuth12 = $coordSysMeasure->GetAzimuthSimple(-74.806394, 40.714169, -71.061342, 42.355892);
+    /// $azimuth21 = $coordSysMeasure->GetAzimuthSimple(-71.061342, 42.355892, -74.806394, 40.714169);
     /// \endcode
     /// \htmlinclude ExampleBottom.html
     ///
@@ -418,7 +428,7 @@
     ///
     /// \exception MgCoordinateSystemMeasureFailedException
     ///
-     virtual MgCoordinate* GetCoordinate(MgCoordinate* coord, double azimuth, double distance)=0;
+    virtual MgCoordinate* GetCoordinate(MgCoordinate* coord, double azimuth, double distance)=0;
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     /// \brief
@@ -426,6 +436,11 @@
     /// defined by a starting coordinate and an azimuth
     /// (Angle with respect to the North).
     ///
+    /// \remarks
+    /// This method is called GetCoordinateSimple in PHP
+    ///
+    /// \since 4.0 Documented method name change for PHP
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     ///  virtual MgCoordinate GetCoordinate(double lon, double lat, double azimuth, double distance);
@@ -434,7 +449,7 @@
     ///  virtual MgCoordinate GetCoordinate(double lon, double lat, double azimuth, double distance);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    ///  virtual MgCoordinate GetCoordinate(double lon, double lat, double azimuth, double distance);
+    ///  virtual MgCoordinate GetCoordinateSimple(double lon, double lat, double azimuth, double distance);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param xStart (double)

Modified: sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Map.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Map.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/MapGuideCommon/MapLayer/Map.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -285,11 +285,6 @@
     /// definition and a name for the map. This method is used for
     /// MapGuide Viewers or for offline map production.
     ///
-    /// \remarks
-    /// If creating a MgMap object from a tile set definition, only "Default" is the
-    /// acceptable tile provider. Any other provider will cause this method to
-    /// throw a MgUnsupportedTileProviderException
-    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Create(MgResourceIdentifier mapDefinition, string mapName);
@@ -321,6 +316,9 @@
     /// \endcode
     /// \htmlinclude ExampleBottom.html
     ///
+    /// \since 4.0 This method no longer throws MgUnsupportedTileProviderException if passing a resource
+    /// id of a tile set definition not using the "Default" tile provider
+    ///
     virtual void Create(MgResourceIdentifier* resource, CREFSTRING mapName);
 
     //////////////////////////////////////////////////////////////////
@@ -358,9 +356,7 @@
     /// This method is used for MapGuide Viewers or for offline map production.
     ///
     /// \remarks
-    /// If creating a MgMap object from a tile set definition, only "Default" is the
-    /// acceptable tile provider. Any other provider will cause this method to
-    /// throw a MgUnsupportedTileProviderException
+    /// This method is called CreateStateless in PHP
     ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
@@ -370,7 +366,7 @@
     /// void Create(MgResourceIdentifier mapDefinition, String mapName, int displayWidth, int displayHeight, double x, double y, double scale, int dpi);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
-    /// void Create(MgResourceIdentifier mapDefinition, string mapName, int displayWidth, int displayHeight, double x, double y, double scale, int dpi);
+    /// void CreateStateless(MgResourceIdentifier mapDefinition, string mapName, int displayWidth, int displayHeight, double x, double y, double scale, int dpi);
     /// \htmlinclude SyntaxBottom.html
     ///
     /// \param resource
@@ -404,7 +400,7 @@
     /// $resourceID = new  MgResourceIdentifier('Library://Calgary/Maps/Calgary.MapDefinition');
     /// $map = new MgMap($site);
     /// // Initializes the map to be centered on the Calgary CBD at 1:5000 scale with a DPI of 96
-    /// $map->Create($resourceID, 'Calgary', 640, 480, -114.054565, 51.068369, 5000.0, 96);
+    /// $map->CreateStateless($resourceID, 'Calgary', 640, 480, -114.054565, 51.068369, 5000.0, 96);
     /// \endcode
     /// \htmlinclude ExampleBottom.html
     ///

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/IntCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/IntCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/IntCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -131,12 +131,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// virtual int Add(int value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// virtual int Add(int value);
+    /// virtual int addItem(int value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// virtual int Add(int value);

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Data/PropertyDefinitionCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Data/PropertyDefinitionCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Data/PropertyDefinitionCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -110,12 +110,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// virtual int Add(MgPropertyDefinition value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// virtual int Add(MgPropertyDefinition value);
+    /// virtual int addItem(MgPropertyDefinition value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// virtual int Add(MgPropertyDefinition value);

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -143,12 +143,18 @@
     /// \brief
     /// Adds a layer to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Add(MgLayerBase value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Add(MgLayerBase value);
+    /// void addItem(MgLayerBase value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// void Add(MgLayerBase value);

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerGroupCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerGroupCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/MapLayer/LayerGroupCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -137,12 +137,18 @@
     /// \brief
     /// Adds a layer group to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Add(MgLayerGroup value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Add(MgLayerGroup value);
+    /// void addItem(MgLayerGroup value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// void Add(MgLayerGroup value);

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinition.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinition.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinition.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -303,12 +303,15 @@
     /// \brief
     /// Marks the class definition for deletion.
     ///
+    /// \remarks
+    /// This method is called markAsDeleted in Java (to avoid conflicting with a SWIG-generated method of the same name)
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Delete();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Delete();
+    /// void markAsDeleted();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// void Delete();
@@ -318,6 +321,7 @@
     /// Returns nothing.
     ///
     /// \since 2.2
+    /// \since 4.0 Documented the name change for Java
 	///
     void Delete();
 

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinitionCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinitionCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/ClassDefinitionCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -90,12 +90,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Add(MgClassDefinition value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Add(MgClassDefinition value);
+    /// void addItem(MgClassDefinition value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// void Add(MgClassDefinition value);

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchema.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchema.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchema.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -185,12 +185,15 @@
     /// \brief
     /// Marks the feature schema for deletion.
     ///
+    /// \remarks
+    /// This method is called markAsDeleted in Java (to avoid conflicting with a SWIG-generated method of the same name)
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// void Delete();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// void Delete();
+    /// void markAsDeleted();
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// void Delete();
@@ -200,6 +203,7 @@
     /// Returns nothing.
     ///
     /// \since 2.2
+    /// \since 4.0 Documented the name change for Java
 	///
     void Delete();
 

Modified: sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchemaCollection.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchemaCollection.h	2022-09-02 13:26:11 UTC (rev 9965)
+++ sandbox/jng/vanilla_swig/Common/PlatformBase/Services/FeatureSchemaCollection.h	2022-09-02 15:54:56 UTC (rev 9966)
@@ -90,12 +90,18 @@
     /// \brief
     /// Adds the specified item to the end of the collection.
     ///
+    /// \remarks
+    /// This method is called addItem in Java (to avoid incompatible method signature as a result of 
+    /// the Java proxy class implementing the java.util.Collection interface)
+    ///
+    /// \since 4.0 Documented method name change for Java
+    ///
     /// <!-- Syntax in .Net, Java, and PHP -->
     /// \htmlinclude DotNetSyntaxTop.html
     /// int Add(MgFeatureSchema value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude JavaSyntaxTop.html
-    /// int Add(MgFeatureSchema value);
+    /// int addItem(MgFeatureSchema value);
     /// \htmlinclude SyntaxBottom.html
     /// \htmlinclude PHPSyntaxTop.html
     /// int Add(MgFeatureSchema value);



More information about the mapguide-commits mailing list