From 0d2392a57fa1ce9327fe33be12b80987fbc09a3c Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Sat, 30 Sep 2017 18:53:48 -0400 Subject: [PATCH] Tidying --- ICD.Common.Utils/IcdConsole.cs | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ICD.Common.Utils/IcdConsole.cs b/ICD.Common.Utils/IcdConsole.cs index 43213c5..7525b80 100644 --- a/ICD.Common.Utils/IcdConsole.cs +++ b/ICD.Common.Utils/IcdConsole.cs @@ -7,7 +7,7 @@ using Crestron.SimplSharp; namespace ICD.Common.Utils { - public sealed class IcdConsole + public static class IcdConsole { public enum eAccessLevel { @@ -48,7 +48,7 @@ namespace ICD.Common.Utils CrestronConsole.Print(message); } #else - System.Console.Write(message, args); + Console.Write(message, args); #endif } @@ -57,17 +57,14 @@ namespace ICD.Common.Utils #if SIMPLSHARP CrestronConsole.PrintLine(message); #else - System.Console.WriteLine(message); + Console.WriteLine(message); #endif } public static void PrintLine(string message, params object[] args) { -#if SIMPLSHARP - CrestronConsole.PrintLine(message, args); -#else - System.Console.WriteLine(message, args); -#endif + message = string.Format(message, args); + PrintLine(message); } public static void Print(string message) @@ -75,17 +72,14 @@ namespace ICD.Common.Utils #if SIMPLSHARP CrestronConsole.Print(message); #else - System.Console.Write(message); + Console.Write(message); #endif } public static void Print(string message, params object[] args) { -#if SIMPLSHARP - CrestronConsole.Print(message, args); -#else - System.Console.Write(message, args); -#endif + message = string.Format(message, args); + Print(message); } public static bool SendControlSystemCommand(string command, ref string result)