Skip to content

Commit 2f1d4bf

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent 65d144d commit 2f1d4bf

28 files changed

Lines changed: 91 additions & 157 deletions

Source/NETworkManager/Models/EventSystem/EventSystem.cs renamed to Source/NETworkManager.Models/EventSystem.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2-
using NETworkManager.Models;
32

4-
namespace NETworkManager.Models.EventSystem
3+
namespace NETworkManager.Models
54
{
65
public class EventSystem
76
{

Source/NETworkManager/Models/EventSystem/EventSystemRedirectDataApplicationArgs.cs renamed to Source/NETworkManager.Models/EventSystemRedirectDataApplicationArgs.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using NETworkManager.Models;
2-
using System;
1+
using System;
32

4-
namespace NETworkManager.Models.EventSystem
3+
namespace NETworkManager.Models
54
{
65
public class EventSystemRedirectDataApplicationArgs : EventArgs
76
{

‎Source/NETworkManager.Models/NETworkManager.Models.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<Compile Include="ApplicationManager.cs" />
5050
<Compile Include="ApplicationName.cs" />
5151
<Compile Include="ApplicationInfo.cs" />
52+
<Compile Include="EventSystem.cs" />
53+
<Compile Include="EventSystemRedirectDataApplicationArgs.cs" />
5254
<Compile Include="Export\ExportManager.cs" />
5355
<Compile Include="Export\ExportManager.ExportFileType.cs" />
5456
<Compile Include="Lookup\OUIInfo.cs" />
@@ -81,6 +83,7 @@
8183
<Compile Include="Network\HostFoundArgs.cs" />
8284
<Compile Include="Network\HostInfo.cs" />
8385
<Compile Include="Network\HostNotFoundException.cs" />
86+
<Compile Include="Network\HostRangeHelper.cs" />
8487
<Compile Include="Network\HTTPHeaders.cs" />
8588
<Compile Include="Network\HTTPHeadersOptions.cs" />
8689
<Compile Include="Network\IPNetworkInfo.cs" />

Source/NETworkManager/Utilities/HostRangeHelper.cs renamed to Source/NETworkManager.Models/Network/HostRangeHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using NETworkManager.Models.Network;
1+
using NETworkManager.Utilities;
22
using System;
33
using System.Collections.Concurrent;
44
using System.Collections.Generic;
@@ -9,7 +9,7 @@
99
using System.Threading;
1010
using System.Threading.Tasks;
1111

12-
namespace NETworkManager.Utilities
12+
namespace NETworkManager.Models.Network
1313
{
1414
public static class HostRangeHelper
1515
{

Source/NETworkManager/Models/PowerShell/PowerShell.cs renamed to Source/NETworkManager.Profiles/Application/PowerShell.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using NETworkManager.Models.PowerShell;
2-
using NETworkManager.Profiles;
32
using NETworkManager.Settings;
43

5-
namespace NETworkManager.Models.PowerShellTmp
4+
namespace NETworkManager.Profiles.Application
65
{
76
public class PowerShell
87
{

‎Source/NETworkManager.Profiles/Application/PuTTY.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using NETworkManager.Models.PuTTY;
2+
using NETworkManager.Settings;
3+
4+
namespace NETworkManager.Profiles.Application
5+
{
6+
public static class PuTTY
7+
{
8+
public static PuTTYSessionInfo CreateSessionInfo(ProfileInfo profileInfo)
9+
{
10+
var info = new PuTTYSessionInfo
11+
{
12+
Mode = profileInfo.PuTTY_ConnectionMode,
13+
HostOrSerialLine = profileInfo.PuTTY_HostOrSerialLine,
14+
PortOrBaud = profileInfo.PuTTY_OverridePortOrBaud ? profileInfo.PuTTY_PortOrBaud : Settings.Application.PuTTY.GetPortOrBaudByConnectionMode(profileInfo.PuTTY_ConnectionMode),
15+
Username = profileInfo.PuTTY_OverrideUsername ? profileInfo.PuTTY_Username : SettingsManager.Current.PuTTY_Username,
16+
Profile = profileInfo.PuTTY_OverrideProfile ? profileInfo.PuTTY_Profile : SettingsManager.Current.PuTTY_Profile,
17+
AdditionalCommandLine = profileInfo.PuTTY_OverrideAdditionalCommandLine ? profileInfo.PuTTY_AdditionalCommandLine : SettingsManager.Current.PuTTY_AdditionalCommandLine
18+
};
19+
20+
return info;
21+
}
22+
}
23+
}

Source/NETworkManager/Models/RemoteDesktop/RemoteDesktop.cs renamed to Source/NETworkManager.Profiles/Application/RemoteDesktop.cs

File renamed without changes.

Source/NETworkManager/Models/TigerVNC/TigerVNC.cs renamed to Source/NETworkManager.Profiles/Application/TigerVNC.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using NETworkManager.Profiles;
2-
using NETworkManager.Settings;
1+

32
using NETworkManager.Models.TigerVNC;
3+
using NETworkManager.Settings;
44

5-
namespace NETworkManager.Models.TigerVNCTMP
5+
namespace NETworkManager.Profiles.Application
66
{
7-
public class TigerVNC
8-
{
7+
public static class TigerVNC
8+
{
99
public static TigerVNCSessionInfo CreateSessionInfo(ProfileInfo profileInfo)
1010
{
1111
var info = new TigerVNCSessionInfo

Source/NETworkManager/Models/Network/WakeOnLan.cs renamed to Source/NETworkManager.Profiles/Application/WakeOnLan.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ namespace NETworkManager.Models.NetworkTMP
77
{
88
public static class WakeOnLAN
99
{
10-
#region Methods
11-
12-
13-
public static WakeOnLANInfo CreateWakeOnLANInfo(ProfileInfo profileInfo)
10+
public static WakeOnLANInfo CreateInfo(ProfileInfo profileInfo)
1411
{
1512
var info = new WakeOnLANInfo
1613
{
@@ -21,6 +18,5 @@ public static WakeOnLANInfo CreateWakeOnLANInfo(ProfileInfo profileInfo)
2118

2219
return info;
2320
}
24-
#endregion
2521
}
2622
}

Source/NETworkManager/Models/WebConsole/WebConsole.cs renamed to Source/NETworkManager.Profiles/Application/WebConsole.cs

File renamed without changes.

0 commit comments

Comments
 (0)