Changeset 13277 for stable/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs

Timestamp:

11/19/15 11:29:17 (8 years ago)

Author:

mkommend

Message:

#2298: Merged r13024, r13080, r13138, and r13218 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs (modified) (5 diffs)

stable/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs

@@ -21 +21 @@
 
 using System;
-using System.Drawing;
-using System.Threading;
 using System.Windows.Forms;
 using HeuristicLab.Common;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.MainForm;
 
@@ -32 +29 @@
   [View("C# Script View")]
   [Content(typeof(CSharpScript), true)]
-  public partial class CSharpScriptView : ScriptView {
-    private const string ScriptExecutionStartedMessage = "Script execution started";
-    private const string ScriptExecutionCanceledMessage = "Script execution canceled";
-    private const string ScriptExecutionSuccessfulMessage = "Script execution successful";
-    private const string ScriptExecutionFailedMessage = "Script execution failed";
-
-    protected bool Running { get; set; }
+  public partial class CSharpScriptView : ExecutableScriptView {
 
     public new CSharpScript Content {
@@ -51 +42 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ScriptExecutionStarted += ContentOnScriptExecutionStarted;
-      Content.ScriptExecutionFinished += ContentOnScriptExecutionFinished;
       Content.ConsoleOutputChanged += ContentOnConsoleOutputChanged;
     }
 
     protected override void DeregisterContentEvents() {
-      Content.ScriptExecutionStarted -= ContentOnScriptExecutionStarted;
-      Content.ScriptExecutionFinished -= ContentOnScriptExecutionFinished;
       Content.ConsoleOutputChanged -= ContentOnConsoleOutputChanged;
       base.DeregisterContentEvents();
@@ -64 +51 @@
 
     #region Content event handlers
-    protected virtual void ContentOnScriptExecutionStarted(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke((Action<object, EventArgs>)ContentOnScriptExecutionStarted, sender, e);
-      else {
-        Locked = true;
-        ReadOnly = true;
-        startStopButton.Image = VSImageLibrary.Stop;
-        toolTip.SetToolTip(startStopButton, "Stop (Shift+F5)");
-        UpdateInfoTextLabel(ScriptExecutionStartedMessage, SystemColors.ControlText);
-        infoTabControl.SelectedTab = outputTabPage;
-      }
-    }
-    protected virtual void ContentOnScriptExecutionFinished(object sender, EventArgs<Exception> e) {
-      if (InvokeRequired)
-        Invoke((Action<object, EventArgs<Exception>>)ContentOnScriptExecutionFinished, sender, e);
-      else {
-        Locked = false;
-        ReadOnly = false;
-        startStopButton.Image = VSImageLibrary.Play;
-        toolTip.SetToolTip(startStopButton, "Run (F5)");
-
-        var ex = e.Value;
-        if (ex == null) {
-          UpdateInfoTextLabel(ScriptExecutionSuccessfulMessage, Color.DarkGreen);
-        } else if (ex is ThreadAbortException) {
-          // the execution was canceled by the user
-          UpdateInfoTextLabel(ScriptExecutionCanceledMessage, Color.DarkOrange);
-        } else {
-          UpdateInfoTextLabel(ScriptExecutionFailedMessage, Color.DarkRed);
-          PluginInfrastructure.ErrorHandling.ShowErrorDialog(this, ex);
-        }
-
-        Running = false;
-      }
-    }
     protected virtual void ContentOnConsoleOutputChanged(object sender, EventArgs<string> e) {
       if (InvokeRequired)
@@ -116 +68 @@
       }
     }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      startStopButton.Enabled = Content != null && (!Locked || Running);
-    }
-
-    protected virtual void StartStopButtonOnClick(object sender, EventArgs e) {
-      if (Running) {
-        Content.Kill();
-      } else
-        if (Compile()) {
-          outputTextBox.Clear();
-          Running = true;
-          Content.ExecuteAsync();
-        }
-    }
-
-    #region global HotKeys
-    protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
-      switch (keyData) {
-        case Keys.F5:
-          if (Content != null && !Locked && !Running) {
-            if (Compile()) {
-              outputTextBox.Clear();
-              Content.ExecuteAsync();
-              Running = true;
-            }
-          }
-          return true;
-        case Keys.F5 | Keys.Shift:
-          if (Running) Content.Kill();
-          return true;
-        case Keys.F6:
-          if (!Running) base.ProcessCmdKey(ref msg, keyData);
-          return true;
-      }
-      return base.ProcessCmdKey(ref msg, keyData);
-    }
-    #endregion
   }
 }