diff --git a/mRemoteV1/Config/Connections/IConnectionsLoader.cs b/mRemoteV1/Config/Connections/IConnectionsLoader.cs new file mode 100644 index 00000000..a4669757 --- /dev/null +++ b/mRemoteV1/Config/Connections/IConnectionsLoader.cs @@ -0,0 +1,9 @@ +using mRemoteNG.Tree; + +namespace mRemoteNG.Config.Connections +{ + public interface IConnectionsLoader + { + ConnectionTreeModel Load(); + } +} \ No newline at end of file diff --git a/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs b/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs index a52ffea3..1a4c2075 100644 --- a/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs +++ b/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs @@ -1,6 +1,7 @@ -using System; +using mRemoteNG.App; +using System; using System.Timers; -using mRemoteNG.App; + // ReSharper disable ArrangeAccessorOwnerBody namespace mRemoteNG.Config.Connections.Multiuser diff --git a/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs b/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs index fdd8dc1b..e649628c 100644 --- a/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs +++ b/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs @@ -1,11 +1,11 @@ using mRemoteNG.App; +using mRemoteNG.Config.Connections.Multiuser; +using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Messages; using System; using System.Data; using System.Data.SqlClient; using System.Threading; -using mRemoteNG.Config.Connections.Multiuser; -using mRemoteNG.Config.DatabaseConnectors; namespace mRemoteNG.Config.Connections { @@ -104,6 +104,7 @@ namespace mRemoteNG.Config.Connections public event ConnectionsUpdateAvailableEventHandler ConnectionsUpdateAvailable; private void RaiseConnectionsUpdateAvailableEvent() { + Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Remote connection update is available"); var args = new ConnectionsUpdateAvailableEventArgs(_sqlConnector, _lastDatabaseUpdateTime); ConnectionsUpdateAvailable?.Invoke(this, args); if(args.Handled) diff --git a/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs b/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs index eb2107d8..5e8652d2 100644 --- a/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs +++ b/mRemoteV1/Config/Connections/SqlConnectionsLoader.cs @@ -6,7 +6,7 @@ using mRemoteNG.Tree; namespace mRemoteNG.Config.Connections { - public class SqlConnectionsLoader + public class SqlConnectionsLoader : IConnectionsLoader { public ConnectionTreeModel Load() { diff --git a/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs b/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs index c79e13d8..71a02ebe 100644 --- a/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs +++ b/mRemoteV1/Config/Connections/XmlConnectionsLoader.cs @@ -1,14 +1,14 @@ -using System; -using System.IO; -using System.Security; -using mRemoteNG.Config.DataProviders; +using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers.Xml; using mRemoteNG.Tools; using mRemoteNG.Tree; +using System; +using System.IO; +using System.Security; namespace mRemoteNG.Config.Connections { - public class XmlConnectionsLoader + public class XmlConnectionsLoader : IConnectionsLoader { private readonly string _connectionFilePath; diff --git a/mRemoteV1/Connection/ConnectionsService.cs b/mRemoteV1/Connection/ConnectionsService.cs index c6240ec9..e2d90c59 100644 --- a/mRemoteV1/Connection/ConnectionsService.cs +++ b/mRemoteV1/Connection/ConnectionsService.cs @@ -1,8 +1,4 @@ -using System; -using System.IO; -using System.Threading; -using System.Windows.Forms; -using mRemoteNG.App; +using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; @@ -14,6 +10,10 @@ using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI; +using System; +using System.IO; +using System.Threading; +using System.Windows.Forms; namespace mRemoteNG.Connection { @@ -106,9 +106,11 @@ namespace mRemoteNG.Connection var oldConnectionTreeModel = ConnectionTreeModel; var oldIsUsingDatabaseValue = UsingDatabase; - var newConnectionTreeModel = useDatabase - ? new SqlConnectionsLoader().Load() - : new XmlConnectionsLoader(connectionFileName).Load(); + var connectionLoader = useDatabase + ? (IConnectionsLoader)new SqlConnectionsLoader() + : new XmlConnectionsLoader(connectionFileName); + + var newConnectionTreeModel = connectionLoader.Load(); if (newConnectionTreeModel == null) { @@ -129,6 +131,7 @@ namespace mRemoteNG.Connection ConnectionTreeModel = newConnectionTreeModel; UpdateCustomConsPathSetting(connectionFileName); RaiseConnectionsLoadedEvent(oldConnectionTreeModel, newConnectionTreeModel, oldIsUsingDatabaseValue, useDatabase, connectionFileName); + Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Connections loaded using {connectionLoader.GetType().Name}"); } /// diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 12ab41d8..54426473 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -136,6 +136,7 @@ +