Address feedback.

Author: jpobst

src/Java.Interop.Tools.Generator/Utilities/Report.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Xml;
 using System.Xml.Linq;
 
@@ -7,7 +8,7 @@ namespace Java.Interop.Tools.Generator
 	public class Report
 	{
 		public static int? Verbosity { get; set; }
-		public static Action<string>? OutputDelegate { get; set; }
+		public static Action<TraceLevel, string>? OutputDelegate { get; set; }
 
 		public class LocalizedMessage
 		{
@@ -97,7 +98,7 @@ public static void LogCodedError (LocalizedMessage message, XNode? node, params
 
 		public static void LogCodedError (LocalizedMessage message, string? sourceFile, int line, int column, params string? [] args)
 		{
-			WriteOutput (Format (true, message.Code, sourceFile, line, column, message.Value, args));
+			WriteOutput (TraceLevel.Error, Format (true, message.Code, sourceFile, line, column, message.Value, args));
 		}
 
 		public static void LogCodedWarning (int verbosity, LocalizedMessage message, params string? [] args)
@@ -122,17 +123,17 @@ public static void LogCodedWarning (int verbosity, LocalizedMessage message, Exc
 				return;
 
 			var supp = innerException != null ? "  For details, see verbose output." : null;
-			WriteOutput (Format (false, message.Code, sourceFile, line, column, message.Value, args) + supp);
+			WriteOutput (TraceLevel.Warning, Format (false, message.Code, sourceFile, line, column, message.Value, args) + supp);
 
 			if (innerException != null)
-				WriteOutput (innerException.ToString ());
+				WriteOutput (TraceLevel.Warning, innerException.ToString ());
 		}
 
 		public static void Verbose (int verbosity, string format, params object?[] args)
 		{
 			if (verbosity > (Verbosity ?? 0))
 				return;
-			WriteOutput (format, args);
+			WriteOutput (TraceLevel.Verbose, format, args);
 		}
 
 		public static string FormatCodedMessage (bool error, LocalizedMessage message, params object? [] args)
@@ -172,11 +173,11 @@ public static string Format (bool error, int errorCode, string? sourceFile, int
 			return (file, pos?.LineNumber ?? -1, pos?.LinePosition ?? -1);
 		}
 
-		static void WriteOutput (string format, params object?[] args)
+		static void WriteOutput (TraceLevel traceLevel, string format, params object?[] args)
 		{
 			// Write to overridden output if requested
 			if (OutputDelegate != null) {
-				OutputDelegate (string.Format (format, args));
+				OutputDelegate (traceLevel, string.Format (format, args));
 				return;
 			}
 

tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using generator.SourceWriters;
@@ -528,6 +529,7 @@ public void ObsoleteBoundMethodAbstractDeclaration ()
 
 			// Ensure [Obsolete] was written
 			Assert.True (writer.ToString ().Contains ("[Obsolete (@\"This is so old!\")]"), writer.ToString ());
+		}
 
 		[Test]
 		[NonParallelizable]	// We are setting a static property on Report
@@ -536,7 +538,7 @@ public void WarnIfTypeNameMatchesNamespace ()
 			var @class = new TestClass ("Object", "java.myclass.MyClass");
 			var sb = new StringBuilder ();
 
-			var write_output = new Action<string> ((s) => { sb.AppendLine (s); });
+			var write_output = new Action<TraceLevel, string> ((t, s) => { sb.AppendLine (s); });
 			Report.OutputDelegate = write_output;
 
 			generator.Context.ContextTypes.Push (@class);
@@ -557,7 +559,7 @@ public void DontWarnIfNestedTypeNameMatchesNamespace ()
 			@class.NestedTypes.Add (new TestClass ("Object", "java.myclass.MyParentClass.MyClass"));
 			var sb = new StringBuilder ();
 
-			var write_output = new Action<string> ((s) => { sb.AppendLine (s); });
+			var write_output = new Action<TraceLevel, string> ((t, s) => { sb.AppendLine (s); });
 			Report.OutputDelegate = write_output;
 
 			generator.Context.ContextTypes.Push (@class);