Changeset 10506 for trunk/sources/HeuristicLab.HLScript

Timestamp:

02/25/14 13:55:01 (11 years ago)

Author:

jkarder

Message:

#2136: applied some of the changes suggested in comment:11:ticket:2136

• change namespaces to HeuristicLab.Scripting.*
• added extra compile button and registered F6 as a shortcut
• changed the order of the output window and the error list
• tabs (output window and error list) are selected automatically
• thrown exceptions are shown using the PluginInfrastructure
• removed namespace declaration in the script
• names in the VariableStore are now conform to C# property names

Location:

trunk/sources/HeuristicLab.HLScript/3.3

Files:

• HeuristicLab.Scripting-3.3.csproj (moved) (moved from trunk/sources/HeuristicLab.HLScript/3.3/HeuristicLab.HLScript-3.3.csproj) (1 diff)
• Plugin.cs.frame (modified) (3 diffs)
• Properties/AssemblyInfo.cs.frame (modified) (2 diffs)
• Script.cs (modified) (6 diffs)
• UserScriptBase.cs (modified) (2 diffs)
• VariableStore.cs (modified) (1 diff)

trunk/sources/HeuristicLab.HLScript/3.3/HeuristicLab.Scripting-3.3.csproj

@@ -8 +8 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HeuristicLab.HLScript</RootNamespace>
-    <AssemblyName>HeuristicLab.HLScript-3.3</AssemblyName>
+    <RootNamespace>HeuristicLab.Scripting</RootNamespace>
+    <AssemblyName>HeuristicLab.Scripting-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

trunk/sources/HeuristicLab.HLScript/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.HLScript {
-  [Plugin("HeuristicLab.HLScript", "3.3.9.$WCREV$")]
-  [PluginFile("HeuristicLab.HLScript-3.3.dll", PluginFileType.Assembly)]
+namespace HeuristicLab.Scripting {
+  [Plugin("HeuristicLab.Scripting", "3.3.9.$WCREV$")]
+  [PluginFile("HeuristicLab.Scripting-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")] 
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -30 +30 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  public class HeuristicLabHLScriptPlugin : PluginBase {
+  public class HeuristicLabScriptingPlugin : PluginBase {
   }
 }

trunk/sources/HeuristicLab.HLScript/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.HLScript")]
+[assembly: AssemblyTitle("HeuristicLab.Scripting")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

trunk/sources/HeuristicLab.HLScript/3.3/Script.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.CodeDom;
 using System.CodeDom.Compiler;
@@ -16 +37 @@
 using Microsoft.CSharp;
 
-namespace HeuristicLab.HLScript {
-  [Item("Script", "A HeuristicLab script.")]
+namespace HeuristicLab.Scripting {
+  [Item("Script", "An empty C# script.")]
   [Creatable("Scripts")]
   [StorableClass]
@@ -27 +48 @@
 
 using System;
-
-namespace UserScripts {
-  public class UserScript : HeuristicLab.HLScript.UserScriptBase {
-    public override void Main() {
-      // type your code here
-    }
-
-    // further classes and methods
-
+using System.Linq;
+using System.Collections.Generic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+
+public class UserScript : HeuristicLab.Scripting.UserScriptBase {
+  public override void Main() {
+    // type your code here
   }
+
+  // further classes and methods
+
 }";
     #endregion
@@ -126 +150 @@
         GenerateExecutable = false,
         GenerateInMemory = true,
-        IncludeDebugInformation = false
+        IncludeDebugInformation = true,
+        WarningLevel = 4
       };
       parameters.ReferencedAssemblies.AddRange(
@@ -212 +237 @@
       if (executeMethod != null) {
         scriptThread = new Thread(() => {
+          Exception ex = null;
           try {
             OnScriptExecutionStarted();
             executeMethod.Invoke(compiledScript, new[] { VariableStore });
+          } catch (ThreadAbortException) {
+            // the execution was cancelled by the user
+          } catch (TargetInvocationException e) {
+            ex = e.InnerException;
           } finally {
-            OnScriptExecutionFinished();
+            OnScriptExecutionFinished(ex);
           }
         });
@@ -250 +280 @@
     }
 
-    public event EventHandler ScriptExecutionFinished;
-    private void OnScriptExecutionFinished() {
+    public event EventHandler<EventArgs<Exception>> ScriptExecutionFinished;
+    private void OnScriptExecutionFinished(Exception e) {
       var handler = ScriptExecutionFinished;
-      if (handler != null) handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, new EventArgs<Exception>(e));
     }
 

trunk/sources/HeuristicLab.HLScript/3.3/UserScriptBase.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Dynamic;
 using System.IO;
 using System.Text;
-using System.Threading;
 using HeuristicLab.Common;
 
-namespace HeuristicLab.HLScript {
+namespace HeuristicLab.Scripting {
   public abstract class UserScriptBase {
     protected dynamic vars;
@@ -23 +43 @@
     private void Execute(VariableStore variableStore) {
       vars = new Variables(variableStore);
-      try {
-        Main();
-      } catch (ThreadAbortException) {
-      } catch (Exception e) {
-        Console.WriteLine("---");
-        Console.WriteLine(e);
-      }
+      Main();
     }
 

trunk/sources/HeuristicLab.HLScript/3.3/VariableStore.cs

@@ -1 @@
-using HeuristicLab.Collections;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.HLScript {
+namespace HeuristicLab.Scripting {
   [Item("VariableStore", "Represents a variable store.")]
   [StorableClass]