Merge pull request #387 from LogExperts/smalloptimizations

small optimizations

Author: Hirogen

src/ColumnizerLib/IContextMenuEntry.cs

@@ -4,7 +4,7 @@
 namespace LogExpert
 {
     /// <summary>
-    /// Implement this interface to add a menu entry to the context menu of LogExpert. 
+    /// Implement this interface to add a menu entry to the context menu of LogExpert.
     /// </summary>
     /// <remarks>
     /// <para>
@@ -17,12 +17,12 @@ public interface IContextMenuEntry
         #region Public methods
 
         /// <summary>
-        /// This function is called from LogExpert if the context menu is about to be displayed. 
+        /// This function is called from LogExpert if the context menu is about to be displayed.
         /// Your implementation can control whether LogExpert will show a menu entry by returning
         /// an appropriate value.<br></br>
         /// </summary>
         /// <param name="lines">A list containing all selected line numbers.</param>
-        /// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines, 
+        /// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
         ///     if necessary.</param>
         /// <param name="callback">The callback interface implemented by LogExpert. You can use the functions
         ///     for retrieving log lines or pass it along to functions of the Columnizer if needed.</param>
@@ -37,18 +37,22 @@ public interface IContextMenuEntry
         /// </returns>
         string GetMenuText(IList<int> lines, ILogLineColumnizer columnizer, ILogExpertCallback callback);
 
+        string GetMenuText(int linesCount, ILogLineColumnizer columnizer, ILogLine line);
+
 
         /// <summary>
         /// This function is called from LogExpert if the menu entry is choosen by the user. <br></br>
         /// Note that this function is called from the GUI thread. So try to avoid time consuming operations.
         /// </summary>
         /// <param name="lines">A list containing all selected line numbers.</param>
-        /// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines, 
+        /// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
         ///     if necessary.</param>
         /// <param name="callback">The callback interface implemented by LogExpert. You can use the functions
         ///     for retrieving log lines or pass it along to functions of the Columnizer if needed.</param>
         void MenuSelected(IList<int> lines, ILogLineColumnizer columnizer, ILogExpertCallback callback);
 
+        void MenuSelected(int linesCount, ILogLineColumnizer columnizer, ILogLine line);
+
         #endregion
     }
 }

src/ColumnizerLib/ILogExpertCallback.cs

@@ -17,7 +17,7 @@ public interface ILogExpertCallback : ILogLineColumnizerCallback
         /// <param name="fileName">Path of the file to be loaded.</param>
         /// <param name="title">Title shown on the tab.</param>
         /// <remarks>
-        /// The file tab is internally handled like the temp file tabs which LogExpert uses for 
+        /// The file tab is internally handled like the temp file tabs which LogExpert uses for
         /// FilterTabs or clipboard copy tabs.
         /// This has some implications:
         /// <ul>
@@ -29,24 +29,23 @@ public interface ILogExpertCallback : ILogLineColumnizerCallback
         /// </remarks>
         void AddTempFileTab(string fileName, string title);
 
-
         /// <summary>
         /// With this function you can create a new tab and add a bunch of text lines to it.
         /// </summary>
-        /// <param name="lineEntryList">A list with LineEntry items containing text and an 
+        /// <param name="lineEntryList">A list with LineEntry items containing text and an
         ///     optional reference to the original file location.</param>
         /// <param name="title">The title for the new tab.</param>
         /// <remarks>
         /// <para>
         /// The lines are given by a list of <see cref="LineEntry"/>. If you set the lineNumber field
-        /// in each LineEntry to a lineNumber of the original logfile (the logfile for which the context 
+        /// in each LineEntry to a lineNumber of the original logfile (the logfile for which the context
         /// menu is called for), you can create a 'link' from the line of your 'target output' to a line
         /// in the 'source tab'.
         /// </para>
         /// <para>
         /// The user can then navigate from the line in the new tab to the referenced
         /// line in the original file (by using "locate in original file" from the context menu).
-        /// This is especially useful for plugins that generate output lines which are directly associated 
+        /// This is especially useful for plugins that generate output lines which are directly associated
         /// to the selected input lines.
         /// </para>
         /// <para>
@@ -56,7 +55,6 @@ public interface ILogExpertCallback : ILogLineColumnizerCallback
         /// </remarks>
         void AddPipedTab(IList<LineEntry> lineEntryList, string title);
 
-
         /// <summary>
         /// Returns the title of the current tab (the tab for which the context menu plugin was called for).
         /// </summary>

src/ColumnizerLib/ILogFileInfo.cs

@@ -1,5 +1,5 @@
-using System.IO;
 using System;
