[Maps] Modify diposing routines

Change-Id: I328cfba3e28370c18e27943175b8ae9e496af047

diff --git a/src/Tizen.Maps/Tizen.Maps/Area.cs b/src/Tizen.Maps/Tizen.Maps/Area.cs
index 94a5a209013495a736dc5b9e34e8bf7bc544428a..135414cfc6d4c915ccc8c73732fe75a1acaa92fe 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Area.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Area.cs
@@ -59,6 +59,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the Area object.
+        /// </summary>
+        ~Area()
+        {
+            Dispose(false);
+        }
+
         #region IDisposable Support
         private bool _disposedValue = false;
 
@@ -71,7 +79,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs b/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs
index 59244e1533c8d34bf7b7fa406a1cf9acf7a72615..1bf6e96b7ecc8c5b10a4f2806a9b5c6c4fdf3381 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs
@@ -44,6 +44,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the Geocoordinates object.
+        /// </summary>
+        ~Geocoordinates()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets the latitude coordinates.
         /// </summary>
@@ -90,7 +98,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/GeocoordinatesList.cs b/src/Tizen.Maps/Tizen.Maps/GeocoordinatesList.cs
index 86b77aa2bad9fc0ef73b682bef08fe9e049a7755..59105d94326402f835b2ba123b45ca058ca55d7f 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/GeocoordinatesList.cs
+++ b/src/Tizen.Maps/Tizen.Maps/GeocoordinatesList.cs
@@ -35,6 +35,14 @@ namespace Tizen.Maps
             }
         }
 
+        /// <summary>
+        /// Destroy the GeocoordinatesList object.
+        /// </summary>
+        ~GeocoordinatesList()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// The iterator for coordinates in this list.
         /// </summary>
@@ -59,7 +67,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/MapService.cs b/src/Tizen.Maps/Tizen.Maps/MapService.cs
index dab53f4ee01f81b47c11ab9791932df5095c69f6..a4ee487467aa0ff0af82158251428410d5820aa7 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/MapService.cs
+++ b/src/Tizen.Maps/Tizen.Maps/MapService.cs
@@ -56,6 +56,14 @@ namespace Tizen.Maps
             Preferences = new SearchPreference();
         }
 
+        /// <summary>
+        /// Destroy the MapService object.
+        /// </summary>
+        ~MapService()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets the list of available map service providers.
         /// </summary>
@@ -369,10 +377,10 @@ namespace Tizen.Maps
             {
                 if (disposing)
                 {
-                    _filter.Dispose();
-                    _searchPreference.Dispose();
+                    _filter?.Dispose();
+                    _searchPreference?.Dispose();
                 }
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs b/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs
index 36c66e611adc6eea5092b1bc3636fd7cb72295e2..c3750cf5c69f5d27c72d49b7c2d7f5acc240fb0a 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs
+++ b/src/Tizen.Maps/Tizen.Maps/MapServiceRequest.cs
@@ -48,6 +48,14 @@ namespace Tizen.Maps
             _type = type;
         }
 
+        /// <summary>
+        /// Destroy the MapServiceRequest object.
+        /// </summary>
+        ~MapServiceRequest()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Sends a request to the map service provider.
         /// </summary>
@@ -103,7 +111,6 @@ namespace Tizen.Maps
                 if (disposing)
                 {
                     Cancel();
-                    _service.Dispose();
                 }
                 _disposedValue = true;
             }

diff --git a/src/Tizen.Maps/Tizen.Maps/MapView.cs b/src/Tizen.Maps/Tizen.Maps/MapView.cs
index c20c060c9abf1ed2bbc366ceb4b3b70290503456..54638d41b55299e7e4cfef79948ee70f216c43f1 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/MapView.cs
+++ b/src/Tizen.Maps/Tizen.Maps/MapView.cs
@@ -70,6 +70,14 @@ namespace Tizen.Maps
             SetObjectEventCallback();
         }
 
+        /// <summary>
+        /// Destroy the MapView object.
+        /// </summary>
+        ~MapView()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Adds or removes event handlers to deliver a scrolled gesture event.
         /// </summary>
