Skip to content

Commit e98bf4c

Browse files
RNoeldnerRNoeldner
committed
Refactoring
1 parent 2b8ba4e commit e98bf4c

File tree

10 files changed

+1196
-1156
lines changed

10 files changed

+1196
-1156
lines changed

‎Application/FindSkipRows.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void NumericUpDownSkipRows_ValueChanged(object? sender, EventArgs e)
7474

7575
private void FindSkipRows_Load(object? sender, EventArgs e)
7676
{
77-
textBox.OpenBindingStream(m_Stream as Stream,
77+
textBox.OpenBindingStream(m_Stream,
7878
Encoding.GetEncoding(m_CsvFile.CodePageId, new EncoderReplacementFallback("?"), new DecoderReplacementFallback("?")));
7979
}
8080

‎Library/ClassLibraryCSV/FileSetting/CsvFile.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@ public CsvFile()
113113
{
114114
}
115115

116+
public CsvFile(string fileName, string commentLine, string id) : this()
117+
{
118+
FileName = fileName;
119+
CommentLine = commentLine;
120+
ID = id;
121+
}
122+
116123
/// <summary>
117124
/// Gets current encoding.
118125
/// </summary>

‎Library/ClassLibraryCSV/SerializedFilesLib.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public static CsvFile LoadCsvFile(in string fileName)
4848
/// <param name="askOverwrite">
4949
/// The function to decide if we want to overwrite, usually a user prompt
5050
/// </param>
51+
/// <param name="cancellationToken"></param>
5152
public static async Task SaveSettingFileAsync(IFileSettingPhysicalFile fileSettingPhysicalFile, Func<bool> askOverwrite, CancellationToken cancellationToken)
5253
{
5354
var fileName = fileSettingPhysicalFile.FileName + CsvFile.cCsvSettingExtension;

‎Library/WinFormControls/FormColumnUI.Designer.cs

Lines changed: 1143 additions & 1140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Library/WinFormControls/FormColumnUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ private void SetDateFormat()
988988
checkedListBoxDateFormats.EndUpdate();
989989
}
990990

991-
private void SetSamplePart(object? sender, EventArgs? e) =>
991+
private void SetSamplePart(object? sender, EventArgs e) =>
992992
SetPartLabels(textBoxSplit.Text, Convert.ToInt32(numericUpDownPart.Value), checkBoxPartToEnd.Checked);
993993

994994
#if !NETFRAMEWORK

‎Library/WinFormControls/FormColumnUI.resx

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,54 @@
156156
<metadata name="labelDateSep.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
157157
<value>False</value>
158158
</metadata>
159+
<metadata name="labelTimeCol.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
160+
<value>False</value>
161+
</metadata>
162+
<metadata name="labelTimeSep.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
163+
<value>False</value>
164+
</metadata>
165+
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
166+
<value>False</value>
167+
</metadata>
168+
<metadata name="labelLessCommon.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
169+
<value>False</value>
170+
</metadata>
171+
<metadata name="linkLabelRegion.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
172+
<value>False</value>
173+
</metadata>
174+
<metadata name="labelDateOutput.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
175+
<value>False</value>
176+
</metadata>
177+
<metadata name="labelSample.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
178+
<value>False</value>
179+
</metadata>
180+
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
181+
<value>False</value>
182+
</metadata>
183+
<metadata name="labelTCFormat.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
184+
<value>False</value>
185+
</metadata>
186+
<metadata name="labelDateSep.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
187+
<value>False</value>
188+
</metadata>
159189
<metadata name="bindingSourceValueFormat.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
160190
<value>183, 17</value>
161191
</metadata>
162192
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
163193
<value>522, 22</value>
164194
</metadata>
195+
<metadata name="bindingSourceValueFormat.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
196+
<value>183, 17</value>
197+
</metadata>
165198
<metadata name="labelTimeCol.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
166199
<value>False</value>
167200
</metadata>
168201
<metadata name="columnBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
169202
<value>17, 17</value>
170203
</metadata>
204+
<metadata name="columnBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
205+
<value>17, 17</value>
206+
</metadata>
171207
<metadata name="labelTimeSep.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
172208
<value>False</value>
173209
</metadata>
@@ -192,15 +228,6 @@
192228
<metadata name="labelTCFormat.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
193229
<value>False</value>
194230
</metadata>
195-
<metadata name="bindingSourceValueFormat.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
196-
<value>183, 17</value>
197-
</metadata>
198-
<metadata name="columnBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
199-
<value>17, 17</value>
200-
</metadata>
201-
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
202-
<value>522, 22</value>
203-
</metadata>
204231
<metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
205232
<value>629, 23</value>
206233
</metadata>
@@ -210,7 +237,4 @@
210237
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
211238
<value>522, 22</value>
212239
</metadata>
213-
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
214-
<value>522, 22</value>
215-
</metadata>
216240
</root>

‎Library/WinFormControls/QuotingControl.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ private void FormatPropertyChanged(object? sender, PropertyChangedEventArgs e)
164164
[SuppressMessage("ReSharper", "RedundantCast")]
165165
[SuppressMessage("ReSharper", "RedundantDelegateCreation")]
166166
[SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")]
167+
[SuppressMessage("ReSharper", "RedundantExplicitArrayCreation")]
167168
private void InitializeComponent()
168169
{
169170
this.components = new System.ComponentModel.Container();

‎Library/WinFormControls/SyntaxHighlighterDelimitedText.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public SyntaxHighlighterDelimitedText(FastColoredTextBox textBox, string qualifi
5555
m_CommentRegex = new Regex($"\\s*{comment}.*$", RegexOptions.Multiline | RegexOptions.Compiled);
5656
}
5757

58+
// ReSharper disable once RedundantNameQualifier
5859
public override void Highlight(FastColoredTextBoxNS.Range range)
5960
{
6061
range.ClearStyle(StyleIndex.All);
@@ -81,6 +82,7 @@ public SyntaxHighlightStyleStyleSpace(Brush foreGround, Brush backGround)
8182
m_BackGround = backGround;
8283
}
8384

85+
// ReSharper disable once RedundantNameQualifier
8486
public override void Draw(Graphics gr, Point position, FastColoredTextBoxNS.Range range)
8587
{
8688
//get size of rectangle
@@ -115,6 +117,7 @@ public SyntaxHighlightStyleTab(Pen foreGround, Brush backGround)
115117
m_BackGround = backGround;
116118
}
117119

120+
// ReSharper disable once RedundantNameQualifier
118121
public override void Draw(Graphics gr, Point position, FastColoredTextBoxNS.Range range)
119122
{
120123
//get size of rectangle

‎Library/WinFormControls/ViewSetting.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CsvTools
2727
public static class ViewSetting
2828
{
2929
private static ToolStripDataGridViewColumnFilter? GetFilter(string dataPropertyName,
30-
IEnumerable<ToolStripDataGridViewColumnFilter?> columnFilters, DataGridViewColumnCollection columns,
30+
ICollection<ToolStripDataGridViewColumnFilter?> columnFilters, DataGridViewColumnCollection columns,
3131
Func<int, ToolStripDataGridViewColumnFilter>? createFilterColumn)
3232
{
3333
// look in already existing Filters
@@ -51,7 +51,7 @@ public static class ViewSetting
5151
}
5252

5353
public static bool ReStoreViewSetting(string text, DataGridViewColumnCollection columns,
54-
IEnumerable<ToolStripDataGridViewColumnFilter?> columnFilters,
54+
ICollection<ToolStripDataGridViewColumnFilter?> columnFilters,
5555
Func<int, ToolStripDataGridViewColumnFilter>? createFilterColumn,
5656
Action<DataGridViewColumn, ListSortDirection>? doSort)
5757
{

‎UnitTest/ClassLibraryCSVUnitTest/CsvFileTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class CsvFileTest
2929
public void CalculateLatestSourceTime()
3030
{
3131
var setting = new CsvFile(UnitTestStatic.GetTestPath("BasicCSV.txt"));
32+
// ReSharper disable once RedundantCast
3233
((BaseSettings) setting).CalculateLatestSourceTime();
3334
setting.CalculateLatestSourceTime();
3435

0 commit comments

Comments
 (0)