factor out common HandleShow code for "show uptime"

1 files changed, 5 insertions, 34 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 6346279..4f9ac08 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -62,7 +62,6 @@ namespace OpenSim.Framework.Servers
         /// </summary>
         private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
 
-        protected CommandConsole m_console;
         protected OpenSimAppender m_consoleAppender;
         protected IAppender m_logFileAppender = null; 
 
@@ -139,7 +138,8 @@ namespace OpenSim.Framework.Servers
                 }
                 else
                 {
-                    m_consoleAppender.Console = m_console;
+                    // FIXME: This should be done through an interface rather than casting.
+                    m_consoleAppender.Console = (ConsoleBase)m_console;
                     
                     // If there is no threshold set then the threshold is effectively everything.
                     if (null == m_consoleAppender.Threshold)
@@ -367,8 +367,10 @@ namespace OpenSim.Framework.Servers
             }
         }
 
-        public virtual void HandleShow(string module, string[] cmd)
+        public override void HandleShow(string module, string[] cmd)
         {
+            base.HandleShow(module, cmd);
+
             List<string> args = new List<string>(cmd);
 
             args.RemoveAt(0);
@@ -385,10 +387,6 @@ namespace OpenSim.Framework.Servers
                     Notice(GetThreadsReport());
                     break;
 
-                case "uptime":
-                    Notice(GetUptimeReport());
-                    break;
-
                 case "version":
                     Notice(GetVersionText());
                     break;
@@ -430,33 +428,6 @@ namespace OpenSim.Framework.Servers
         }
 
         /// <summary>
-        /// Console output is only possible if a console has been established.
-        /// That is something that cannot be determined within this class. So
-        /// all attempts to use the console MUST be verified.
-        /// </summary>
-        /// <param name="msg"></param>
-        protected void Notice(string msg)
-        {
-            if (m_console != null)
-            {
-                m_console.Output(msg);
-            }
-        }
-        
-        /// <summary>
-        /// Console output is only possible if a console has been established.
-        /// That is something that cannot be determined within this class. So
-        /// all attempts to use the console MUST be verified.
-        /// </summary>
-        /// <param name="format"></param>        
-        /// <param name="components"></param>
-        protected void Notice(string format, params string[] components)
-        {
-            if (m_console != null)
-                m_console.OutputFormat(format, components);
-        }
-
-        /// <summary>
         /// Enhance the version string with extra information if it's available.
         /// </summary>
         protected void EnhanceVersionInformation()