@@ -764,9 +772,9 @@ namespace Tizen.Maps
             {
                 if (disposing)
                 {
-                    _service.Dispose();
+                    _handleToObjectTable?.Clear();
                 }
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Marker.cs b/src/Tizen.Maps/Tizen.Maps/Marker.cs
index 91ae93ac61963c7b7fd53d4308476119e931e02d..54c6260454d7027cdaf326954bb008c2e393ea97 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Marker.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Marker.cs
@@ -37,6 +37,14 @@ namespace Tizen.Maps
             handle = new Interop.MarkerHandle(coordinates.handle, imagePath, type);
         }
 
+        /// <summary>
+        /// Destroy the Marker object.
+        /// </summary>
+        ~Marker()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets or sets the clicked event handlers.
         /// </summary>
@@ -169,12 +177,11 @@ namespace Tizen.Maps
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         /// <param name="disposing">If true, managed and unmanaged resources can be disposed, otherwise only unmanaged resources can be disposed.</param>
-        /// <since_tizen> 3 </since_tizen>
         protected virtual void Dispose(bool disposing)
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Overlay.cs b/src/Tizen.Maps/Tizen.Maps/Overlay.cs
index d1551c337485217216e99c7f3e7fb2a5c0c90b2d..2ce79ae8634df98deb94c7bb5aa2bbe60391106b 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Overlay.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Overlay.cs
@@ -49,6 +49,14 @@ namespace Tizen.Maps
             handle = new Interop.OverlayHandle(coordinates.handle, objectToContain, type);
         }
 
+        /// <summary>
+        /// Destroy the Overlay object.
+        /// </summary>
+        ~Overlay()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets or sets the visibility of an overlay map object.
         /// </summary>
@@ -137,7 +145,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Place.cs b/src/Tizen.Maps/Tizen.Maps/Place.cs
index 1b0ae6e23411f8d1cc0bf19384bf211500cd8294..25714f9b8cadb3d32156558d2f7327b45adb570e 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Place.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Place.cs
@@ -32,6 +32,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the Place object.
+        /// </summary>
+        ~Place()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets an ID string for the place.
         /// </summary>
@@ -245,12 +253,11 @@ namespace Tizen.Maps
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
         /// <param name="disposing">If true, managed and unmanaged resources can be disposed, otherwise only unmanaged resources can be disposed.</param>
-        /// <since_tizen> 3 </since_tizen>
         protected virtual void Dispose(bool disposing)
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs b/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs
index 05df11b7d5993b1042a3832467f75a501e98befe..704ee95cec4afd378af81d409f1cc71e43de6ade 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs
+++ b/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs
@@ -42,6 +42,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the PlaceAddress object.
+        /// </summary>
+        ~PlaceAddress()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets a building number for this address.
         /// </summary>
@@ -224,7 +232,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceAddressList.cs b/src/Tizen.Maps/Tizen.Maps/PlaceAddressList.cs
index 1c7a89e2c8c35bdfaed00ee008e969a5a0f5d07c..80c6e523e8ffebe26628539f04f8072f0d425d75 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/PlaceAddressList.cs
+++ b/src/Tizen.Maps/Tizen.Maps/PlaceAddressList.cs
@@ -42,6 +42,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the PlaceAddressList object.
+        /// </summary>
+        ~PlaceAddressList()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets an iterator for addresses in this list.
         /// </summary>
@@ -69,7 +77,11 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                if (disposing)
+                {
+                    _list?.Clear();
+                }
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs b/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs
index 96456093db972d3a05134fba3191412f40ed8d7b..8c1d2cb377732e26176089e0f5b34d928ef2a385 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs
+++ b/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs
@@ -41,6 +41,13 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the PlaceCategory object.
+        /// </summary>
+        ~PlaceCategory()
+        {
+            Dispose(false);
+        }
 
         /// <summary>
         /// Gets or sets an ID for this category.
@@ -94,7 +101,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceFilter.cs b/src/Tizen.Maps/Tizen.Maps/PlaceFilter.cs
index 6501c589b40ebae6ffc1dbe906cb52e2b05c817a..023a80fd421fb216e2ff4634e9ac52e1b31b22e4 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/PlaceFilter.cs
+++ b/src/Tizen.Maps/Tizen.Maps/PlaceFilter.cs
@@ -36,6 +36,14 @@ namespace Tizen.Maps
             handle = new Interop.PlaceFilterHandle();
         }
 
