Merge pull request #2820 from kumpera/license-change-rebased

[mono.git] / mcs / class / System / System.Diagnostics / DefaultTraceListener.cs

diff --git a/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs b/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
index 2ee3a8ee2da09ca0d8eb4755f67f87edbe96ca23..fb31ace627b679a46f3b9eece4154858108a0c14 100644 (file)
--- a/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
+++ b/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
@@ -43,10 +43,6 @@ using System.Runtime.InteropServices;
 using System.Threading;
 
 namespace System.Diagnostics {
-#if NET_2_0
-#else
-       [ComVisible(false)]
-#endif
        public class DefaultTraceListener : TraceListener {
 
                private static readonly bool OnWin32;
@@ -68,13 +64,14 @@ namespace System.Diagnostics {
                        OnWin32 = (Path.DirectorySeparatorChar == '\\');
 
                        if (!OnWin32) {
-#if TARGET_JVM
-                               string trace = java.lang.System.getProperty("MONO_TRACE");
-#else
                                // If we're running on Unix, we don't have OutputDebugString.
                                // Instead, send output to...wherever the MONO_TRACE_LISTENER environment
                                // variables says to.
                                String trace = Environment.GetEnvironmentVariable("MONO_TRACE_LISTENER");
+
+#if MOBILE
+                               if (trace == null)
+                                       trace = ConsoleOutTrace;
 #endif
 
                                if (trace != null) {
@@ -143,6 +140,7 @@ namespace System.Diagnostics {
                {
                }
 
+               [MonoTODO ("AssertUiEnabled defaults to False; should follow Environment.UserInteractive.")]
                public bool AssertUiEnabled {
                        get { return assertUiEnabled; }
                        set { assertUiEnabled = value; }
@@ -162,11 +160,14 @@ namespace System.Diagnostics {
                public override void Fail (string message, string detailMessage)
                {
                        base.Fail (message, detailMessage);
+#if !MOBILE
                        if (ProcessUI (message, detailMessage) == DialogResult.Abort)
                                Thread.CurrentThread.Abort ();
+#endif
                        WriteLine (new StackTrace().ToString());
                }
 
+#if !MOBILE
                DialogResult ProcessUI (string message, string detailMessage)
                {
                        
@@ -212,11 +213,8 @@ namespace System.Diagnostics {
                        Ignore,
                        Abort
                }
+#endif
 
-#if TARGET_JVM
-               private void WriteDebugString (string message)
-               {
-#else
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern static void WriteWindowsDebugString (string message);
 
@@ -225,7 +223,6 @@ namespace System.Diagnostics {
                        if (OnWin32)
                                WriteWindowsDebugString (message);
                        else
-#endif
                                WriteMonoTrace (message);
                }
 
@@ -258,10 +255,10 @@ namespace System.Diagnostics {
                                WritePrefix ();
                        }
 
-                       WriteDebugString (message);
-
                        if (Debugger.IsLogging())
                                Debugger.Log (0, null, message);
+                       else
+                               WriteDebugString (message);
 
                        WriteLogFile (message, LogFileName);
                }