diff --git a/TGCommandLine/ConsoleCommand.cs b/TGCommandLine/ConsoleCommand.cs index 7f9489d1c1..5e5274775a 100644 --- a/TGCommandLine/ConsoleCommand.cs +++ b/TGCommandLine/ConsoleCommand.cs @@ -5,8 +5,8 @@ namespace TGCommandLine abstract class ConsoleCommand : Command { /// - /// The currently in use by the + /// The currently in use by the /// - public static IInterface Interface; + public static IServerInterface Interface; } } diff --git a/TGCommandLine/InstanceRootCommand.cs b/TGCommandLine/InstanceRootCommand.cs index 85fd78610b..f430785e26 100644 --- a/TGCommandLine/InstanceRootCommand.cs +++ b/TGCommandLine/InstanceRootCommand.cs @@ -5,7 +5,7 @@ namespace TGCommandLine { abstract class InstanceRootCommand : RootCommand { - public static IInterface currentInterface; + public static IServerInterface currentInterface; public override ExitCode DoRun(IList parameters) { if (currentInterface.InstanceName == null) diff --git a/TGCommandLine/Program.cs b/TGCommandLine/Program.cs index fb0e245d09..ef15f54ed5 100644 --- a/TGCommandLine/Program.cs +++ b/TGCommandLine/Program.cs @@ -10,7 +10,7 @@ namespace TGCommandLine class Program { static bool interactive = false, saidSrvVersion = false; - static IInterface currentInterface; + static IServerInterface currentInterface; static Command.ExitCode RunCommandLine(IList argsAsList) { //first lookup the connection string @@ -100,7 +100,7 @@ namespace TGCommandLine }; } - static void ReplaceInterface(IInterface I) + static void ReplaceInterface(IServerInterface I) { currentInterface = I; ConsoleCommand.Interface = I; @@ -157,7 +157,7 @@ namespace TGCommandLine /// /// The name of the to test /// If , does not output on success - /// if a was achieved with , otherwise + /// if a was achieved with , otherwise static bool CheckInstanceConnectivity(string instanceName, bool silentSuccess) { var res = currentInterface.ConnectToInstance(instanceName); diff --git a/TGCommandLine/RootCommands.cs b/TGCommandLine/RootCommands.cs index 6394224cd7..552e7b1bf7 100644 --- a/TGCommandLine/RootCommands.cs +++ b/TGCommandLine/RootCommands.cs @@ -7,7 +7,7 @@ namespace TGCommandLine { class CLICommand : RootCommand { - public CLICommand(IInterface I) + public CLICommand(IServerInterface I) { var tmp = new List { new UpdateCommand(), new TestmergeCommand(), new RepoCommand(), new BYONDCommand(), new DMCommand(), new DDCommand(), new ConfigCommand(), new IRCCommand(), new DiscordCommand(), new AutoUpdateCommand(), new SetAutoUpdateCommand() }; if (I.ConnectToInstance().HasFlag(ConnectivityLevel.Administrator)) diff --git a/TGControlPanel/ControlPanel/ControlPanel.cs b/TGControlPanel/ControlPanel/ControlPanel.cs index 5e88c8f0c1..f662e50cae 100644 --- a/TGControlPanel/ControlPanel/ControlPanel.cs +++ b/TGControlPanel/ControlPanel/ControlPanel.cs @@ -18,15 +18,15 @@ namespace TGControlPanel public static IDictionary InstancesInUse { get; private set; } = new Dictionary(); /// - /// The instance for this + /// The instance for this /// - readonly IInterface Interface; + readonly IServerInterface Interface; /// /// Constructs a /// - /// The for the - public ControlPanel(IInterface I) + /// The for the + public ControlPanel(IServerInterface I) { InitializeComponent(); FormClosed += ControlPanel_FormClosed; diff --git a/TGControlPanel/InstanceSelector.cs b/TGControlPanel/InstanceSelector.cs index 3be9cde5ad..21e8a32624 100644 --- a/TGControlPanel/InstanceSelector.cs +++ b/TGControlPanel/InstanceSelector.cs @@ -13,9 +13,9 @@ namespace TGControlPanel sealed partial class InstanceSelector : CountedForm { /// - /// The we build instance connections from + /// The we build instance connections from /// - readonly IInterface masterInterface; + readonly IServerInterface masterInterface; /// /// List of from /// @@ -28,8 +28,8 @@ namespace TGControlPanel /// /// Construct an /// - /// An connected a the - public InstanceSelector(IInterface I) + /// An connected a the + public InstanceSelector(IServerInterface I) { InitializeComponent(); InstanceListBox.MouseDoubleClick += InstanceListBox_MouseDoubleClick; diff --git a/TGControlPanel/Login.cs b/TGControlPanel/Login.cs index 364746a652..9a45e19e5a 100644 --- a/TGControlPanel/Login.cs +++ b/TGControlPanel/Login.cs @@ -58,7 +58,7 @@ namespace TGControlPanel VerifyAndConnect(new Interface()); } - void VerifyAndConnect(IInterface I) + void VerifyAndConnect(IServerInterface I) { try { diff --git a/TGControlPanel/ServerOpForm.cs b/TGControlPanel/ServerOpForm.cs index 06099fd819..2a886e742d 100644 --- a/TGControlPanel/ServerOpForm.cs +++ b/TGControlPanel/ServerOpForm.cs @@ -5,7 +5,7 @@ using System.Windows.Forms; namespace TGControlPanel { /// - /// Used to provide an ATP function for calls into an + /// Used to provide an ATP function for calls into an /// #if !DEBUG abstract class ServerOpForm : Form @@ -14,9 +14,9 @@ namespace TGControlPanel #endif { /// - /// Used to wrap calls in a non-blocking fashion while disabling the and enabling the wait cursor + /// Used to wrap calls in a non-blocking fashion while disabling the and enabling the wait cursor /// - /// The operation to wrap + /// The operation to wrap /// A wrapping protected Task WrapServerOp(Action action) { diff --git a/TGControlPanel/TestMergeManager.cs b/TGControlPanel/TestMergeManager.cs index d04e598c73..d766e3dfe0 100644 --- a/TGControlPanel/TestMergeManager.cs +++ b/TGControlPanel/TestMergeManager.cs @@ -17,9 +17,9 @@ namespace TGControlPanel const string MergedPullsError = "Error retrieving currently merged pull requests: {0}"; /// - /// The connected to an to handle the pull requests for + /// The connected to an to handle the pull requests for /// - readonly IInterface currentInterface; + readonly IServerInterface currentInterface; /// /// The to use to read PR lists @@ -38,9 +38,9 @@ namespace TGControlPanel /// /// Construct a /// - /// The to use for managing the + /// The to use for managing the /// The to use for getting pull request information - public TestMergeManager(IInterface interfaceToUse, GitHubClient clientToUse) + public TestMergeManager(IServerInterface interfaceToUse, GitHubClient clientToUse) { InitializeComponent(); DialogResult = DialogResult.Cancel; diff --git a/TGInstallerWrapper/Main.cs b/TGInstallerWrapper/Main.cs index c796238fd3..81eed484af 100644 --- a/TGInstallerWrapper/Main.cs +++ b/TGInstallerWrapper/Main.cs @@ -20,7 +20,7 @@ namespace TGInstallerWrapper bool cancelled = false; bool pathIsDefault = true; - IInterface Interface; + IServerInterface Interface; /// /// Construct an installer form diff --git a/TGServerService/ServerInstance/Compiler.cs b/TGServerService/ServerInstance/Compiler.cs index cff03130b5..6ccda81072 100644 --- a/TGServerService/ServerInstance/Compiler.cs +++ b/TGServerService/ServerInstance/Compiler.cs @@ -119,7 +119,7 @@ namespace TGServerService //what is says on the tin CompilerStatus IsInitialized() { - if (File.Exists(RelativePath(Path.Combine(GameDirLive, BridgeDLLName))) || File.Exists(RelativePath(Path.Combine(GameDirLive, Assembly.GetAssembly(typeof(IInterface)).GetName().Name + ".dll")))) //its a good tell, jim + if (File.Exists(RelativePath(Path.Combine(GameDirLive, BridgeDLLName))) || File.Exists(RelativePath(Path.Combine(GameDirLive, Assembly.GetAssembly(typeof(IServerInterface)).GetName().Name + ".dll")))) //its a good tell, jim return CompilerStatus.Initialized; return CompilerStatus.Uninitialized; } diff --git a/TGServerService/ServerInstance/DreamDaemon.cs b/TGServerService/ServerInstance/DreamDaemon.cs index 113797efe9..0321025126 100644 --- a/TGServerService/ServerInstance/DreamDaemon.cs +++ b/TGServerService/ServerInstance/DreamDaemon.cs @@ -530,7 +530,7 @@ namespace TGServerService return; //Copy the interface dll to the static dir - var InterfacePath = Assembly.GetAssembly(typeof(IInterface)).Location; + var InterfacePath = Assembly.GetAssembly(typeof(IServerInterface)).Location; //bridge is installed next to the interface var BridgePath = Path.Combine(Path.GetDirectoryName(InterfacePath), BridgeDLLName); #if DEBUG diff --git a/TGServiceInterface/Interface.cs b/TGServiceInterface/Interface.cs index 15823014d8..15795c4746 100644 --- a/TGServiceInterface/Interface.cs +++ b/TGServiceInterface/Interface.cs @@ -14,7 +14,7 @@ namespace TGServiceInterface /// /// Main for communicating the /// - public interface IInterface : IDisposable + public interface IServerInterface : IDisposable { /// /// The name of the current instance in use. Defaults to @@ -32,7 +32,7 @@ namespace TGServiceInterface ushort HTTPSPort { get; } /// - /// Checks if the is setup for a remote connection + /// Checks if the is setup for a remote connection /// bool IsRemoteConnection { get; } @@ -45,14 +45,14 @@ namespace TGServiceInterface ConnectivityLevel ConnectToInstance(string instanceName = null, bool skipChecks = false); /// - /// Returns if the interface being used to connect to a service does not have the same release version as the service + /// Returns if the interface being used to connect to a service does not have the same release version as the service /// /// An error message to display to the user should this function return - /// if the interface being used to connect to a service does not have the same release version as the service + /// if the interface being used to connect to a service does not have the same release version as the service bool VersionMismatch(out string errorMessage); /// - /// Returns the requested component for the instance . This does not guarantee a successful connection. + /// Returns the requested component for the instance . This does not guarantee a successful connection. /// /// The component to retrieve /// The correct component @@ -79,7 +79,7 @@ namespace TGServiceInterface } /// - sealed public class Interface : IInterface + sealed public class Interface : IServerInterface { /// /// List of s that can be used with diff --git a/TGServiceTests/CommandLine/Commands/Repository/RepositoryCommandTest.cs b/TGServiceTests/CommandLine/Commands/Repository/RepositoryCommandTest.cs index 48e3355c1a..0c80b404da 100644 --- a/TGServiceTests/CommandLine/Commands/Repository/RepositoryCommandTest.cs +++ b/TGServiceTests/CommandLine/Commands/Repository/RepositoryCommandTest.cs @@ -8,13 +8,13 @@ namespace TGCommandLine.Commands.Repository.Tests public abstract class RepositoryCommandTest : OutputProcOverriderTest { /// - /// Creates a mock that returns a specific when that component is requested + /// Creates a mock that returns a specific when that component is requested /// - /// The the resulting should return - /// A mock - protected IInterface MockInterfaceToRepo(ITGRepository repo) + /// The the resulting should return + /// A mock + protected IServerInterface MockInterfaceToRepo(ITGRepository repo) { - var mock = new Mock(); + var mock = new Mock(); mock.Setup(foo => foo.GetComponent()).Returns(repo); return mock.Object; } diff --git a/TGServiceTests/ControlPanel/TestInstanceSelector.cs b/TGServiceTests/ControlPanel/TestInstanceSelector.cs index 626fbe3195..e5f9da9cd3 100644 --- a/TGServiceTests/ControlPanel/TestInstanceSelector.cs +++ b/TGServiceTests/ControlPanel/TestInstanceSelector.cs @@ -20,7 +20,7 @@ namespace TGControlPanel.Tests { var mockLanding = new Mock(); mockLanding.Setup(x => x.ListInstances()).Returns(new List()); - var mockInter = new Mock(); + var mockInter = new Mock(); mockInter.Setup(x => x.GetComponent()).Returns(mockLanding.Object); new InstanceSelector(mockInter.Object).Dispose();