+        /// <summary>
+        /// Destroy the PlaceFilter object.
+        /// </summary>
+        ~PlaceFilter()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets or sets a free-formed address string for this place filter.
         /// </summary>
@@ -121,7 +129,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceList.cs b/src/Tizen.Maps/Tizen.Maps/PlaceList.cs
index c457b1ef043de45a35f4005baffc87f7740457a6..de5a51fff4c080b70e06d384560bf29182d29c68 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/PlaceList.cs
+++ b/src/Tizen.Maps/Tizen.Maps/PlaceList.cs
@@ -32,6 +32,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the PlaceList object.
+        /// </summary>
+        ~PlaceList()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets an iterator for the addresses in this list.
         /// </summary>
@@ -59,7 +67,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Polygon.cs b/src/Tizen.Maps/Tizen.Maps/Polygon.cs
index 599dd8ec40966c3feea27a5bdfc46559f8730c6e..67a606df132c60b8e1f5ab1ce1e4822f1703b5cd 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Polygon.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Polygon.cs
@@ -50,6 +50,14 @@ namespace Tizen.Maps
             handle = new Interop.PolygonHandle(geocoordinateList.handle, color);
         }
 
+        /// <summary>
+        /// Destroy the Polygon object.
+        /// </summary>
+        ~Polygon()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Adds or removes the clicked event handlers.
         /// </summary>
@@ -138,9 +146,9 @@ namespace Tizen.Maps
             {
                 if (disposing)
                 {
-                    _coordinateList.Clear();
+                    _coordinateList?.Clear();
                 }
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Polyline.cs b/src/Tizen.Maps/Tizen.Maps/Polyline.cs
index 918a94f2e4f1d23d699c283c0e82c509cfb12708..79f9b3a2ffc007dd5ed4c8474de308f5a691f7fe 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Polyline.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Polyline.cs
@@ -51,6 +51,14 @@ namespace Tizen.Maps
             handle = new Interop.PolylineHandle(geocoordinateList.handle, color, width);
         }
 
+        /// <summary>
+        /// Destroy the Polyline object.
+        /// </summary>
+        ~Polyline()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Adds or removes the clicked event handlers.
         /// </summary>
@@ -155,9 +163,9 @@ namespace Tizen.Maps
             {
                 if (disposing)
                 {
-                    _coordinateList.Clear();
+                    _coordinateList?.Clear();
                 }
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/Route.cs b/src/Tizen.Maps/Tizen.Maps/Route.cs
index 799a70bc9de8093a4c77c8ae91f09edebc579b6c..c0312d6413c1bf76eb1524b4e27fa6e0cf6eaac6 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/Route.cs
+++ b/src/Tizen.Maps/Tizen.Maps/Route.cs
@@ -33,6 +33,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the Route object.
+        /// </summary>
+        ~Route()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets an instance of <see cref="Geocoordinates"/> object representing destination coordinates for this route.
         /// </summary>
@@ -168,7 +176,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }

diff --git a/src/Tizen.Maps/Tizen.Maps/SearchPreference.cs b/src/Tizen.Maps/Tizen.Maps/SearchPreference.cs
index e751ccf71e31df29dc4ead352b415ffd0140ddbe..4dd543559d95b18e0c622d83876cfdc24f1ec3d9 100755 (executable)
--- a/src/Tizen.Maps/Tizen.Maps/SearchPreference.cs
+++ b/src/Tizen.Maps/Tizen.Maps/SearchPreference.cs
@@ -45,6 +45,14 @@ namespace Tizen.Maps
             handle = nativeHandle;
         }
 
+        /// <summary>
+        /// Destroy the SearchPreference object.
+        /// </summary>
+        ~SearchPreference()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Gets or sets a preferred language.
         /// </summary>
@@ -240,7 +248,7 @@ namespace Tizen.Maps
         {
             if (!_disposedValue)
             {
-                handle.Dispose();
+                handle?.Dispose();
                 _disposedValue = true;
             }
         }