From: Ankit Jain <radical@corewars.org>
Date: Wed, 10 Feb 2010 12:35:52 +0000 (-0000)
Subject: * ToolTask.cs (ExecuteTool): Use the virtual method
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=224404ae1d944ffa0a09feda11ce1a7abb04fc18;p=mono.git

* ToolTask.cs (ExecuteTool): Use the virtual method
Standard*LoggingImportance, instead of the underlying field.
(LogEventsFromTextOutput): Use @importance argument for LogMessage.
(LogToolCommand): Remove MonoTODO.

svn path=/trunk/mcs/; revision=151208
---

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
index 53abbf5d8a9..b729e53d451 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Ankit Jain  <jankit@novell.com>
+
+	* ToolTask.cs (ExecuteTool): Use the virtual method
+	Standard*LoggingImportance, instead of the underlying field.
+	(LogEventsFromTextOutput): Use @importance argument for LogMessage.
+	(LogToolCommand): Remove MonoTODO.
+
 2010-02-06  Ankit Jain  <jankit@novell.com>
 
 	* ToolTask.cs (SkipTaskExecution): Use ValidateParameters method.
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
index 20fe64d3fc2..eff4598c268 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
@@ -166,8 +166,8 @@ namespace Microsoft.Build.Utilities
 					return -1;
 				}
 
-				ProcessOutputFile (output, standardOutputLoggingImportance);
-				ProcessOutputFile (error, standardErrorLoggingImportance);
+				ProcessOutputFile (output, StandardOutputLoggingImportance);
+				ProcessOutputFile (error, StandardErrorLoggingImportance);
 
 				Log.LogMessage (MessageImportance.Low, "Tool {0} execution finished.", pathToTool);
 				return exitCode;
@@ -250,7 +250,7 @@ namespace Microsoft.Build.Utilities
 				Log.LogError (subcategory, code, null, filename, lineNumber, columnNumber, endLineNumber,
 					endColumnNumber, text, null);
 			} else {
-				Log.LogMessage (singleLine);
+				Log.LogMessage (importance, singleLine);
 			}
 		}
 		
@@ -340,7 +340,6 @@ namespace Microsoft.Build.Utilities
 			return HostObjectInitializationStatus.NoActionReturnSuccess;
 		}
 
-		[MonoTODO]
 		protected virtual void LogToolCommand (string message)
 		{
 			Log.LogMessage (MessageImportance.Normal, message);