Moved log to text area window redirection into TextAreaDialog.

Moved the log to text area window redirection logic from GradleResolver
to TextAreaDialog so that it can be reused by other modules.

Bug: 135269831, 135273820
Change-Id: I6a8a1bc4513a13aa4fa38b831517993c6825835e

Author: Stewart Miles

source/PlayServicesResolver/src/CommandLineDialog.cs

@@ -230,6 +230,7 @@ public override void Initialize()
             progressSummary = "";
             UpdateEvent = null;
             autoScrollToBottom = false;
+            logRedirector.ShouldLogDelegate = () => { return !RunningCommand; };
         }
 
         /// <summary>

source/PlayServicesResolver/src/GradleResolver.cs

@@ -238,7 +238,6 @@ private class ResolutionState {
             public List<string> missingArtifacts = new List<string>();
             public List<Dependency> missingArtifactsAsDependencies = new List<Dependency>();
             public List<string> modifiedArtifacts = new List<string>();
-            public bool errorOrWarningLogged = false;
         }
 
         /// <summary>
@@ -293,35 +292,18 @@ private void GradleResolution(
                 "Resolving Android Dependencies");
 
             // Register an event to redirect log messages to the resolution window.
-            Google.Logger.LogMessageDelegate logToWindow = (message, logLevel) => {
-                string messagePrefix;
-                switch (logLevel) {
-                    case LogLevel.Error:
-                        messagePrefix = "ERROR: ";
-                        resolutionState.errorOrWarningLogged = true;
-                        break;
-                    case LogLevel.Warning:
-                        messagePrefix = "WARNING: ";
-                        resolutionState.errorOrWarningLogged = true;
-                        break;
-                    default:
-                        messagePrefix = "";
-                        break;
-                }
-                if (!window.RunningCommand) {
-                    window.AddBodyText(messagePrefix + message + "\n");
-                }
-            };
-            PlayServicesResolver.logger.LogMessage += logToWindow;
+            var logRedirector = window.Redirector;
+            PlayServicesResolver.logger.LogMessage += logRedirector.LogToWindow;
 
             // When resolution is complete unregister the log redirection event.
             Action resolutionCompleteRestoreLogger = () => {
-                PlayServicesResolver.logger.LogMessage -= logToWindow;
+                PlayServicesResolver.logger.LogMessage -= logRedirector.LogToWindow;
                 // If the command completed successfully or the log level is info or above close
                 // the window, otherwise leave it open for inspection.
                 if ((resolutionState.commandLineResult.exitCode == 0 &&
                      PlayServicesResolver.logger.Level >= LogLevel.Info &&
-                     !resolutionState.errorOrWarningLogged) || closeWindowOnCompletion) {
+                     !(logRedirector.WarningLogged || logRedirector.ErrorLogged)) ||
+                    closeWindowOnCompletion) {
                     window.Close();
                 }
                 resolutionComplete(resolutionState.missingArtifactsAsDependencies);

source/PlayServicesResolver/src/TextAreaDialog.cs

@@ -99,6 +99,9 @@ public class TextAreaDialog : EditorWindow
         /// </summary>
         private const long REPAINT_PERIOD_IN_MILLISECONDS = 33; // ~30Hz
 
+        // Backing store for the Redirector property.
+        internal LogRedirector logRedirector;
+
         /// <summary>
         /// Get the existing text area window or create a new one.
         /// </summary>
@@ -124,6 +127,7 @@ public virtual void Initialize()
             minSize = new Vector2(300, 200);
             position = new Rect(UnityEngine.Screen.width / 3, UnityEngine.Screen.height / 3,
                                 minSize.x * 2, minSize.y * 2);
+            logRedirector = new LogRedirector(this);
         }
 
         // Add to body text.
@@ -222,6 +226,76 @@ protected virtual void OnDestroy() {
                 if (buttonClicked != null) buttonClicked(this);
             }
         }
+
+        /// <summary>
+        /// Redirects logs to a TextAreaDialog window.
+        /// </summary>
+        internal class LogRedirector {
+
+            /// <summary>
+            /// Window to redirect logs to.
+            /// </summary>
+            private TextAreaDialog window;
+
+            /// <summary>
+            /// Create a log redirector associated with this window.
+            /// </summary>
+            public LogRedirector(TextAreaDialog window) {
+                this.window = window;
+                LogToWindow = (string message, LogLevel level) => LogMessage(message, level);
+                ErrorLogged = false;
+                WarningLogged = false;
+                ShouldLogDelegate = () => { return true; };
+            }
+
+            /// <summary>
+            /// Delegate that logs to the window associated with this object.
+            /// </summary>
+            public Google.Logger.LogMessageDelegate LogToWindow { get; private set; }
+
+            /// <summary>
+            /// Whether an error was logged.
+            /// </summary>
+            public bool ErrorLogged { get; private set; }
+
+
+            /// <summary>
+            /// Whether a warning was logged.
+            /// </summary>
+            public bool WarningLogged { get; private set; }
+
+            /// <summary>
+            /// Delegate that determines whether a message should be logged.
+            /// </summary>
+            public Func<bool> ShouldLogDelegate { get; set; }
+
+            /// <summary>
+            /// Log a message to the window associated with this object.
+            /// </summary>
+            private void LogMessage(string message, LogLevel level) {
+                string messagePrefix;
+                switch (level) {
+                    case LogLevel.Error:
+                        messagePrefix = "ERROR: ";
+                        ErrorLogged = true;
+                        break;
+                    case LogLevel.Warning:
+                        messagePrefix = "WARNING: ";
+                        WarningLogged = true;
+                        break;
+                    default:
+                        messagePrefix = "";
+                        break;
+                }
+                if (ShouldLogDelegate()) window.AddBodyText(messagePrefix + message + "\n");
+
+            }
+        }
+
+        /// <summary>
+        /// Get an object that can redirect log messages to this window.
+        /// </summary>
+        internal LogRedirector Redirector { get { return logRedirector; } }
     }
 
 }