Skip to content

Commit 4fd3b74

Browse files
Randall FlaggRandall Flagg
authored andcommitted
Got rid of a few warnings
1 parent 41d56a6 commit 4fd3b74

7 files changed

Lines changed: 47 additions & 24 deletions

File tree

src/ColumnizerLib/ILogLineColumnizerCallback.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#pragma warning disable IDE0040
2+
13
namespace LogExpert;
24

35
///<summary>

src/LogExpert.Core/Classes/Bookmark/BookmarkDataProvider.cs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,11 @@ public BookmarkDataProvider (SortedList<int, Entities.Bookmark> bookmarkList)
2727

2828
#endregion
2929

30-
#region Delegates
31-
32-
public delegate void AllBookmarksRemovedEventHandler (object sender, EventArgs e);
33-
34-
public delegate void BookmarkAddedEventHandler (object sender, EventArgs e);
35-
36-
public delegate void BookmarkRemovedEventHandler (object sender, EventArgs e);
37-
38-
#endregion
39-
4030
#region Events
4131

42-
public event BookmarkAddedEventHandler BookmarkAdded;
43-
public event BookmarkRemovedEventHandler BookmarkRemoved;
44-
public event AllBookmarksRemovedEventHandler AllBookmarksRemoved;
32+
public event EventHandler<EventArgs> BookmarkAdded;
33+
public event EventHandler<EventArgs> BookmarkRemoved;
34+
public event EventHandler<EventArgs> AllBookmarksRemoved;
4535

4636
#endregion
4737

@@ -141,8 +131,10 @@ public void RemoveBookmarkForLine (int lineNum)
141131
OnBookmarkRemoved();
142132
}
143133

144-
public void RemoveBookmarksForLines (List<int> lineNumList)
134+
public void RemoveBookmarksForLines (IEnumerable<int> lineNumList)
145135
{
136+
ArgumentNullException.ThrowIfNull(lineNumList);
137+
146138
foreach (var lineNum in lineNumList)
147139
{
148140
_ = BookmarkList.Remove(lineNum);
@@ -155,6 +147,8 @@ public void RemoveBookmarksForLines (List<int> lineNumList)
155147

156148
public void AddBookmark (Entities.Bookmark bookmark)
157149
{
150+
ArgumentNullException.ThrowIfNull(bookmark);
151+
158152
BookmarkList.Add(bookmark.LineNum, bookmark);
159153
OnBookmarkAdded();
160154
}

src/LogExpert.Core/Classes/Bookmark/BookmarkExporter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public static class BookmarkExporter
1313
public static void ExportBookmarkList (SortedList<int, Entities.Bookmark> bookmarkList, string logfileName,
1414
string fileName)
1515
{
16+
ArgumentNullException.ThrowIfNull(bookmarkList);
1617
FileStream fs = new(fileName, FileMode.Create, FileAccess.Write);
1718
StreamWriter writer = new(fs);
1819
writer.WriteLine("Log file name;Line number;Comment");

src/LogExpert.Core/Classes/Columnizer/ColumnizerPicker.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,15 @@ public static ILogLineColumnizer FindBetterColumnizer (string fileName,
9393
/// <param name="fileName"></param>
9494
/// <param name="logFileReader"></param>
9595
/// <returns></returns>
96-
public static ILogLineColumnizer FindColumnizer (string fileName, IAutoLogLineColumnizerCallback logFileReader, IList<ILogLineColumnizer> list)
96+
public static ILogLineColumnizer FindColumnizer (string fileName, IAutoLogLineColumnizerCallback logFileReader, IList<ILogLineColumnizer> registeredColumnizer)
9797
{
9898
if (string.IsNullOrEmpty(fileName))
9999
{
100100
return new DefaultLogfileColumnizer();
101101
}
102102

103+
ArgumentNullException.ThrowIfNull(registeredColumnizer);
104+
103105
List<ILogLine> loglines = [];
104106

105107
if (logFileReader != null)
@@ -120,8 +122,6 @@ public static ILogLineColumnizer FindColumnizer (string fileName, IAutoLogLineCo
120122
];
121123
}
122124

123-
var registeredColumnizer = list;
124-
125125
List<Tuple<Priority, ILogLineColumnizer>> priorityListOfColumnizers = [];
126126

127127
foreach (ILogLineColumnizer logLineColumnizer in registeredColumnizer)

src/LogExpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Globalization;
12
using System.Text.RegularExpressions;
23

34
using static LogExpert.Core.Classes.Columnizer.TimeFormatDeterminer;
@@ -142,13 +143,13 @@ public string[] GetColumnNames ()
142143
var i = 1;
143144
while (columnNames.Count < GetColumnCount())
144145
{
145-
columnNames.Insert(columnNames.Count - 1, "Source" + i++.ToString());
146+
columnNames.Insert(columnNames.Count - 1, $"Source{i++.ToString(CultureInfo.InvariantCulture)}");
146147
}
147148

148149
return columnNames.ToArray();
149150
}
150151

151-
public IColumnizedLogLine SplitLine (LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
152+
public IColumnizedLogLine SplitLine (ILogLineColumnizerCallback callback, ILogLine line)
152153
{
153154
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
154155
// 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789

src/LogExpert.Core/Classes/Filter/FilterPipe.cs

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
using System.Text;
2-
32
using LogExpert.Core.Interface;
4-
53
using NLog;
64

75
namespace LogExpert.Core.Classes.Filter;
86

9-
public class FilterPipe
7+
public class FilterPipe : IDisposable
108
{
119
#region Fields
1210

1311
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
1412

15-
private IList<int> _lineMappingList = [];
13+
private List<int> _lineMappingList = [];
1614
private StreamWriter _writer;
1715
private readonly object _fileNameLock = new();
16+
private bool _disposed;
1817

1918
#endregion
2019

2120
#region cTor
2221

23-
public FilterPipe (FilterParams filterParams, ILogWindow logWindow)
22+
public FilterPipe(FilterParams filterParams, ILogWindow logWindow)
2423
{
2524
FilterParams = filterParams;
2625
LogWindow = logWindow;
2726
IsStopped = false;
2827
FileName = Path.GetTempFileName();
28+
_disposed = false;
2929

3030
_logger.Info($"Created temp file: {FileName}");
3131
}
@@ -191,5 +191,29 @@ private void OnClosed ()
191191
Closed?.Invoke(this, EventArgs.Empty);
192192
}
193193

194+
public void Dispose ()
195+
{
196+
Dispose(true);
197+
GC.SuppressFinalize(this);
198+
}
199+
200+
protected virtual void Dispose (bool disposing)
201+
{
202+
if (!_disposed)
203+
{
204+
if (disposing)
205+
{
206+
_writer?.Dispose();
207+
}
208+
_disposed = true;
209+
}
210+
}
211+
212+
~FilterPipe ()
213+
{
214+
Dispose(false);
215+
}
216+
217+
194218
#endregion
195219
}

src/LogExpert.Core/Interface/IBookmarkData.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace LogExpert.Core.Interface;
44

5+
#pragma warning disable IDE0040
56
public interface IBookmarkData
67
{
78
#region Properties

0 commit comments

Comments
 (0)