Merge pull request #372 from LogExperts/decouple_ui_businesslogic

Decouple UI businesslogic

Author: Hirogen

src/AutoColumnizer/AutoColumnizer.cs

@@ -1,9 +1,11 @@
-using System;
+using LogExpert;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace LogExpert
+namespace AutoColumnizer
 {
     public class AutoColumnizer : ILogLineColumnizer
     {

src/ColumnizerLib.UnitTests/Extensions/LogLineExtensionsTests.cs

@@ -1,4 +1,6 @@
 using LogExpert;
+using LogExpert.Extensions;
+
 using NUnit.Framework;
 
 namespace ColumnizerLib.UnitTests.Extensions

src/ColumnizerLib/Extensions/LogLineExtensions.cs

@@ -1,4 +1,4 @@
-namespace LogExpert
+namespace LogExpert.Extensions
 {
     public static class LogLineExtensions
     {

src/ColumnizerLib/IFileSystemPlugin.cs

@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LogExpert
+namespace LogExpert
 {
     /// <summary>
     /// Interface for file system plugins. A file system plugin is responsible for feeding file data to LogExpert.
     /// </summary>
     /// <remarks>
-    /// LogExperts file handling is done via file system plugins. The selection if the appropriate plugin for a file is based 
+    /// LogExperts file handling is done via file system plugins. The selection if the appropriate plugin for a file is based
     /// on URI schemes. If a file system plugin returns <code>true</code> to the <see cref="CanHandleUri"/> method, it will be selected
     /// to handle a file.
     /// </remarks>
@@ -31,7 +27,7 @@ public interface IFileSystemPlugin
         #region Public methods
 
         /// <summary>
-        /// Called from LogExpert to determine a file system plugin for a given URI. 
+        /// Called from LogExpert to determine a file system plugin for a given URI.
         /// </summary>
         /// <param name="uriString">The URI of the file to be loaded.</param>
         /// <returns>Return <code>true</code> if the file system plugin can handle the URI.</returns>

src/ColumnizerLib/IXmlLogConfiguration.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LogExpert
+namespace LogExpert
 {
     /// <summary>
     /// This interface declares the configuration data which is needed for XML log file parsing.
@@ -32,7 +28,7 @@ public interface IXmlLogConfiguration
         /// <summary>
         /// A namespace declaration. The returned array must contain 2 strings: The namespace and its declaration.<br></br>
         /// Example: {"log4j", "http://jakarta.apache.org/log4j"}
-        /// 
+        ///
         /// </summary>
         string[] Namespace { get; }
 

src/CsvColumnizer/CsvColumnizer.cs

@@ -1,6 +1,9 @@
 using CsvHelper;
+
 using LogExpert;
+
 using Newtonsoft.Json;
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -157,28 +160,26 @@ public void Selected(ILogLineColumnizerCallback callback)
 
                 if (line != null)
                 {
-                    using (CsvReader csv = new CsvReader(new StringReader(line.FullLine), _config.ReaderConfiguration))
-                    {
-                        csv.Read();
-                        csv.ReadHeader();
-                        
-                        int fieldCount = csv.Parser.Count;
+                    using CsvReader csv = new(new StringReader(line.FullLine), _config.ReaderConfiguration);
+                    csv.Read();
+                    csv.ReadHeader();
+
+                    int fieldCount = csv.Parser.Count;
 
-                        string[] headerRecord = csv.HeaderRecord;
+                    string[] headerRecord = csv.HeaderRecord;
 
-                        if (_config.HasFieldNames && headerRecord != null)
+                    if (_config.HasFieldNames && headerRecord != null)
+                    {
+                        foreach (string headerColumn in headerRecord)
                         {
-                            foreach (string headerColumn in headerRecord)
-                            {
-                                _columnList.Add(new CsvColumn(headerColumn));
-                            }
+                            _columnList.Add(new CsvColumn(headerColumn));
                         }
-                        else
+                    }
+                    else
+                    {
+                        for (int i = 0; i < fieldCount; ++i)
                         {
-                            for (int i = 0; i < fieldCount; ++i)
-                            {
-                                _columnList.Add(new CsvColumn("Column " + i + 1));
-                            }
+                            _columnList.Add(new CsvColumn("Column " + i + 1));
                         }
                     }
                 }
@@ -187,7 +188,7 @@ public void Selected(ILogLineColumnizerCallback callback)
 
         public void DeSelected(ILogLineColumnizerCallback callback)
         {
-            // nothing to do 
+            // nothing to do
         }
 
         public void Configure(ILogLineColumnizerCallback callback, string configDir)
@@ -257,14 +258,14 @@ private IColumnizedLogLine SplitCsvLine(ILogLine line)
         {
             ColumnizedLogLine cLogLine = new ColumnizedLogLine();
             cLogLine.LogLine = line;
-            
+
             using (CsvReader csv = new CsvReader(new StringReader(line.FullLine), _config.ReaderConfiguration))
             {
                 csv.Read();
                 csv.ReadHeader();
 
                 //we only read line by line and not the whole file so it is always the header
-                string[] records = csv.HeaderRecord; 
+                string[] records = csv.HeaderRecord;
 
                 if (records != null)
                 {

src/Directory.Packages.props

@@ -11,7 +11,7 @@
     <PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
     <PackageVersion Include="GitVersion.CommandLine" Version="5.12.0" />
     <PackageVersion Include="GitVersion.Core" Version="6.1.0" />
-    <PackageVersion Include="Google.Protobuf" Version="3.30.1" />
+    <PackageVersion Include="Google.Protobuf" Version="3.30.2" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.70.0" />
     <PackageVersion Include="Grpc.Core" Version="2.46.6" />
     <PackageVersion Include="Grpc.Tools" Version="2.71.0" />

src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs

@@ -1,4 +1,6 @@
-using Newtonsoft.Json;
+using LogExpert;
+
+using Newtonsoft.Json;
 
 using System;
 using System.Collections.Generic;
@@ -10,7 +12,7 @@
 using System.Windows.Forms;
 
 [assembly: SupportedOSPlatform("windows")]
-namespace LogExpert
+namespace Log4jXmlColumnizer
 {
     /// <summary>
     /// XMl configuration for parsing log4j XML files. The XSL will transform every block of log entries

src/Log4jXmlColumnizer/Log4jXmlColumnizerConfigDlg.cs

@@ -1,4 +1,6 @@
-using System;
+using Log4jXmlColumnizer;
+
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 

src/LogExpert.Tests/BufferShiftTest.cs

@@ -1,5 +1,7 @@
 using LogExpert.Classes.Log;
-using LogExpert.Entities;
+using LogExpert.Core.Classes.Log;
+using LogExpert.Core.Entities;
+using LogExpert.PluginRegistry.FileSystem;
 
 using NUnit.Framework;
 
@@ -39,6 +41,8 @@ public void TestShiftBuffers1()
             {
                 Encoding = Encoding.Default
             };
+
+            PluginRegistry.PluginRegistry.Instance.Create(testDirectory.FullName, 500);
             LogfileReader reader = new(files.Last.Value, encodingOptions, true, 40, 50, options);
             reader.ReadFiles();