Changeset 11836 for trunk/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.cs

Timestamp:

01/28/15 14:32:00 (9 years ago)

Author:

jkarder

Message:

#2077:

• changed error and warning markup handling
• minor code changes

File:

• trunk/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.cs

@@ -86 +86 @@
         codeEditor.AddAssembliesAsync(Content.GetAssemblies());
         if (Content.CompileErrors == null) {
-          compilationLabel.ForeColor = SystemColors.ControlDarkDark;
-          compilationLabel.Text = NotCompiledMessage;
+          UpdateInfoTextLabel(NotCompiledMessage, SystemColors.ControlText);
         }
       }
@@ -117 +116 @@
         Content.Compile();
         outputTextBox.AppendText(CompilationSucceededMessage);
-        compilationLabel.ForeColor = Color.DarkGreen;
-        compilationLabel.Text = CompilationSucceededMessage;
+        UpdateInfoTextLabel(CompilationSucceededMessage, Color.DarkGreen);
         return true;
       } catch (InvalidOperationException) {
         if (Content.CompileErrors.HasErrors) {
           outputTextBox.AppendText(CompilationFailedMessage);
-          compilationLabel.ForeColor = Color.DarkRed;
-          compilationLabel.Text = CompilationFailedMessage;
+          UpdateInfoTextLabel(CompilationFailedMessage, Color.DarkRed);
           return false;
         } else {
           outputTextBox.AppendText(CompilationSucceededMessage);
-          compilationLabel.ForeColor = Color.DarkGreen;
-          compilationLabel.Text = CompilationSucceededMessage;
+          UpdateInfoTextLabel(CompilationSucceededMessage, Color.DarkGreen);
           return true;
         }
@@ -144 +140 @@
     #region Helpers
     protected virtual void ShowCompilationResults() {
-      if (Content.CompileErrors.Count == 0) return;
-
       var messages = Content.CompileErrors.OfType<CompilerError>()
                                       .OrderBy(x => x.IsWarning)
@@ -169 +163 @@
     }
 
+    protected virtual void UpdateInfoTextLabel(string message, Color color) {
+      infoTextLabel.Text = message;
+      infoTextLabel.ForeColor = color;
+    }
+
     protected virtual void AdjustErrorListViewColumnSizes() {
       foreach (ColumnHeader ch in errorListView.Columns)