utilnet: address build warnings

Esri · May 28, 2024 · a6ee2c2 · a6ee2c2
2 parents eb3774f + c10170f
commit a6ee2c2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/src/Toolkit/Toolkit.Maui/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Appearance.cs b/src/Toolkit/Toolkit.Maui/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Appearance.cs
@@ -19,7 +19,9 @@
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui;
 
-public partial class UtilityNetworkTraceTool
+#pragma warning disable CA1001
+public partial class UtilityNetworkTraceTool
+#pragma warning restore CA1001
 {
 #pragma warning disable SA1310, SX1309, SA1306
     // Navigation

diff --git a/src/Toolkit/Toolkit.Maui/UtilityNetworkTraceTool/UtilityNetworkTraceTool.cs b/src/Toolkit/Toolkit.Maui/UtilityNetworkTraceTool/UtilityNetworkTraceTool.cs
@@ -338,11 +338,9 @@ private void PART_RunTraceButton_Clicked(object? sender, EventArgs e)
     private void OnAddStartingPointClicked(object? sender, EventArgs e) => _controller.IsAddingStartingPoints = !_controller.IsAddingStartingPoints;
 
     private void PART_NetworksCollectionView_SelectionChanged(object? sender, EventArgs e)
-    {
-        if (PART_ListViewNetworks?.SelectedItem is UtilityNetwork newSelection)
-        {
-            _controller.SelectedUtilityNetwork = newSelection;
-        }
+    {
+        _controller.SelectedUtilityNetwork = PART_ListViewNetworks?.SelectedItem as UtilityNetwork;
+        UtilityNetworkChanged?.Invoke(this, new UtilityNetworkChangedEventArgs(_controller.SelectedUtilityNetwork));
     }
 
     private void UtilityNetworks_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
@@ -397,12 +395,15 @@ private void Results_CollectionChanged(object? sender, NotifyCollectionChangedEv
                     _resultOverlays.Add(item.ResultOverlay);
                     GeoView.GraphicsOverlays.Insert(0, item.ResultOverlay);
                 }
-
-                UtilityNetworkTraceCompleted?.Invoke(this, new UtilityNetworkTraceCompletedEventArgs(item.Parameters, item.RawResults));
-                if (item?.Error != null)
+
+                if (item.Error != null)
                 {
                     UtilityNetworkTraceCompleted?.Invoke(this, new UtilityNetworkTraceCompletedEventArgs(item.Parameters, item.Error));
                 }
+                else
+                {
+                    UtilityNetworkTraceCompleted?.Invoke(this, new UtilityNetworkTraceCompletedEventArgs(item.Parameters, item.RawResults));
+                }
             }
         }
 

diff --git a/...Toolkit/Toolkit.UI.Controls/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Appearance.cs b/...Toolkit/Toolkit.UI.Controls/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Appearance.cs
@@ -64,7 +64,9 @@ namespace Esri.ArcGISRuntime.Toolkit.UI.Controls
 #else
     [TemplatePart(Name = "PART_TabsControl", Type = typeof(Pivot))]
 #endif
+#pragma warning disable CA1001
     public partial class UtilityNetworkTraceTool
+#pragma warning restore CA1001
     {
         private UIElement? _loadingScrim;
         private UIElement? _ineligibleScrim;

diff --git a/src/Toolkit/Toolkit.UI.Controls/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Windows.cs b/src/Toolkit/Toolkit.UI.Controls/UtilityNetworkTraceTool/UtilityNetworkTraceTool.Windows.cs
@@ -155,11 +155,14 @@ private void Results_CollectionChanged(object? sender, NotifyCollectionChangedEv
                         GeoView.GraphicsOverlays.Insert(0, item.ResultOverlay);
                     }
 
-                    UtilityNetworkTraceCompleted?.Invoke(this, new UtilityNetworkTraceCompletedEventArgs(item.Parameters, item.RawResults));
-                    if (item?.Error != null)
+                    if (item.Error != null)
                     {
                         UtilityNetworkTraceCompleted?.Invoke(this, new UtilityNetworkTraceCompletedEventArgs(item.Parameters, item.Error));
                     }
+                    else
+                    {
+                        UtilityNetworkTraceCompleted?.Invoke(this, new UtilityNetworkTraceCompletedEventArgs(item.Parameters, item.RawResults));
+                    }
                 }
             }