* Replaced old logging mechanism with new shiny logging mechanism

* Console, I bid thee farewall. Use "Log" now where console used to exist.

3 files changed, 26 insertions, 31 deletions

diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/LogBase.cs
index 80a28e9..b625b75 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/LogBase.cs
@@ -41,14 +41,14 @@ namespace OpenSim.Framework.Console
         EXTRAVERBOSE

     }

 

-    public class ConsoleBase

+    public class LogBase

     {

         StreamWriter Log;

         public conscmd_callback cmdparser;

         public string componentname;

         private bool m_silent;

 

-        public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )

+        public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )

         {

             this.componentname = componentname;

             this.cmdparser = cmdparser;

@@ -77,19 +77,7 @@ namespace OpenSim.Framework.Console
             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)

-        {

-            Log.WriteLine(format, args);

-            Log.Flush();

-            if (!m_silent)

-            {

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

-            }

-            return;

-        }

-

+         

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

         {

             Log.WriteLine(format, args);

@@ -226,7 +214,7 @@ namespace OpenSim.Framework.Console
             cmdparser.Show(ShowWhat);

         }

 

-        public void MainConsolePrompt()

+        public void MainLogPrompt()

         {

             string[] tempstrarray;

             string tempstr = this.CmdPrompt(this.componentname + "# ");

diff --git a/Common/OpenSim.Framework.Console/MainConsole.cs b/Common/OpenSim.Framework.Console/MainLog.cs
index 01aa3d1..d7f945e 100644
--- a/Common/OpenSim.Framework.Console/MainConsole.cs
+++ b/Common/OpenSim.Framework.Console/MainLog.cs
@@ -29,11 +29,11 @@ using System;
 

 namespace OpenSim.Framework.Console

 {

-        public class MainConsole {

+        public class MainLog {

                 

-                private static ConsoleBase instance;

+                private static LogBase instance;

                 

-                public static ConsoleBase Instance 

+                public static LogBase Instance 

                 {

                         get 

                         {

diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 7af0eca..fef5108 100644
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework.Console</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework.Console</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,10 +61,11 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -69,13 +76,13 @@
     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ConsoleBase.cs">

+    <Compile Include="LogBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ConsoleCallbacksBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="MainConsole.cs">

+    <Compile Include="MainLog.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

@@ -86,4 +93,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file