From ba2fb3b4c437bd463a2b4a4b9e91551842ab5cef Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 16:00:50 +0000 Subject: [PATCH] Use pattern matching to check and perform type conversion --- ExcelMerge/CellTemplateSelector.cs | 5 ++--- ExcelMerge/DirectoryGridControl.xaml.cs | 6 ++---- ExcelMerge/ExcelGridControl.xaml.cs | 9 +++------ ExcelMerge/MainWindow.xaml.cs | 5 ++--- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ExcelMerge/CellTemplateSelector.cs b/ExcelMerge/CellTemplateSelector.cs index bc462fe..a59478b 100644 --- a/ExcelMerge/CellTemplateSelector.cs +++ b/ExcelMerge/CellTemplateSelector.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -25,8 +25,7 @@ public CellTemplateSelector(string binder, int columnID, string tag) { public string tag; public override System.Windows.DataTemplate SelectTemplate(object item, System.Windows.DependencyObject container) { - ExcelData rowdata = item as ExcelData; - if (rowdata != null) { + if (item is ExcelData rowdata) { Brush bg = Brushes.White; var rowdiff = rowdata.diffstatus; diff --git a/ExcelMerge/DirectoryGridControl.xaml.cs b/ExcelMerge/DirectoryGridControl.xaml.cs index 1f84641..2bb9624 100644 --- a/ExcelMerge/DirectoryGridControl.xaml.cs +++ b/ExcelMerge/DirectoryGridControl.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -79,9 +79,7 @@ private void FileGrid_ScrollChanged(object sender, ScrollChangedEventArgs e) { private void FileGrid_SelectionChanged(object sender, SelectionChangedEventArgs e) { if (e.AddedItems.Count > 0) { - // chang selected row - var row = e.AddedItems[0] as ExcelData; - if (row != null) { + if (e.AddedItems[0] is ExcelData row) { // 新行 NewRowItem 类 DirectoryDifferWindow.instance.OnSelectGridRow(Tag as string, row.rowId); } diff --git a/ExcelMerge/ExcelGridControl.xaml.cs b/ExcelMerge/ExcelGridControl.xaml.cs index 78fbace..ebdf0f6 100644 --- a/ExcelMerge/ExcelGridControl.xaml.cs +++ b/ExcelMerge/ExcelGridControl.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -352,9 +352,8 @@ private void ExcelGrid_Drop(object sender, DragEventArgs e) { private void ExcelGrid_LoadingRow(object sender, DataGridRowEventArgs e) { var row = e.Row; var index = row.GetIndex(); - var item = row.Item as ExcelData; - if (item != null) { + if (row.Item is ExcelData item) { row.Header = (item.rowId+1).ToString(); row.Height = item.maxLineCount * 15+5; } @@ -370,9 +369,7 @@ private void ExcelGrid_ScrollChanged(object sender, ScrollChangedEventArgs e) { private void ExcelGrid_SelectionChanged(object sender, SelectionChangedEventArgs e) { if (e.AddedItems.Count > 0) { - // chang selected row - var row = e.AddedItems[0] as ExcelData; - if (row != null) { + if (e.AddedItems[0] is ExcelData row) { // 新行 NewRowItem 类 //MainWindow.instance.OnSelectGridRow(Tag as string, row.rowId); } diff --git a/ExcelMerge/MainWindow.xaml.cs b/ExcelMerge/MainWindow.xaml.cs index 9e1b7f9..0ef309f 100644 --- a/ExcelMerge/MainWindow.xaml.cs +++ b/ExcelMerge/MainWindow.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -946,8 +946,7 @@ private void SortKeyCombo_SelectionChanged(object sender, SelectionChangedEventA var sheetdata = sheetsDiff[src_sheet]; if (e.AddedItems.Count > 0) { - var sortkey = e.AddedItems[0] as SheetSortKeyCombo; - if (sortkey != null && sheetdata.sortKey != sortkey.ID) { + if (e.AddedItems[0] is SheetSortKeyCombo sortkey && sheetdata.sortKey != sortkey.ID) { sheetdata.sortKey = sortkey.ID; ReDiffCurSheet();