Changeset 11908 for stable

Timestamp:

02/05/15 10:58:54 (9 years ago)

Author:

jkarder

Message:

#2303: merged r11882 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting.Views/3.3/ScriptView.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/CompilationException.cs (copied) (copied from trunk/sources/HeuristicLab.Scripting/3.3/CompilationException.cs)
• HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (1 diff)

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

@@ -116 +116 @@
         outputTextBox.AppendText("Compilation succeeded.");
         return true;
-      } catch (InvalidOperationException) {
+      } catch (CompilationException) {
         if (Content.CompileErrors.HasErrors) {
           outputTextBox.AppendText("Compilation failed.");

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

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

stable/HeuristicLab.Scripting/3.3/Script.cs

@@ -127 +127 @@
             .AppendLine(error.ErrorText);
         }
-        throw new InvalidOperationException(string.Format("Compilation of \"{0}\" failed:{1}{2}",
+        throw new CompilationException(string.Format("Compilation of \"{0}\" failed:{1}{2}",
           Name, Environment.NewLine, sb.ToString()));
       } else {