Skip to content

Commit 2103b28

Browse files
HirogenHirogen
authored
Merge pull request LogExperts#390 from RandallFlagg/seperation
Seperation - LogTabWindow
2 parents ff889ad + 0e7fe47 commit 2103b28

328 files changed

Lines changed: 28482 additions & 28502 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/LogExpert/Licenses/Nlog.license.txt renamed to Licenses/Nlog.license.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Copyright (c) 2004-2017 Jaroslaw Kowalski <jaak@jkowalski.net>, Kim Christensen, Julian Verdurmen
2-
3-
All rights reserved.
4-
5-
Redistribution and use in source and binary forms, with or without
6-
modification, are permitted provided that the following conditions
7-
are met:
8-
9-
* Redistributions of source code must retain the above copyright notice,
10-
this list of conditions and the following disclaimer.
11-
12-
* Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
15-
16-
* Neither the name of Jaroslaw Kowalski nor the names of its
17-
contributors may be used to endorse or promote products derived from this
18-
software without specific prior written permission.
19-
20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30-
THE POSSIBILITY OF SUCH DAMAGE.
1+
Copyright (c) 2004-2017 Jaroslaw Kowalski <jaak@jkowalski.net>, Kim Christensen, Julian Verdurmen
2+
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright notice,
10+
this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
16+
* Neither the name of Jaroslaw Kowalski nor the names of its
17+
contributors may be used to endorse or promote products derived from this
18+
software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30+
THE POSSIBILITY OF SUCH DAMAGE.

src/LogExpert/Licenses/WinformsUI.Docking.license.txt renamed to Licenses/WinformsUI.Docking.license.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
The MIT License
2-
3-
Copyright (c) 2007 Weifen Luo (email: weifenluo@yahoo.com)
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6-
7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8-
9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1+
The MIT License
2+
3+
Copyright (c) 2007 Weifen Luo (email: weifenluo@yahoo.com)
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/LogExpert/Classes/ILogLineColumnizerCallback/ColumnizerCallback.cs renamed to src/LogExpert.Core/Callback/ColumnizerCallback.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
using LogExpert.Controls.LogWindow;
2-
3-
using System.Collections.Generic;
1+
using LogExpert.Core.Interface;
42

53
namespace LogExpert.Classes.ILogLineColumnizerCallback
64
{
75
public class ColumnizerCallback : LogExpert.ILogLineColumnizerCallback, IAutoLogLineColumnizerCallback
86
{
97
#region Fields
108

11-
protected LogWindow _logWindow;
9+
protected ILogWindow _logWindow;
10+
protected IPluginRegistry _pluginRegistry;
1211

1312
#endregion
1413

1514
#region cTor
1615

17-
public ColumnizerCallback(LogWindow logWindow)
16+
public ColumnizerCallback(ILogWindow logWindow)
1817
{
1918
_logWindow = logWindow;
2019
}
@@ -57,7 +56,7 @@ public ILogLine GetLogLine(int lineNum)
5756

5857
public IList<ILogLineColumnizer> GetRegisteredColumnizers()
5958
{
60-
return PluginRegistry.PluginRegistry.Instance.RegisteredColumnizers;
59+
return _pluginRegistry.RegisteredColumnizers;
6160
}
6261

6362
public int GetLineCount()

src/Logexpert.Core/Classes/Bookmark/BookmarkDataProvider.cs renamed to src/LogExpert.Core/Classes/Bookmark/BookmarkDataProvider.cs

File renamed without changes.

src/Logexpert.Core/Classes/Bookmark/BookmarkExporter.cs renamed to src/LogExpert.Core/Classes/Bookmark/BookmarkExporter.cs

File renamed without changes.

src/Logexpert.Core/Classes/Bookmark/BookmarkView.cs renamed to src/LogExpert.Core/Classes/Bookmark/BookmarkView.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace LogExpert.Core.Classes.Bookmark
66
{
7+
//TODO: Not in use!
78
internal class BookmarkView : IBookmarkView
89
{
910
#region Fields

src/Logexpert.Core/Classes/Columnizer/ClfColumnizer.cs renamed to src/LogExpert.Core/Classes/Columnizer/ClfColumnizer.cs

File renamed without changes.

src/Logexpert.Core/Classes/Columnizer/ColumnizerPicker.cs renamed to src/LogExpert.Core/Classes/Columnizer/ColumnizerPicker.cs

File renamed without changes.

src/Logexpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs renamed to src/LogExpert.Core/Classes/Columnizer/SquareBracketColumnizer.cs

File renamed without changes.

src/Logexpert.Core/Classes/Columnizer/TimeFormatDeterminer.cs renamed to src/LogExpert.Core/Classes/Columnizer/TimeFormatDeterminer.cs

File renamed without changes.

0 commit comments

Comments
 (0)