From cd4d5df4db481cd2fd0fd6c49d3a566fbc1e3a92 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Thu, 11 May 2017 15:12:53 -0600 Subject: [PATCH] extracted a Runtime method to a different class --- mRemoteV1/App/Runtime.cs | 36 ------------------- mRemoteV1/Connection/ConnectionsService.cs | 34 ++++++++++++++++++ .../UI/Controls/QuickConnectToolStrip.cs | 2 +- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index b87d0ace4..98cf26304 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -1,7 +1,6 @@ using mRemoteNG.App.Info; using mRemoteNG.Config.Connections; using mRemoteNG.Connection; -using mRemoteNG.Connection.Protocol; using mRemoteNG.Messages; using mRemoteNG.Tools; using mRemoteNG.Tree.Root; @@ -269,40 +268,5 @@ namespace mRemoteNG.App } } #endregion - - #region Opening Connection - public static ConnectionInfo CreateQuickConnect(string connectionString, ProtocolType protocol) - { - try - { - var uri = new Uri("dummyscheme" + Uri.SchemeDelimiter + connectionString); - if (string.IsNullOrEmpty(uri.Host)) return null; - - var newConnectionInfo = new ConnectionInfo(); - newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance); - - newConnectionInfo.Name = Settings.Default.IdentifyQuickConnectTabs ? string.Format(Language.strQuick, uri.Host) : uri.Host; - - newConnectionInfo.Protocol = protocol; - newConnectionInfo.Hostname = uri.Host; - if (uri.Port == -1) - { - newConnectionInfo.SetDefaultPort(); - } - else - { - newConnectionInfo.Port = uri.Port; - } - newConnectionInfo.IsQuickConnect = true; - - return newConnectionInfo; - } - catch (Exception ex) - { - MessageCollector.AddExceptionMessage(Language.strQuickConnectFailed, ex); - return null; - } - } - #endregion } } \ No newline at end of file diff --git a/mRemoteV1/Connection/ConnectionsService.cs b/mRemoteV1/Connection/ConnectionsService.cs index a32e4c9bb..05926dc3b 100644 --- a/mRemoteV1/Connection/ConnectionsService.cs +++ b/mRemoteV1/Connection/ConnectionsService.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.Config.Connections; +using mRemoteNG.Connection.Protocol; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; @@ -78,5 +79,38 @@ namespace mRemoteNG.Connection { return ConnectionsFileInfo.DefaultConnectionsPath + "\\" + ConnectionsFileInfo.DefaultConnectionsFile; } + + public ConnectionInfo CreateQuickConnect(string connectionString, ProtocolType protocol) + { + try + { + var uri = new Uri("dummyscheme" + Uri.SchemeDelimiter + connectionString); + if (string.IsNullOrEmpty(uri.Host)) return null; + + var newConnectionInfo = new ConnectionInfo(); + newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance); + + newConnectionInfo.Name = Settings.Default.IdentifyQuickConnectTabs ? string.Format(Language.strQuick, uri.Host) : uri.Host; + + newConnectionInfo.Protocol = protocol; + newConnectionInfo.Hostname = uri.Host; + if (uri.Port == -1) + { + newConnectionInfo.SetDefaultPort(); + } + else + { + newConnectionInfo.Port = uri.Port; + } + newConnectionInfo.IsQuickConnect = true; + + return newConnectionInfo; + } + catch (Exception ex) + { + Runtime.MessageCollector.AddExceptionMessage(Language.strQuickConnectFailed, ex); + return null; + } + } } } \ No newline at end of file diff --git a/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs b/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs index dea832023..36c152fb2 100644 --- a/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs +++ b/mRemoteV1/UI/Controls/QuickConnectToolStrip.cs @@ -168,7 +168,7 @@ namespace mRemoteNG.UI.Controls { try { - var connectionInfo = Runtime.CreateQuickConnect(_cmbQuickConnect.Text.Trim(), Converter.StringToProtocol(Settings.Default.QuickConnectProtocol)); + var connectionInfo = Runtime.ConnectionsService.CreateQuickConnect(_cmbQuickConnect.Text.Trim(), Converter.StringToProtocol(Settings.Default.QuickConnectProtocol)); if (connectionInfo == null) { _cmbQuickConnect.Focus();