* Removed MainConsole.Instance.WriteLine completely

* Now exists MainConsole.Instance.Error/Warn/Notice/Verbose -- use those instead
* Removed some instances of System.Console use - aiming to depreciate this in favour of MainConsole completely.

4 files changed, 37 insertions, 20 deletions

diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
index 6a1c53c..160b8f6 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/ConsoleBase.cs
@@ -41,29 +41,49 @@ namespace OpenSim.Framework.Console
 

         public void Write(string format, params object[] args)

         {

-            WriteLine(LogPriority.NORMAL,format,args);

+            Notice(format,args);

             return;

         }

 

-        [Obsolete("WriteLine(msg,args) has been depreciated, use WriteLine(priority,msg,args) instead.")]

-        public void WriteLine(string format, params object[] args)

+        public void Warn(string format, params object[] args)

         {

-            Log.WriteLine(format, args);

-            Log.Flush();

-            if(!m_silent)

-            {

-            System.Console.WriteLine(format, args);

-            }

+            WriteNewLine(ConsoleColor.Yellow, format, args);

+            return;

+        }

+

+        public void Notice(string format, params object[] args)

+        {

+            WriteNewLine(ConsoleColor.White, format, args);

+            return;

+        }

+

+        public void Error(string format, params object[] args)

+        {

+            WriteNewLine(ConsoleColor.Red, format, args);

+            return;

+        }

+

+        public void Verbose(string format, params object[] args)

+        {

+            WriteNewLine(ConsoleColor.Gray, format, args);

+            return;

+        }

+

+        public void Status(string format, params object[] args)

+        {

+            WriteNewLine(ConsoleColor.Blue, format, args);

             return;

         }

 

-        public void WriteLine(LogPriority importance, string format, params object[] args)

+        private void WriteNewLine(System.ConsoleColor color, string format, params object[] args)

         {

             Log.WriteLine(format, args);

             Log.Flush();

             if (!m_silent)

             {

+                System.Console.ForegroundColor = color;

                 System.Console.WriteLine(format, args);

+                System.Console.ResetColor();

             }

             return;

         }

@@ -130,7 +150,7 @@ namespace OpenSim.Framework.Console
                 }

                 else

                 {

-                    this.WriteLine(LogPriority.MEDIUM,"Valid options are " + OptionA + " or " + OptionB);

+                    Notice("Valid options are " + OptionA + " or " + OptionB);

                     temp = CmdPrompt(prompt, defaultresponse);

                 }

             }

diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index 38f4370..3f9109d 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Servers
 

         public void Start()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");

+            MainConsole.Instance.Verbose("BaseHttpServer.cs: Starting up HTTP Server");

 

             m_workerThread = new Thread(new ThreadStart(StartHTTP));

             m_workerThread.IsBackground = true;

@@ -234,7 +234,7 @@ namespace OpenSim.Servers
         {

             try

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");

+                MainConsole.Instance.Verbose("BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");

                 m_httpListener = new HttpListener();

 

                 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");

@@ -249,7 +249,7 @@ namespace OpenSim.Servers
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, e.Message);

+                MainConsole.Instance.Warn(e.Message);

             }

         }

     }

diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
index 1125baf..280eb82 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/Common/OpenSim.Servers/CheckSumServer.cs
@@ -100,8 +100,7 @@ namespace OpenSim.Servers
             }

             catch (Exception)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");

-

+                MainConsole.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");

             }

         }

 

diff --git a/Common/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
index 7333d1f..e78def4 100644
--- a/Common/OpenSim.Servers/LoginResponse.cs
+++ b/Common/OpenSim.Servers/LoginResponse.cs
@@ -210,8 +210,7 @@ namespace OpenSim.UserServer
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(

-                    OpenSim.Framework.Console.LogPriority.LOW, 

+                OpenSim.Framework.Console.MainConsole.Instance.Warn(

                     "LoginResponse: Unable to set default values: " + e.Message

                 );

             }

@@ -326,8 +325,7 @@ namespace OpenSim.UserServer
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(

-                    OpenSim.Framework.Console.LogPriority.LOW,

+                OpenSim.Framework.Console.MainConsole.Instance.Error(

                     "LoginResponse: Error creating XML-RPC Response: " + e.Message

                 );

                 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));