Skip to content

Commit 42093f8

Browse files
Randall FlaggRandall Flagg
authored andcommitted
Merge branch 'Development' into truncate-file-menu-option
# Conflicts: # src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs
2 parents 72b8685 + 1bd3826 commit 42093f8

304 files changed

Lines changed: 15220 additions & 14991 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/AutoColumnizer/AutoColumnizer.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
1+
using LogExpert;
52

6-
namespace LogExpert
3+
using System;
4+
5+
namespace AutoColumnizer
76
{
87
public class AutoColumnizer : ILogLineColumnizer
98
{

src/ColumnizerLib.UnitTests/Extensions/LogLineExtensionsTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using LogExpert;
2+
using LogExpert.Extensions;
3+
24
using NUnit.Framework;
35

46
namespace ColumnizerLib.UnitTests.Extensions

src/ColumnizerLib/Extensions/LogLineExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace LogExpert
1+
namespace LogExpert.Extensions
22
{
33
public static class LogLineExtensions
44
{

src/ColumnizerLib/IContextMenuEntry.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace LogExpert
55
{
66
/// <summary>
7-
/// Implement this interface to add a menu entry to the context menu of LogExpert.
7+
/// Implement this interface to add a menu entry to the context menu of LogExpert.
88
/// </summary>
99
/// <remarks>
1010
/// <para>
@@ -17,12 +17,12 @@ public interface IContextMenuEntry
1717
#region Public methods
1818

1919
/// <summary>
20-
/// This function is called from LogExpert if the context menu is about to be displayed.
20+
/// This function is called from LogExpert if the context menu is about to be displayed.
2121
/// Your implementation can control whether LogExpert will show a menu entry by returning
2222
/// an appropriate value.<br></br>
2323
/// </summary>
2424
/// <param name="lines">A list containing all selected line numbers.</param>
25-
/// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
25+
/// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
2626
/// if necessary.</param>
2727
/// <param name="callback">The callback interface implemented by LogExpert. You can use the functions
2828
/// for retrieving log lines or pass it along to functions of the Columnizer if needed.</param>
@@ -37,18 +37,22 @@ public interface IContextMenuEntry
3737
/// </returns>
3838
string GetMenuText(IList<int> lines, ILogLineColumnizer columnizer, ILogExpertCallback callback);
3939

40+
string GetMenuText(int linesCount, ILogLineColumnizer columnizer, ILogLine line);
41+
4042

4143
/// <summary>
4244
/// This function is called from LogExpert if the menu entry is choosen by the user. <br></br>
4345
/// Note that this function is called from the GUI thread. So try to avoid time consuming operations.
4446
/// </summary>
4547
/// <param name="lines">A list containing all selected line numbers.</param>
46-
/// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
48+
/// <param name="columnizer">The currently selected Columnizer. You can use it to split log lines,
4749
/// if necessary.</param>
4850
/// <param name="callback">The callback interface implemented by LogExpert. You can use the functions
4951
/// for retrieving log lines or pass it along to functions of the Columnizer if needed.</param>
5052
void MenuSelected(IList<int> lines, ILogLineColumnizer columnizer, ILogExpertCallback callback);
5153

54+
void MenuSelected(int linesCount, ILogLineColumnizer columnizer, ILogLine line);
55+
5256
#endregion
5357
}
5458
}

src/ColumnizerLib/IFileSystemPlugin.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
5-
namespace LogExpert
1+
namespace LogExpert
62
{
73
/// <summary>
84
/// Interface for file system plugins. A file system plugin is responsible for feeding file data to LogExpert.
95
/// </summary>
106
/// <remarks>
11-
/// LogExperts file handling is done via file system plugins. The selection if the appropriate plugin for a file is based
7+
/// LogExperts file handling is done via file system plugins. The selection if the appropriate plugin for a file is based
128
/// on URI schemes. If a file system plugin returns <code>true</code> to the <see cref="CanHandleUri"/> method, it will be selected
139
/// to handle a file.
1410
/// </remarks>
@@ -31,7 +27,7 @@ public interface IFileSystemPlugin
3127
#region Public methods
3228

3329
/// <summary>
34-
/// Called from LogExpert to determine a file system plugin for a given URI.
30+
/// Called from LogExpert to determine a file system plugin for a given URI.
3531
/// </summary>
3632
/// <param name="uriString">The URI of the file to be loaded.</param>
3733
/// <returns>Return <code>true</code> if the file system plugin can handle the URI.</returns>

src/ColumnizerLib/ILogExpertCallback.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public interface ILogExpertCallback : ILogLineColumnizerCallback
1717
/// <param name="fileName">Path of the file to be loaded.</param>
1818
/// <param name="title">Title shown on the tab.</param>
1919
/// <remarks>
20-
/// The file tab is internally handled like the temp file tabs which LogExpert uses for
20+
/// The file tab is internally handled like the temp file tabs which LogExpert uses for
2121
/// FilterTabs or clipboard copy tabs.
2222
/// This has some implications:
2323
/// <ul>
@@ -29,24 +29,23 @@ public interface ILogExpertCallback : ILogLineColumnizerCallback
2929
/// </remarks>
3030
void AddTempFileTab(string fileName, string title);
3131

32-
3332
/// <summary>
3433
/// With this function you can create a new tab and add a bunch of text lines to it.
3534
/// </summary>
36-
/// <param name="lineEntryList">A list with LineEntry items containing text and an
35+
/// <param name="lineEntryList">A list with LineEntry items containing text and an
3736
/// optional reference to the original file location.</param>
3837
/// <param name="title">The title for the new tab.</param>
3938
/// <remarks>
4039
/// <para>
4140
/// The lines are given by a list of <see cref="LineEntry"/>. If you set the lineNumber field
42-
/// in each LineEntry to a lineNumber of the original logfile (the logfile for which the context
41+
/// in each LineEntry to a lineNumber of the original logfile (the logfile for which the context
4342
/// menu is called for), you can create a 'link' from the line of your 'target output' to a line
4443
/// in the 'source tab'.
4544
/// </para>
4645
/// <para>
4746
/// The user can then navigate from the line in the new tab to the referenced
4847
/// line in the original file (by using "locate in original file" from the context menu).
49-
/// This is especially useful for plugins that generate output lines which are directly associated
48+
/// This is especially useful for plugins that generate output lines which are directly associated
5049
/// to the selected input lines.
5150
/// </para>
5251
/// <para>
@@ -56,7 +55,6 @@ public interface ILogExpertCallback : ILogLineColumnizerCallback
5655
/// </remarks>
5756
void AddPipedTab(IList<LineEntry> lineEntryList, string title);
5857

59-
6058
/// <summary>
6159
/// Returns the title of the current tab (the tab for which the context menu plugin was called for).
6260
/// </summary>

src/ColumnizerLib/ILogFileInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using System.IO;
21
using System;
2+
using System.IO;
33

44
namespace LogExpert
55
{

src/ColumnizerLib/ILogLineColumnizerCallback.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
5-
namespace LogExpert
1+
namespace LogExpert
62
{
73
///<summary>
84
///This is a callback interface. Some of the ILogLineColumnizer functions

src/ColumnizerLib/IXmlLogConfiguration.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
5-
namespace LogExpert
1+
namespace LogExpert
62
{
73
/// <summary>
84
/// This interface declares the configuration data which is needed for XML log file parsing.
@@ -32,7 +28,7 @@ public interface IXmlLogConfiguration
3228
/// <summary>
3329
/// A namespace declaration. The returned array must contain 2 strings: The namespace and its declaration.<br></br>
3430
/// Example: {"log4j", "http://jakarta.apache.org/log4j"}
35-
///
31+
///
3632
/// </summary>
3733
string[] Namespace { get; }
3834

src/CsvColumnizer/CsvColumn.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
namespace CsvColumnizer
22
{
3-
internal class CsvColumn
3+
internal class CsvColumn(string name)
44
{
5-
#region cTor
6-
7-
public CsvColumn(string name)
8-
{
9-
Name = name;
10-
}
11-
12-
#endregion
13-
145
#region Properties
156

16-
public string Name { get; }
7+
public string Name { get; } = name;
178

189
#endregion
1910
}

0 commit comments

Comments
 (0)