Changeset 13277 for stable

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.Problems.ExternalEvaluation/3.4/Programmable/MultiObjectiveOptimizationSupportScript.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/OptimizationSupportScript.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs (modified) (2 diffs)
• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs (modified) (5 diffs)
• HeuristicLab.Scripting.Views/3.3/ExecutableScriptView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Scripting.Views/3.3/ExecutableScriptView.Designer.cs) (4 diffs)
• HeuristicLab.Scripting.Views/3.3/ExecutableScriptView.cs (copied) (copied from trunk/sources/HeuristicLab.Scripting.Views/3.3/ExecutableScriptView.cs)
• HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/ExecutableScript.cs (copied) (copied from trunk/sources/HeuristicLab.Scripting/3.3/ExecutableScript.cs) (2 diffs)
• HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (6 diffs)

stable/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/MultiObjectiveOptimizationSupportScript.cs

@@ -30 +30 @@
   [StorableClass]
   public sealed class MultiObjectiveOptimizationSupportScript : OptimizationSupportScript<IMultiObjectiveOptimizationSupport>, IMultiObjectiveOptimizationSupport {
-
-    protected override string CodeTemplate {
-      get { return Templates.CompiledMultiObjectiveOptimizationSupport; }
-    }
-
     [StorableConstructor]
     private MultiObjectiveOptimizationSupportScript(bool deserializing) : base(deserializing) { }
     private MultiObjectiveOptimizationSupportScript(MultiObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { }
-    public MultiObjectiveOptimizationSupportScript() : base() { }
+    public MultiObjectiveOptimizationSupportScript() : base(Templates.CompiledMultiObjectiveOptimizationSupport) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

stable/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/OptimizationSupportScript.cs

@@ -46 +46 @@
     protected OptimizationSupportScript()
       : base() {
+      variableStore = new VariableStore();
+    }
+
+    protected OptimizationSupportScript(string code)
+      : base(code) {
       variableStore = new VariableStore();
     }

stable/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs

@@ -31 +31 @@
   [StorableClass]
   public sealed class SingleObjectiveOptimizationSupportScript : OptimizationSupportScript<ISingleObjectiveOptimizationSupport>, ISingleObjectiveOptimizationSupport {
-
-    protected override string CodeTemplate {
-      get { return Templates.CompiledSingleObjectiveOptimizationSupport; }
-    }
-
     [StorableConstructor]
     private SingleObjectiveOptimizationSupportScript(bool deserializing) : base(deserializing) { }
     private SingleObjectiveOptimizationSupportScript(SingleObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveOptimizationSupportScript() : base() { }
+    public SingleObjectiveOptimizationSupportScript() : base(Templates.CompiledSingleObjectiveOptimizationSupport) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

stable/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs

@@ -31 +31 @@
     public string Filename { get; set; }
 
-    protected override string CodeTemplate {
-      get { return ScriptTemplates.CompiledMultiObjectiveProblemDefinition; }
-    }
-
     private new IMultiObjectiveProblemDefinition CompiledProblemDefinition {
       get { return (IMultiObjectiveProblemDefinition)base.CompiledProblemDefinition; }
@@ -41 +37 @@
     [StorableConstructor]
     private MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
-    private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner)
-      : base(original, cloner) { }
-
-    public MultiObjectiveProblemDefinitionScript() {
-      Code = CodeTemplate;
-    }
+    private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
+    public MultiObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledMultiObjectiveProblemDefinition) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

stable/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

@@ -53 +53 @@
     protected ProblemDefinitionScript()
       : base() {
+      variableStore = new VariableStore();
+    }
+    protected ProblemDefinitionScript(string code)
+      : base(code) {
       variableStore = new VariableStore();
     }

stable/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs

@@ -32 +32 @@
     public string Filename { get; set; }
 
-    protected override string CodeTemplate {
-      get { return ScriptTemplates.CompiledSingleObjectiveProblemDefinition; }
-    }
-
     private new ISingleObjectiveProblemDefinition CompiledProblemDefinition {
       get { return (ISingleObjectiveProblemDefinition)base.CompiledProblemDefinition; }
@@ -43 +39 @@
     private SingleObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     private SingleObjectiveProblemDefinitionScript(SingleObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveProblemDefinitionScript()
-      : base() {
-      Code = CodeTemplate;
-    }
+    public SingleObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledSingleObjectiveProblemDefinition) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

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

@@ -20 +20 @@
 #endregion
 
-using System.Windows.Forms;
 
 namespace HeuristicLab.Scripting.Views {
@@ -47 +46 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
-      this.startStopButton = new System.Windows.Forms.Button();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.variableStoreView = new HeuristicLab.Scripting.Views.VariableStoreView();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.infoTabControl.SuspendLayout();
+      this.outputTabPage.SuspendLayout();
+      this.errorListTabPage.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+      this.splitContainer1.Panel1.SuspendLayout();
+      this.splitContainer1.Panel2.SuspendLayout();
+      this.splitContainer1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
@@ -59 +63 @@
       this.SuspendLayout();
       // 
-      // nameTextBox
+      // executionTimeLabel
       // 
-      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Location = new System.Drawing.Point(60, 0);
-      this.nameTextBox.Size = new System.Drawing.Size(750, 20);
+      this.executionTimeLabel.Location = new System.Drawing.Point(409, 3);
       // 
-      // infoLabel
+      // executionTimeTextBox
       // 
-      this.infoLabel.Location = new System.Drawing.Point(816, 4);
+      this.executionTimeTextBox.Location = new System.Drawing.Point(498, 0);
       // 
-      // startStopButton
+      // infoTabControl
       // 
-      this.startStopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
-      this.startStopButton.Location = new System.Drawing.Point(36, 26);
-      this.startStopButton.Name = "startStopButton";
-      this.startStopButton.Size = new System.Drawing.Size(24, 24);
-      this.startStopButton.TabIndex = 1;
-      this.startStopButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-      this.toolTip.SetToolTip(this.startStopButton, "Run (F5)");
-      this.startStopButton.UseVisualStyleBackColor = true;
-      this.startStopButton.Click += new System.EventHandler(this.StartStopButtonOnClick);
+      this.infoTabControl.Size = new System.Drawing.Size(637, 110);
+      // 
+      // splitContainer1
+      // 
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+      this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer1.Size = new System.Drawing.Size(637, 543);
+      this.splitContainer1.SplitterDistance = 427;
       // 
       // splitContainer2
@@ -101 +102 @@
       this.splitContainer2.SplitterDistance = 637;
       this.splitContainer2.TabIndex = 7;
-      //
-      // splitContainer1
-      //
-      this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-      this.splitContainer1.Dock = DockStyle.Fill;
       // 
       // variableStoreView
@@ -132 +128 @@
       this.viewHost.ViewType = null;
       // 
-      // ScriptView
+      // CSharpScriptView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.splitContainer2);
-      this.Controls.Add(this.startStopButton);
-      this.Name = "ScriptView";
-      this.Size = new System.Drawing.Size(835, 602);
+      this.Name = "CSharpScriptView";
+      this.Controls.SetChildIndex(this.infoTextLabel, 0);
+      this.Controls.SetChildIndex(this.compileButton, 0);
       this.Controls.SetChildIndex(this.startStopButton, 0);
       this.Controls.SetChildIndex(this.splitContainer2, 0);
@@ -144 +140 @@
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
+      this.infoTabControl.ResumeLayout(false);
+      this.outputTabPage.ResumeLayout(false);
+      this.outputTabPage.PerformLayout();
+      this.errorListTabPage.ResumeLayout(false);
+      this.splitContainer1.Panel1.ResumeLayout(false);
+      this.splitContainer1.Panel2.ResumeLayout(false);
+      this.splitContainer1.Panel2.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+      this.splitContainer1.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.splitContainer2.Panel1.ResumeLayout(false);
       this.splitContainer2.Panel2.ResumeLayout(false);
@@ -155 +161 @@
     #endregion
 
-    protected System.Windows.Forms.Button startStopButton;
     protected System.Windows.Forms.SplitContainer splitContainer2;
     protected MainForm.WindowsForms.ViewHost viewHost;

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
   }
 }

stable/HeuristicLab.Scripting.Views/3.3/ExecutableScriptView.Designer.cs

@@ -37 +37 @@
       this.SuspendLayout();
       // 
-      // splitContainer1.Panel1
+      // splitContainer1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.executionTimeTextBox);
-      this.splitContainer1.Panel1.Controls.Add(this.executionTimeLabel);
-      this.splitContainer1.Panel1.Controls.SetChildIndex(this.executionTimeTextBox, 0);
-      this.splitContainer1.Panel1.Controls.SetChildIndex(this.executionTimeLabel, 0);
+      // 
+      // splitContainer1.Panel2
+      // 
+      this.splitContainer1.Panel2.Controls.Add(this.executionTimeLabel);
+      this.splitContainer1.Panel2.Controls.Add(this.executionTimeTextBox);
+      this.splitContainer1.Panel2.Controls.SetChildIndex(this.executionTimeTextBox, 0);
+      this.splitContainer1.Panel2.Controls.SetChildIndex(this.executionTimeLabel, 0);
       // 
       // nameTextBox
@@ -63 +66 @@
       // executionTimeLabel
       // 
-      this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.executionTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.executionTimeLabel.AutoSize = true;
-      this.executionTimeLabel.Location = new System.Drawing.Point(589, 396);
+      this.executionTimeLabel.Location = new System.Drawing.Point(604, 3);
       this.executionTimeLabel.Name = "executionTimeLabel";
       this.executionTimeLabel.Size = new System.Drawing.Size(83, 13);
@@ -73 +76 @@
       // executionTimeTextBox
       // 
-      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.executionTimeTextBox.Location = new System.Drawing.Point(678, 393);
+      this.executionTimeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.executionTimeTextBox.Location = new System.Drawing.Point(693, 0);
       this.executionTimeTextBox.Name = "executionTimeTextBox";
       this.executionTimeTextBox.ReadOnly = true;
@@ -98 +101 @@
       this.errorListTabPage.ResumeLayout(false);
       this.splitContainer1.Panel1.ResumeLayout(false);
-      this.splitContainer1.Panel1.PerformLayout();
       this.splitContainer1.Panel2.ResumeLayout(false);
+      this.splitContainer1.Panel2.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
       this.splitContainer1.ResumeLayout(false);

stable/HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj

@@ -97 +97 @@
     <Compile Include="CSharpScriptView.Designer.cs">
       <DependentUpon>CSharpScriptView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ExecutableScriptView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ExecutableScriptView.Designer.cs">
+      <DependentUpon>ExecutableScriptView.cs</DependentUpon>
     </Compile>
     <Compile Include="ScriptView.cs">

stable/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs

@@ -118 +118 @@
       // infoTabControl
       // 
+      this.infoTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.infoTabControl.Controls.Add(this.outputTabPage);
       this.infoTabControl.Controls.Add(this.errorListTabPage);
-      this.infoTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.infoTabControl.Location = new System.Drawing.Point(0, 0);
+      this.infoTabControl.Location = new System.Drawing.Point(0, 2);
       this.infoTabControl.Name = "infoTabControl";
       this.infoTabControl.SelectedIndex = 0;
-      this.infoTabControl.Size = new System.Drawing.Size(832, 112);
+      this.infoTabControl.Size = new System.Drawing.Size(832, 110);
       this.infoTabControl.TabIndex = 1;
       // 
@@ -133 +135 @@
       this.outputTabPage.Name = "outputTabPage";
       this.outputTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.outputTabPage.Size = new System.Drawing.Size(824, 86);
+      this.outputTabPage.Size = new System.Drawing.Size(824, 84);
       this.outputTabPage.TabIndex = 1;
       this.outputTabPage.Text = "Output";
@@ -147 +149 @@
       this.outputTextBox.ReadOnly = true;
       this.outputTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-      this.outputTextBox.Size = new System.Drawing.Size(818, 80);
+      this.outputTextBox.Size = new System.Drawing.Size(818, 78);
       this.outputTextBox.TabIndex = 0;
       this.outputTextBox.WordWrap = false;

stable/HeuristicLab.Scripting/3.3/ExecutableScript.cs

@@ -52 +52 @@
       executionTime = original.executionTime;
     }
-    public ExecutableScript()
+    protected ExecutableScript()
       : base() {
       executionTime = TimeSpan.Zero;
-      Code = CodeTemplate;
     }
-    public ExecutableScript(string code)
+    protected ExecutableScript(string code)
       : base(code) {
       executionTime = TimeSpan.Zero;
@@ -85 +84 @@
         timer.Elapsed -= timer_Elapsed;
         timer.Stop();
+        timer.Dispose();
         ExecutionTime += DateTime.UtcNow - lastUpdateTime;
         Running = false;

stable/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

@@ -92 +92 @@
   <ItemGroup>
     <Compile Include="CompilationException.cs" />
+    <Compile Include="ExecutableScript.cs" />
     <Compile Include="Scripts\CSharp\CSharpScript.cs" />
     <Compile Include="Scripts\Templates\CSharpScriptTemplate.cs" />

stable/HeuristicLab.Scripting/3.3/Script.cs

@@ -37 +37 @@
 namespace HeuristicLab.Scripting {
   [StorableClass]
-  public class Script : NamedItem, IProgrammableItem {
-    protected virtual string CodeTemplate {
-      get { return string.Empty; }
-    }
-
+  public abstract class Script : NamedItem, IProgrammableItem {
     #region Fields & Properties
     public static new Image StaticItemImage {
@@ -77 +73 @@
         compileErrors = new CompilerErrorCollection(original.compileErrors);
     }
-    public Script()
+    protected Script()
       : base("Script", "An empty script.") {
-      code = CodeTemplate;
     }
-    public Script(string code)
+    protected Script(string code)
       : this() {
       this.code = code;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Script(this, cloner);
     }
     #endregion
 
     #region Compilation
-    protected virtual CSharpCodeProvider CodeProvider {
-      get {
-        return new CSharpCodeProvider(
-          new Dictionary<string, string> {
-                {"CompilerVersion", "v4.0"}, // support C# 4.0 syntax
-              });
-      }
-    }
-
     protected virtual CompilerResults DoCompile() {
       var parameters = new CompilerParameters {
@@ -114 +96 @@
         .ToArray());
 
-      return CodeProvider.CompileAssemblyFromSource(parameters, code);
+      var codeProvider = new CSharpCodeProvider(
+        new Dictionary<string, string> {
+          { "CompilerVersion", "v4.0"} // support C# 4.0 syntax
+        });
+
+      return codeProvider.CompileAssemblyFromSource(parameters, code);
     }
 

stable/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Reflection;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +31 @@
   [Creatable(CreatableAttribute.Categories.Scripts, Priority = 100)]
   [StorableClass]
-  public class CSharpScript : Script, IStorableContent {
-    #region Constants
-    protected const string ExecuteMethodName = "Execute";
-    protected override string CodeTemplate { get { return ScriptTemplates.CSharpScriptTemplate; } }
-    #endregion
-
+  public class CSharpScript : ExecutableScript, IStorableContent {
     #region Fields & Properties
     private CSharpScriptBase compiledScript;
@@ -50 +44 @@
     #endregion
 
-    #region Construction & Initialization
+    #region Construction & Cloning
     [StorableConstructor]
     protected CSharpScript(bool deserializing) : base(deserializing) { }
@@ -57 +51 @@
       variableStore = cloner.Clone(original.variableStore);
     }
-    public CSharpScript() {
+    public CSharpScript()
+      : base(ScriptTemplates.CSharpScriptTemplate) {
       variableStore = new VariableStore();
-      Code = CodeTemplate;
     }
     public CSharpScript(string code)
@@ -82 +76 @@
 
     #region Compilation
-
     public override Assembly Compile() {
       DeregisterScriptEvents();
@@ -94 +87 @@
     #endregion
 
-    private Thread scriptThread;
-    public virtual void ExecuteAsync() {
+    protected override void ExecuteCode() {
       if (compiledScript == null) return;
-      scriptThread = new Thread(() => {
-        Exception ex = null;
-        try {
-          OnScriptExecutionStarted();
-          compiledScript.Execute(VariableStore);
-        }
-        catch (Exception e) {
-          ex = e;
-        }
-        finally {
-          scriptThread = null;
-          OnScriptExecutionFinished(ex);
-        }
-      });
-      scriptThread.SetApartmentState(ApartmentState.STA);
-      scriptThread.Start();
-    }
 
-    public virtual void Kill() {
-      if (scriptThread == null) return;
-      scriptThread.Abort();
+      compiledScript.Execute(VariableStore);
     }
 
     protected virtual void CompiledScriptOnConsoleOutputChanged(object sender, EventArgs<string> e) {
       OnConsoleOutputChanged(e.Value);
-    }
-
-    public event EventHandler ScriptExecutionStarted;
-    protected virtual void OnScriptExecutionStarted() {
-      var handler = ScriptExecutionStarted;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler<EventArgs<Exception>> ScriptExecutionFinished;
-    protected virtual void OnScriptExecutionFinished(Exception e) {
-      var handler = ScriptExecutionFinished;
-      if (handler != null) handler(this, new EventArgs<Exception>(e));
     }