editor config optimizations

Author: Hirogen

src/ColumnizerLib/IAutoLogLineColumnizerCallback.cs

@@ -1,4 +1,4 @@
-namespace LogExpert
+namespace LogExpert
 {
     public interface IAutoLogLineColumnizerCallback
     {
@@ -7,6 +7,6 @@ public interface IAutoLogLineColumnizerCallback
         /// </summary>
         /// <param name="lineNum">Number of the line to be retrieved</param>
         /// <returns>A string with line content or null if line number is out of range</returns>
-        ILogLine GetLogLine(int lineNum);
+        ILogLine GetLogLine (int lineNum);
     }
 }

src/ColumnizerLib/ILogLineColumnizerCallback.cs

@@ -1,4 +1,4 @@
-namespace LogExpert
+namespace LogExpert
 {
     ///<summary>
     ///This is a callback interface. Some of the ILogLineColumnizer functions
@@ -21,26 +21,32 @@ public interface ILogLineColumnizerCallback
         /// a ILogLineColumnizer function is called for (e.g. the line that has to be painted).
         /// </summary>
         /// <returns>The current line number starting at 0</returns>
-        int GetLineNum();
+        int GetLineNum ();
 
+        /// <summary>
+        /// This function sets the current line number. That is the line number of the log line
+        /// a ILogLineColumnizer function is called for (e.g. the line that has to be painted).
+        /// </summary>
+        /// <param name="lineNum">line number to be set</param>
+        void SetLineNum (int lineNum);
         /// <summary>
         /// Returns the full file name (path + name) of the current log file.
         /// </summary>
         /// <returns>File name of current log file</returns>
-        string GetFileName();
+        string GetFileName ();
 
         /// <summary>
         /// Returns the log line with the given index (zero-based).
         /// </summary>
         /// <param name="lineNum">Number of the line to be retrieved</param>
         /// <returns>A string with line content or null if line number is out of range</returns>
-        ILogLine GetLogLine(int lineNum);
+        ILogLine GetLogLine (int lineNum);
 
         /// <summary>
         /// Returns the number of lines of the logfile.
         /// </summary>
         /// <returns>Number of lines.</returns>
-        int GetLineCount();
+        int GetLineCount ();
 
         #endregion
     }

src/LogExpert.Core/Callback/ColumnizerCallback.cs