+using System.IO;
 
 namespace LogExpert
 {

src/ColumnizerLib/ILogLineColumnizerCallback.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LogExpert
+namespace LogExpert
 {
     ///<summary>
     ///This is a callback interface. Some of the ILogLineColumnizer functions

src/DefaultPlugins/Eminus.cs

@@ -17,8 +17,10 @@ public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator
         #region Fields
 
         private const string CFG_FILE_NAME = "eminus.json";
-        private const string dot = ".";
-        private const string doubleDot = ":";
+        private const string DOT = ".";
+        private const string DOUBLE_DOT = ":";
+        private const string DISABLED = "_";
+
         private EminusConfig _config = new();
         private EminusConfigDlg dlg;
         private EminusConfig tmpConfig = new();
@@ -27,48 +29,50 @@ public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator
 
         #region Properties
 
-        public string Text => "eminus";
+        public static string Text => "eminus";
 
         #endregion
 
         #region Private Methods
 
         private XmlDocument BuildParam(ILogLine line)
         {
-            string temp = line.FullLine;
+            string fullLogLine = line.FullLine;
             // no Java stacktrace but some special logging of our applications at work:
-            if (temp.Contains("Exception of type", StringComparison.CurrentCulture) || temp.Contains("Nested:", StringComparison.CurrentCulture))
+            if (fullLogLine.Contains("Exception of type", StringComparison.CurrentCulture) ||
+                fullLogLine.Contains("Nested:", StringComparison.CurrentCulture))
             {
-                int pos = temp.IndexOf("created in ");
+                int pos = fullLogLine.IndexOf("created in ");
+
                 if (pos == -1)
                 {
                     return null;
                 }
 
                 pos += "created in ".Length;
-                int endPos = temp.IndexOf(dot, pos);
+                int endPos = fullLogLine.IndexOf(DOT, pos);
 
                 if (endPos == -1)
                 {
                     return null;
                 }
 
-                string className = temp[pos..endPos];
-                pos = temp.IndexOf(doubleDot, pos);
+                string className = fullLogLine[pos..endPos];
+                pos = fullLogLine.IndexOf(DOUBLE_DOT, pos);
 
                 if (pos == -1)
                 {
                     return null;
                 }
 
-                string lineNum = temp[(pos + 1)..];
+                string lineNum = fullLogLine[(pos + 1)..];
                 XmlDocument doc = BuildXmlDocument(className, lineNum);
                 return doc;
             }
 
-            if (temp.Contains("at ", StringComparison.CurrentCulture))
+            if (fullLogLine.Contains("at ", StringComparison.CurrentCulture))
             {
-                string str = temp.Trim();
+                string str = fullLogLine.Trim();
                 string className = null;
                 string lineNum = null;
                 int pos = str.IndexOf("at ") + 3;
@@ -83,15 +87,15 @@ private XmlDocument BuildParam(ILogLine line)
                     }
                     else
                     {
-                        pos = str.LastIndexOf('.', idx);
+                        pos = str.LastIndexOf(DOT, idx);
                         if (pos == -1)
                         {
                             return null;
                         }
                         className = str[..pos];
                     }
 
-                    idx = str.LastIndexOf(':');
+                    idx = str.LastIndexOf(DOUBLE_DOT);
 
                     if (idx == -1)
                     {
@@ -150,24 +154,36 @@ private XmlDocument BuildXmlDocument(string className, string lineNum)
 
         public string GetMenuText(IList<int> logLines, ILogLineColumnizer columnizer, ILogExpertCallback callback)
         {
-            if (logLines.Count == 1 && BuildParam(callback.GetLogLine(logLines[0])) != null)
+            //not used
+            return string.Empty;
+        }
+
+        public string GetMenuText(int logLinesCount, ILogLineColumnizer columnizer, ILogLine logline)
+        {
+            if (logLinesCount == 1 && BuildParam(logline) != null)
             {
                 return "Load class in Eclipse";
             }
             else
             {
-                return "_Load class in Eclipse";
+                return $"{DISABLED}Load class in Eclipse";
             }
         }
 
         public void MenuSelected(IList<int> logLines, ILogLineColumnizer columnizer, ILogExpertCallback callback)
         {
-            if (logLines.Count != 1)
+            //Not used
+        }
+
+        public void MenuSelected(int logLinesCount, ILogLineColumnizer columnizer, ILogLine logline)
+        {
+            if (logLinesCount != 1)
             {
                 return;
             }
 
-            XmlDocument doc = BuildParam(callback.GetLogLine(logLines[0]));
+            XmlDocument doc = BuildParam(logline);
+
             if (doc == null)
             {
                 MessageBox.Show("Cannot parse Java stack trace line", "LogExpert");

src/LogExpert/Classes/Filter/Filter.cs

@@ -70,7 +70,7 @@ private int DoFilter(FilterParams filterParams, int startLine, int maxCount, Lis
             try
             {
                 filterParams.Reset();
-                while ((count++ < maxCount || filterParams.isInRange) && !ShouldCancel)
+                while ((count++ < maxCount || filterParams.IsInRange) && !ShouldCancel)
                 {
                     if (lineNum >= _callback.GetLineCount())
                     {
@@ -140,14 +140,14 @@ private IList<int> GetAdditionalFilterResults(FilterParams filterParams, int lin
         {
             IList<int> resultList = [];
 
-            if (filterParams.spreadBefore == 0 && filterParams.spreadBehind == 0)
+            if (filterParams.SpreadBefore == 0 && filterParams.SpreadBehind == 0)
             {
                 resultList.Add(lineNum);
                 return resultList;
             }
 
             // back spread
-            for (int i = filterParams.spreadBefore; i > 0; --i)
+            for (int i = filterParams.SpreadBefore; i > 0; --i)
             {
                 if (lineNum - i > 0)
                 {
@@ -163,7 +163,7 @@ private IList<int> GetAdditionalFilterResults(FilterParams filterParams, int lin
                 resultList.Add(lineNum);
             }
             // after spread
-            for (int i = 1; i <= filterParams.spreadBehind; ++i)
+            for (int i = 1; i <= filterParams.SpreadBehind; ++i)
             {
                 if (lineNum + i < _callback.GetLineCount())
                 {

src/LogExpert/Classes/Filter/FilterStarter.cs

@@ -149,7 +149,7 @@ private Filter DoWork(FilterParams filterParams, int startLine, int maxCount, Pr
             _logger.Info("Started Filter worker [{0}] for line {1}", Environment.CurrentManagedThreadId, startLine);
 
             // Give every thread own copies of ColumnizerCallback and FilterParams, because the state of the objects changes while filtering
-            FilterParams threadFilterParams = filterParams.CreateCopy2();
+            FilterParams threadFilterParams = filterParams.CloneWithCurrentColumnizer();
             ColumnizerCallback threadColumnizerCallback = _callback.CreateCopy();
 
             Filter filter = new(threadColumnizerCallback);

src/LogExpert/Classes/ILogLineColumnizerCallback/ColumnizerCallback.cs

@@ -8,20 +8,20 @@ public class ColumnizerCallback : LogExpert.ILogLineColumnizerCallback, IAutoLog
     {
         #region Fields
 
-        protected LogWindow logWindow;
+        protected LogWindow _logWindow;
 
         #endregion
 
         #region cTor
 
         public ColumnizerCallback(LogWindow logWindow)
         {
-            this.logWindow = logWindow;
+            _logWindow = logWindow;
         }
 
         private ColumnizerCallback(ColumnizerCallback original)
         {
-            logWindow = original.logWindow;
+            _logWindow = original._logWindow;
             LineNum = original.LineNum;
         }
 
@@ -47,12 +47,12 @@ public int GetLineNum()
 
         public string GetFileName()
         {
-            return logWindow.GetCurrentFileName(LineNum);
+            return _logWindow.GetCurrentFileName(LineNum);
         }
 
         public ILogLine GetLogLine(int lineNum)
         {
-            return logWindow.GetLine(lineNum);
+            return _logWindow.GetLine(lineNum);
         }
 
         public IList<ILogLineColumnizer> GetRegisteredColumnizers()
@@ -62,7 +62,7 @@ public IList<ILogLineColumnizer> GetRegisteredColumnizers()
 
         public int GetLineCount()
         {
-            return logWindow._logFileReader.LineCount;
+            return _logWindow._logFileReader.LineCount;
         }
 
         #endregion

src/LogExpert/Classes/ILogLineColumnizerCallback/LogExpertCallback.cs

@@ -4,32 +4,23 @@
 
 namespace LogExpert.Classes.ILogLineColumnizerCallback
 {
-    internal class LogExpertCallback : ColumnizerCallback, ILogExpertCallback
+    internal class LogExpertCallback(LogWindow logWindow) : ColumnizerCallback(logWindow), ILogExpertCallback
     {
-        #region cTor
-
-        public LogExpertCallback(LogWindow logWindow)
-            : base(logWindow)
-        {
-        }
-
-        #endregion
-
         #region Public methods
 
         public void AddTempFileTab(string fileName, string title)
         {
-            logWindow.AddTempFileTab(fileName, title);
+            _logWindow.AddTempFileTab(fileName, title);
         }
 
         public void AddPipedTab(IList<LineEntry> lineEntryList, string title)
         {
-            logWindow.WritePipeTab(lineEntryList, title);
+            _logWindow.WritePipeTab(lineEntryList, title);
         }
 
         public string GetTabTitle()
         {
-            return logWindow.Text;
+            return _logWindow.Text;
         }
 
         #endregion

src/LogExpert/Classes/Log/LogfileReader.cs

@@ -53,7 +53,6 @@ public class LogfileReader : IAutoLogLineColumnizerCallback
 
         private ReaderWriterLock _lruCacheDictLock;
 
-
         private bool _shouldStop;
         private ILogFileInfo _watchedILogFileInfo;