Skip to content

Commit 5f94ae7

Browse files
HirogenHirogen
authored
Merge pull request #225 from Hirogen/highlight-import-export
Highlight import no json selectable
2 parents d6628de + 58f32f2 commit 5f94ae7

File tree

167 files changed

+2130
-2352
lines changed

Some content is hidden

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

167 files changed

+2130
-2352
lines changed

‎src/LogExpert.Tests/ColumnizerPickerTest.cs

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
using NUnit.Framework;
55
using System;
66
using System.IO;
7+
using LogExpert.Classes;
8+
using LogExpert.Classes.Log;
9+
using LogExpert.Entities;
710

811
namespace LogExpert.Tests
912
{

‎src/LogExpert.Tests/DateFormatParserTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System;
33
using System.Globalization;
44
using System.Linq;
5+
using LogExpert.Classes.DateTimeParser;
56

67
namespace LogExpert.Tests
78
{

‎src/LogExpert.Tests/Extensions/EnumerableTests.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
3+
using LogExpert.Extensions;
64
using NUnit.Framework;
75

86
namespace LogExpert.Tests.Extensions
@@ -21,15 +19,15 @@ public void Extensions_IsEmpty_NullArray()
2119
[Test]
2220
public void Extensions_IsEmpty_EmptyArray()
2321
{
24-
object[] arrayObject = new object[0];
22+
object[] arrayObject = Array.Empty<object>();
2523

2624
Assert.IsTrue(arrayObject.IsEmpty());
2725
}
2826

2927
[Test]
3028
public void Extensions_IsEmpty_FilledArray()
3129
{
32-
object[] arrayObject = new[] {new object()};
30+
object[] arrayObject = {new object()};
3331

3432
Assert.IsFalse(arrayObject.IsEmpty());
3533
}

‎src/LogExpert.Tests/JSONSaveTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.IO;
2+
using LogExpert.Config;
23
using Newtonsoft.Json;
34
using NUnit.Framework;
45

‎src/LogExpert.Tests/JsonColumnizerTest.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using NUnit.Framework;
22
using System;
33
using System.IO;
4+
using LogExpert.Classes.Log;
5+
using LogExpert.Entities;
46

57
namespace LogExpert.Tests
68
{

‎src/LogExpert.Tests/JsonCompactColumnizerTest.cs

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
using System;
33
using System.Collections.Generic;
44
using System.IO;
5+
using LogExpert.Classes.Log;
6+
using LogExpert.Entities;
57

68
namespace LogExpert.Tests
79
{

‎src/LogExpert.Tests/LogStreamReaderTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using NUnit.Framework;
33
using System.IO;
44
using System.Text;
5+
using LogExpert.Entities;
56

67
namespace LogExpert.Tests
78
{

‎src/LogExpert.Tests/LogWindowTest.cs

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
using CsvColumnizerType=CsvColumnizer.CsvColumnizer;
33
using NUnit.Framework;
44
using System;
5+
using LogExpert.Classes;
6+
using LogExpert.Controls.LogTabWindow;
7+
using LogExpert.Controls.LogWindow;
8+
using LogExpert.Entities;
59

610
namespace LogExpert.Tests
711
{

‎src/LogExpert.Tests/SquareBracketColumnizerTest.cs

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
using System;
44
using System.Collections.Generic;
55
using System.IO;
6+
using LogExpert.Classes.Columnizer;
7+
using LogExpert.Classes.Log;
8+
using LogExpert.Entities;
69

710
namespace LogExpert
811
{

‎src/LogExpert/Classes/ArgParser.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Text;
4-
using System.IO;
53
using System.Text.RegularExpressions;
64
using System.Windows.Forms;
75
using LogExpert.Dialogs;
86

9-
namespace LogExpert
7+
namespace LogExpert.Classes
108
{
119
internal class ArgParser
1210
{

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using System;
22
using System.Collections.Generic;
3+
using LogExpert.Entities;
4+
using LogExpert.Interface;
35
using NLog;
46

57
namespace LogExpert.Classes.Bookmark
@@ -16,10 +18,10 @@ internal class BookmarkDataProvider : IBookmarkData
1618

1719
internal BookmarkDataProvider()
1820
{
19-
BookmarkList = new SortedList<int, LogExpert.Bookmark>();
21+
BookmarkList = new SortedList<int, Entities.Bookmark>();
2022
}
2123

22-
internal BookmarkDataProvider(SortedList<int, LogExpert.Bookmark> bookmarkList)
24+
internal BookmarkDataProvider(SortedList<int, Entities.Bookmark> bookmarkList)
2325
{
2426
BookmarkList = bookmarkList;
2527
}
@@ -48,7 +50,7 @@ internal BookmarkDataProvider(SortedList<int, LogExpert.Bookmark> bookmarkList)
4850

4951
public BookmarkCollection Bookmarks => new BookmarkCollection(BookmarkList);
5052

51-
internal SortedList<int, LogExpert.Bookmark> BookmarkList { get; set; }
53+
internal SortedList<int, Entities.Bookmark> BookmarkList { get; set; }
5254

5355
#endregion
5456

@@ -62,7 +64,7 @@ public void ToggleBookmark(int lineNum)
6264
}
6365
else
6466
{
65-
AddBookmark(new LogExpert.Bookmark(lineNum));
67+
AddBookmark(new Entities.Bookmark(lineNum));
6668
}
6769
}
6870

@@ -76,7 +78,7 @@ public int GetBookmarkIndexForLine(int lineNum)
7678
return BookmarkList.IndexOfKey(lineNum);
7779
}
7880

79-
public LogExpert.Bookmark GetBookmarkForLine(int lineNum)
81+
public Entities.Bookmark GetBookmarkForLine(int lineNum)
8082
{
8183
return BookmarkList[lineNum];
8284
}
@@ -87,8 +89,8 @@ public LogExpert.Bookmark GetBookmarkForLine(int lineNum)
8789

8890
internal void ShiftBookmarks(int offset)
8991
{
90-
SortedList<int, LogExpert.Bookmark> newBookmarkList = new SortedList<int, LogExpert.Bookmark>();
91-
foreach (LogExpert.Bookmark bookmark in BookmarkList.Values)
92+
SortedList<int, Entities.Bookmark> newBookmarkList = new SortedList<int, Entities.Bookmark>();
93+
foreach (Entities.Bookmark bookmark in BookmarkList.Values)
9294
{
9395
int line = bookmark.LineNum - offset;
9496
if (line >= 0)
@@ -102,7 +104,7 @@ internal void ShiftBookmarks(int offset)
102104

103105
internal int FindPrevBookmarkIndex(int lineNum)
104106
{
105-
IList<LogExpert.Bookmark> values = BookmarkList.Values;
107+
IList<Entities.Bookmark> values = BookmarkList.Values;
106108
for (int i = BookmarkList.Count - 1; i >= 0; --i)
107109
{
108110
if (values[i].LineNum <= lineNum)
@@ -115,7 +117,7 @@ internal int FindPrevBookmarkIndex(int lineNum)
115117

116118
internal int FindNextBookmarkIndex(int lineNum)
117119
{
118-
IList<LogExpert.Bookmark> values = BookmarkList.Values;
120+
IList<Entities.Bookmark> values = BookmarkList.Values;
119121
for (int i = 0; i < BookmarkList.Count; ++i)
120122
{
121123
if (values[i].LineNum >= lineNum)
@@ -142,7 +144,7 @@ internal void RemoveBookmarksForLines(List<int> lineNumList)
142144
}
143145

144146

145-
internal void AddBookmark(LogExpert.Bookmark bookmark)
147+
internal void AddBookmark(Entities.Bookmark bookmark)
146148
{
147149
BookmarkList.Add(bookmark.LineNum, bookmark);
148150
OnBookmarkAdded();

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

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System;
1+
using System.Collections.Generic;
22
using System.IO;
3-
using System.Collections;
4-
using System.Collections.Generic;
53

6-
namespace LogExpert
4+
namespace LogExpert.Classes.Bookmark
75
{
86
internal static class BookmarkExporter
97
{
@@ -15,13 +13,13 @@ internal static class BookmarkExporter
1513

1614
#region Public methods
1715

18-
public static void ExportBookmarkList(SortedList<int, Bookmark> bookmarkList, string logfileName,
16+
public static void ExportBookmarkList(SortedList<int, Entities.Bookmark> bookmarkList, string logfileName,
1917
string fileName)
2018
{
2119
FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
2220
StreamWriter writer = new StreamWriter(fs);
2321
writer.WriteLine("Log file name;Line number;Comment");
24-
foreach (Bookmark bookmark in bookmarkList.Values)
22+
foreach (Entities.Bookmark bookmark in bookmarkList.Values)
2523
{
2624
string line = logfileName + ";" + bookmark.LineNum + ";" +
2725
bookmark.Text.Replace(replacementForNewLine, @"\" + replacementForNewLine).Replace("\r\n",
@@ -33,7 +31,7 @@ public static void ExportBookmarkList(SortedList<int, Bookmark> bookmarkList, st
3331
}
3432

3533
public static void ImportBookmarkList(string logfileName, string fileName,
36-
SortedList<int, Bookmark> bookmarkList)
34+
SortedList<int, Entities.Bookmark> bookmarkList)
3735
{
3836
using (FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read))
3937
{
@@ -62,7 +60,7 @@ public static void ImportBookmarkList(string logfileName, string fileName,
6260
int lineNum;
6361
if (int.TryParse(lineStr, out lineNum))
6462
{
65-
Bookmark bookmark = new Bookmark(lineNum, comment);
63+
Entities.Bookmark bookmark = new Entities.Bookmark(lineNum, comment);
6664
bookmarkList.Add(lineNum, bookmark);
6765
}
6866
else

‎src/LogExpert/Classes/Bookmark/BookmarkView.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
2+
using LogExpert.Interface;
43

5-
namespace LogExpert
4+
namespace LogExpert.Classes.Bookmark
65
{
76
internal class BookmarkView : IBookmarkView
87
{
@@ -18,7 +17,7 @@ public void UpdateView()
1817
throw new NotImplementedException();
1918
}
2019

21-
public void BookmarkTextChanged(Bookmark bookmark)
20+
public void BookmarkTextChanged(Entities.Bookmark bookmark)
2221
{
2322
throw new NotImplementedException();
2423
}

‎src/LogExpert/Classes/CmdLine.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Collections.Specialized;
4-
using System.Text;
53

64
/*
75
* Taken from https://cmdline.codeplex.com/
86
*
97
*/
108

11-
namespace ITDM
9+
namespace LogExpert.Classes
1210
{
1311
/// <summary>
1412
/// Represents an error occuring during command line parsing.

‎src/LogExpert/Classes/ColumnCache.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using LogExpert.Classes.ILogLineColumnizerCallback;
2+
using LogExpert.Classes.Log;
23

3-
namespace LogExpert
4+
namespace LogExpert.Classes
45
{
56
internal class ColumnCache
67
{

‎src/LogExpert/Classes/Columnizer/ClfColumnizer.cs

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
using System;
2-
using System.Collections.Generic;
2+
using System.Globalization;
33
using System.Linq;
4-
using System.Text;
4+
using System.Text.RegularExpressions;
55

6-
namespace LogExpert
6+
namespace LogExpert.Classes.Columnizer
77
{
8-
using System;
9-
using System.Collections.Generic;
10-
using System.Text;
11-
using System.Globalization;
12-
using System.Text.RegularExpressions;
13-
148
public class ClfColumnizer : ILogLineColumnizer
159
{
1610
#region Fields
@@ -49,7 +43,7 @@ public int GetTimeOffset()
4943
return this.timeOffset;
5044
}
5145

52-
public DateTime GetTimestamp(ILogLineColumnizerCallback callback, ILogLine line)
46+
public DateTime GetTimestamp(LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
5347
{
5448
IColumnizedLogLine cols = SplitLine(callback, line);
5549
if (cols == null || cols.ColumnValues.Length < 8)
@@ -74,7 +68,7 @@ public DateTime GetTimestamp(ILogLineColumnizerCallback callback, ILogLine line)
7468
}
7569
}
7670

77-
public void PushValue(ILogLineColumnizerCallback callback, int column, string value, string oldValue)
71+
public void PushValue(LogExpert.ILogLineColumnizerCallback callback, int column, string value, string oldValue)
7872
{
7973
if (column == 2)
8074
{
@@ -114,7 +108,7 @@ public string[] GetColumnNames()
114108
return new string[] {"IP", "User", "Date/Time", "Request", "Status", "Bytes", "Referrer", "User agent"};
115109
}
116110

117-
public IColumnizedLogLine SplitLine(ILogLineColumnizerCallback callback, ILogLine line)
111+
public IColumnizedLogLine SplitLine(LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
118112
{
119113
ColumnizedLogLine cLogLine = new ColumnizedLogLine
120114
{

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

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Linq;
44
using System.Reflection;
55
using System.Text;
6+
using LogExpert.Config;
7+
using LogExpert.Entities;
68

79
namespace LogExpert.Classes.Columnizer
810
{

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using System.Linq;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
4-
using System.IO;
3+
using System.Linq;
54
using System.Text.RegularExpressions;
6-
using static LogExpert.TimeFormatDeterminer;
5+
using static LogExpert.Classes.Columnizer.TimeFormatDeterminer;
76

8-
namespace LogExpert
7+
namespace LogExpert.Classes.Columnizer
98
{
109
public class SquareBracketColumnizer : ILogLineColumnizer, IColumnizerPriority
1110
{
@@ -49,7 +48,7 @@ public int GetTimeOffset()
4948
return this.timeOffset;
5049
}
5150

52-
public DateTime GetTimestamp(ILogLineColumnizerCallback callback, ILogLine line)
51+
public DateTime GetTimestamp(LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
5352
{
5453
IColumnizedLogLine cols = SplitLine(callback, line);
5554
if (cols == null || cols.ColumnValues == null || cols.ColumnValues.Length < 2)
@@ -81,7 +80,7 @@ public DateTime GetTimestamp(ILogLineColumnizerCallback callback, ILogLine line)
8180
}
8281
}
8382

84-
public void PushValue(ILogLineColumnizerCallback callback, int column, string value, string oldValue)
83+
public void PushValue(LogExpert.ILogLineColumnizerCallback callback, int column, string value, string oldValue)
8584
{
8685
if (column == 1)
8786
{
@@ -151,7 +150,7 @@ public string[] GetColumnNames()
151150
return columnNames.ToArray();
152151
}
153152

154-
public IColumnizedLogLine SplitLine(ILogLineColumnizerCallback callback, ILogLine line)
153+
public IColumnizedLogLine SplitLine(LogExpert.ILogLineColumnizerCallback callback, ILogLine line)
155154
{
156155
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
157156
// 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789

0 commit comments

Comments
 (0)