@@ -1,27 +1,27 @@
-using LogExpert.Core.Interface;
+using LogExpert.Core.Interface;
 
 namespace LogExpert.Classes.ILogLineColumnizerCallback
 {
     public class ColumnizerCallback : LogExpert.ILogLineColumnizerCallback, IAutoLogLineColumnizerCallback
     {
         #region Fields
 
-        protected ILogWindow _logWindow;
-        protected IPluginRegistry _pluginRegistry;
+        private protected ILogWindow _logWindow;
+        private protected IPluginRegistry _pluginRegistry;
 
         #endregion
 
         #region cTor
 
-        public ColumnizerCallback(ILogWindow logWindow)
+        public ColumnizerCallback (ILogWindow logWindow)
         {
             _logWindow = logWindow;
         }
 
-        private ColumnizerCallback(ColumnizerCallback original)
+        private ColumnizerCallback (ColumnizerCallback original)
         {
             _logWindow = original._logWindow;
-            LineNum = original.LineNum;
+            LineNum = original.GetLineNum();
         }
 
         #endregion
@@ -34,34 +34,39 @@ private ColumnizerCallback(ColumnizerCallback original)
 
         #region Public methods
 
-        public ColumnizerCallback CreateCopy()
+        public ColumnizerCallback CreateCopy ()
         {
             return new ColumnizerCallback(this);
         }
 
-        public int GetLineNum()
+        public int GetLineNum ()
         {
             return LineNum;
         }
 
-        public string GetFileName()
+        public string GetFileName ()
         {
-            return _logWindow.GetCurrentFileName(LineNum);
+            return _logWindow.GetCurrentFileName(GetLineNum());
         }
 
-        public ILogLine GetLogLine(int lineNum)
+        public ILogLine GetLogLine (int lineNum)
         {
             return _logWindow.GetLine(lineNum);
         }
 
-        public IList<ILogLineColumnizer> GetRegisteredColumnizers()
+        public IList<ILogLineColumnizer> GetRegisteredColumnizers ()
         {
             return _pluginRegistry.RegisteredColumnizers;
         }
 
-        public int GetLineCount()
+        public int GetLineCount ()
         {
-            return _logWindow._logFileReader.LineCount;
+            return _logWindow.LogFileReader.LineCount;
+        }
+
+        public void SetLineNum (int lineNum)
+        {
+            LineNum = lineNum;
         }
 
         #endregion

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

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 
 using static LogExpert.Core.Classes.Columnizer.TimeFormatDeterminer;
@@ -18,11 +15,11 @@ public class SquareBracketColumnizer : ILogLineColumnizer, IColumnizerPriority
         private int _columnCount = 5;
         private bool _isTimeExists = false;
 
-        public SquareBracketColumnizer()
+        public SquareBracketColumnizer ()
         {
         }
 
-        public SquareBracketColumnizer(int columnCount, bool isTimeExists) : this()
+        public SquareBracketColumnizer (int columnCount, bool isTimeExists) : this()
         {
             // Add message column
             _columnCount = columnCount + 1;
@@ -34,22 +31,22 @@ public SquareBracketColumnizer(int columnCount, bool isTimeExists) : this()
             }
         }
 
-        public bool IsTimeshiftImplemented()
+        public bool IsTimeshiftImplemented ()
         {
             return true;
         }
 
-        public void SetTimeOffset(int msecOffset)
+        public void SetTimeOffset (int msecOffset)
         {
             timeOffset = msecOffset;
         }
 
-        public int GetTimeOffset()
+        public int GetTimeOffset ()
         {
             return timeOffset;
         }
 
-        public DateTime GetTimestamp(LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
+        public DateTime GetTimestamp (LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
         {
             IColumnizedLogLine cols = SplitLine(callback, line);
             if (cols == null || cols.ColumnValues == null || cols.ColumnValues.Length < 2)
@@ -81,7 +78,7 @@ public DateTime GetTimestamp(LogExpert.ILogLineColumnizerCallback callback, ILog
             }
         }
 
-        public void PushValue(LogExpert.ILogLineColumnizerCallback callback, int column, string value, string oldValue)
+        public void PushValue (LogExpert.ILogLineColumnizerCallback callback, int column, string value, string oldValue)
         {
             if (column == 1)
             {
@@ -105,22 +102,22 @@ public void PushValue(LogExpert.ILogLineColumnizerCallback callback, int column,
             }
         }
 
-        public string GetName()
+        public string GetName ()
         {
             return "Square Bracket Columnizer";
         }
 
-        public string GetDescription()
+        public string GetDescription ()
         {
             return "Splits every line into n fields: Date, Time and the rest of the log message";
         }
 
-        public int GetColumnCount()
+        public int GetColumnCount ()
         {
             return _columnCount;
         }
 
-        public string[] GetColumnNames()
+        public string[] GetColumnNames ()
         {
             var columnNames = new List<string>(GetColumnCount());
             if (_isTimeExists)
@@ -151,7 +148,7 @@ public string[] GetColumnNames()
             return columnNames.ToArray();
         }
 
-        public IColumnizedLogLine SplitLine(LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
+        public IColumnizedLogLine SplitLine (LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
         {
             // 0         1         2         3         4         5         6         7         8         9         10        11        12        13        14        15        16
             // 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
@@ -217,7 +214,7 @@ public IColumnizedLogLine SplitLine(LogExpert.ILogLineColumnizerCallback callbac
             return clogLine;
         }
 
-        void SquareSplit(ref Column[] columns, string line, int dateLen, int timeLen, int dateTimeEndPos, ColumnizedLogLine clogLine)
+        void SquareSplit (ref Column[] columns, string line, int dateLen, int timeLen, int dateTimeEndPos, ColumnizedLogLine clogLine)
         {
             List<Column> columnList = [];
             int restColumn = _columnCount;
@@ -256,7 +253,7 @@ void SquareSplit(ref Column[] columns, string line, int dateLen, int timeLen, in
             columns = columnList.ToArray();
         }
 
-        public Priority GetPriority(string fileName, IEnumerable<ILogLine> samples)
+        public Priority GetPriority (string fileName, IEnumerable<ILogLine> samples)
         {
             Priority result = Priority.NotSupport;
             TimeFormatDeterminer timeDeterminer = new();

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

@@ -1,16 +1,12 @@
-using LogExpert.Classes.ILogLineColumnizerCallback;
+using LogExpert.Classes.ILogLineColumnizerCallback;
 using LogExpert.Core.Classes;
 using LogExpert.Core.Classes.Filter;
 
 using NLog;
 
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
 namespace LogExpert.Classes.Filter
 {
-    internal delegate void FilterFx(FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterResultLines, List<int> filterHitList);
+    internal delegate void FilterFx (FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterResultLines, List<int> filterHitList);
 
     internal class Filter
     {
@@ -27,7 +23,7 @@ internal class Filter
         #region cTor
 
         //TODO Is the callback needed?
-        public Filter(ColumnizerCallback callback)
+        public Filter (ColumnizerCallback callback)
         {
             _callback = callback;
             FilterResultLines = [];
@@ -51,7 +47,7 @@ public Filter(ColumnizerCallback callback)
 
         #region Public methods
 
-        public int DoFilter(FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)
+        public int DoFilter (FilterParams filterParams, int startLine, int maxCount, ProgressCallback progressCallback)
         {
             return DoFilter(filterParams, startLine, maxCount, FilterResultLines, LastFilterLinesList, FilterHitList, progressCallback);
         }
@@ -60,16 +56,16 @@ public int DoFilter(FilterParams filterParams, int startLine, int maxCount, Prog
 
         #region Private Methods
 
-        private int DoFilter(FilterParams filterParams, int startLine, int maxCount, List<int> filterResultLines,
-            List<int> lastFilterLinesList, List<int> filterHitList, ProgressCallback progressCallback)
+        private int DoFilter (FilterParams filterParams, int startLine, int maxCount, List<int> filterResultLines, List<int> lastFilterLinesList, List<int> filterHitList, ProgressCallback progressCallback)
         {
-            int lineNum = startLine;
-            int count = 0;
-            int callbackCounter = 0;
+            var lineNum = startLine;
+            var count = 0;
+            var callbackCounter = 0;
 
             try
             {
                 filterParams.Reset();
+
                 while ((count++ < maxCount || filterParams.IsInRange) && !ShouldCancel)
                 {
                     if (lineNum >= _callback.GetLineCount())
@@ -78,16 +74,17 @@ private int DoFilter(FilterParams filterParams, int startLine, int maxCount, Lis
                     }
 
                     ILogLine line = _callback.GetLogLine(lineNum);
+
                     if (line == null)
                     {
                         return count;
                     }
 
-                    _callback.LineNum = lineNum;
+                    _callback.SetLineNum(lineNum);
+
                     if (Util.TestFilterCondition(filterParams, line, _callback))
                     {
-                        AddFilterLine(lineNum, false, filterParams, filterResultLines, lastFilterLinesList,
-                            filterHitList);
+                        AddFilterLine(lineNum, false, filterParams, filterResultLines, lastFilterLinesList, filterHitList);
                     }
 
                     lineNum++;
@@ -112,7 +109,7 @@ private int DoFilter(FilterParams filterParams, int startLine, int maxCount, Lis
             return count;
         }
 
-        private void AddFilterLine(int lineNum, bool immediate, FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterLinesList, List<int> filterHitList)
+        private void AddFilterLine (int lineNum, bool immediate, FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterLinesList, List<int> filterHitList)
         {
             filterHitList.Add(lineNum);
             IList<int> filterResult = GetAdditionalFilterResults(filterParams, lineNum, lastFilterLinesList);
@@ -137,7 +134,7 @@ private void AddFilterLine(int lineNum, bool immediate, FilterParams filterParam
         /// <param name="lineNum"></param>
         /// <param name="checkList"></param>
         /// <returns></returns>
-        private IList<int> GetAdditionalFilterResults(FilterParams filterParams, int lineNum, IList<int> checkList)
+        private IList<int> GetAdditionalFilterResults (FilterParams filterParams, int lineNum, IList<int> checkList)
         {
             IList<int> resultList = [];