Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored connection initiator a bit to reduce unnecessary code

Browse Source 
the conForm arg was always null, we didnt need it
This commit is contained in:
David Sparer
2018-11-14 07:06:25 -06:00
parent 65e21190b9
commit 92759aa9dc
3 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
mRemoteV1/Connection/ConnectionInitiator.cs
View File

@@ -24,35 +24,6 @@ namespace mRemoteNG.Connection
/// </summary>
public IEnumerable<string> ActiveConnections => _activeConnections;
public void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None)
{
OpenConnection(containerInfo, force, null);
}
public void OpenConnection(ConnectionInfo connectionInfo)
{
try
{
OpenConnection(connectionInfo, ConnectionInfo.Force.None);
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnectionOpenFailed, ex);
}
}
public void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force)
{
try
{
OpenConnection(connectionInfo, force, null);
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnectionOpenFailed, ex);
}
}
public bool SwitchToOpenConnection(ConnectionInfo connectionInfo)
{
var interfaceControl = FindConnectionContainer(connectionInfo);
@@ -66,8 +37,7 @@ namespace mRemoteNG.Connection
return true;
}
#region Private
private void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force, Form conForm)
public void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force)
{
var children = containerInfo.Children;
if (children.Count == 0) return;
@@ -75,13 +45,13 @@ namespace mRemoteNG.Connection
{
var childAsContainer = child as ContainerInfo;
if (childAsContainer != null)
OpenConnection(childAsContainer, force, conForm);
OpenConnection(childAsContainer, force);
else
OpenConnection(child, force, conForm);
OpenConnection(child, force);
}
}
private void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force, Form conForm)
public void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None)
{
try
{
@@ -104,7 +74,7 @@ namespace mRemoteNG.Connection
var connectionPanel = SetConnectionPanel(connectionInfo, force);
if (string.IsNullOrEmpty(connectionPanel)) return;
var connectionForm = SetConnectionForm(conForm, connectionPanel);
var connectionForm = SetConnectionForm(connectionPanel);
var connectionContainer = SetConnectionContainer(connectionInfo, connectionForm);
SetConnectionFormEventHandlers(newProtocol, connectionForm);
SetConnectionEventHandlers(newProtocol);
@@ -134,6 +104,7 @@ namespace mRemoteNG.Connection
}
}
#region Private
private static void StartPreConnectionExternalApp(ConnectionInfo connectionInfo)
{
if (connectionInfo.PreExtApp == "") return;
@@ -184,22 +155,22 @@ namespace mRemoteNG.Connection
return connectionPanel;
}
private Form SetConnectionForm(Form conForm, string connectionPanel)
private ConnectionWindow SetConnectionForm(string connectionPanelName)
{
var connectionForm = conForm ?? Runtime.WindowList.FromString(connectionPanel);
var connectionForm = Runtime.WindowList.FromString(connectionPanelName) as ConnectionWindow;
if (connectionForm == null)
connectionForm = _panelAdder.AddPanel(connectionPanel);
connectionForm = _panelAdder.AddPanel(connectionPanelName);
else
((ConnectionWindow)connectionForm).Show(FrmMain.Default.pnlDock);
connectionForm.Show(FrmMain.Default.pnlDock);
connectionForm.Focus();
return connectionForm;
}
private static Control SetConnectionContainer(ConnectionInfo connectionInfo, Form connectionForm)
private static Control SetConnectionContainer(ConnectionInfo connectionInfo, ConnectionWindow connectionForm)
{
Control connectionContainer = ((ConnectionWindow)connectionForm).AddConnectionTab(connectionInfo);
Control connectionContainer = connectionForm.AddConnectionTab(connectionInfo);
if (connectionInfo.Protocol != ProtocolType.IntApp) return connectionContainer;
@@ -213,9 +184,9 @@ namespace mRemoteNG.Connection
return connectionContainer;
}
private static void SetConnectionFormEventHandlers(ProtocolBase newProtocol, Form connectionForm)
private static void SetConnectionFormEventHandlers(ProtocolBase newProtocol, ConnectionWindow connectionForm)
{
newProtocol.Closed += ((ConnectionWindow)connectionForm).Prot_Event_Closed;
newProtocol.Closed += connectionForm.Prot_Event_Closed;
}
private void SetConnectionEventHandlers(ProtocolBase newProtocol)

4
mRemoteV1/Connection/IConnectionInitiator.cs
View File

@@ -7,11 +7,9 @@ namespace mRemoteNG.Connection
{
IEnumerable<string> ActiveConnections { get; }
void OpenConnection(ConnectionInfo connectionInfo);
void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None);
void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force);
void OpenConnection(ConnectionInfo connectionInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None);
bool SwitchToOpenConnection(ConnectionInfo connectionInfo);
}

12
mRemoteV1/UI/Panels/PanelAdder.cs
View File

@@ -1,19 +1,19 @@
using System;
using System.Collections;
using System.Linq;
using System.Windows.Forms;
using mRemoteNG.App;
using mRemoteNG.App;
using mRemoteNG.Messages;
using mRemoteNG.UI.Forms;
using mRemoteNG.UI.Forms.Input;
using mRemoteNG.UI.Window;
using System;
using System.Collections;
using System.Linq;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
namespace mRemoteNG.UI.Panels
{
public class PanelAdder
{
public Form AddPanel(string title = "", bool noTabber = false)
public ConnectionWindow AddPanel(string title = "", bool noTabber = false)
{
try
{