Changeset 11787

Timestamp:

01/16/15 11:23:17 (10 years ago)

Author:

jkarder

Message:

#2262: refactored code template loading

Location:

trunk/sources/HeuristicLab.Scripting/3.3

Files:

• HeuristicLab.Scripting-3.3.csproj (modified) (2 diffs)
• Script.cs (modified) (1 diff)
• Scripts (added)
• Scripts/CSharp (added)
• Scripts/CSharp/CSharpScript.cs (moved) (moved from trunk/sources/HeuristicLab.Scripting/3.3/CSharpScript.cs) (1 diff)
• Scripts/CSharp/CSharpScriptBase.cs (moved) (moved from trunk/sources/HeuristicLab.Scripting/3.3/CSharpScriptBase.cs)
• Scripts/Templates (added)
• Scripts/Templates/CSharpScriptTemplate.cs (moved) (moved from trunk/sources/HeuristicLab.Scripting/3.3/CSharpScriptCode.cs) (1 diff)
• Scripts/Templates/ScriptTemplates.Designer.cs (added)
• Scripts/Templates/ScriptTemplates.resx (added)

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

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CSharpScript.cs" />
-    <EmbeddedResource Include="CSharpScriptCode.cs" />
+    <Compile Include="Scripts\CSharp\CSharpScript.cs" />
+    <Compile Include="Scripts\Templates\CSharpScriptTemplate.cs" />
+    <Compile Include="Scripts\Templates\ScriptTemplates.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>ScriptTemplates.resx</DependentUpon>
+    </Compile>
     <Compile Include="Variables.cs" />
     <Compile Include="VariableStore.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Script.cs" />
-    <Compile Include="CSharpScriptBase.cs" />
+    <Compile Include="Scripts\CSharp\CSharpScriptBase.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -137 +142 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Scripts\Templates\ScriptTemplates.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ScriptTemplates.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -157 +157 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-
-    #region Helpers
-    protected virtual string ReadCodeTemplate(string templateName) {
-      using (var stream = Assembly.GetAssembly(this.GetType()).GetManifestResourceStream(templateName))
-      using (var reader = new StreamReader(stream)) {
-        return reader.ReadToEnd();
-      }
-    }
-    #endregion
   }
 }

trunk/sources/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -35 +35 @@
     #region Constants
     protected const string ExecuteMethodName = "Execute";
-    protected override string CodeTemplate { get { return ReadCodeTemplate("HeuristicLab.Scripting.CSharpScriptCode.cs"); } }
+    protected override string CodeTemplate { get { return ScriptTemplates.CSharpScriptTemplate; } }
     #endregion
 

trunk/sources/HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs

@@ -9 +9 @@
 using System.Linq;
 using System.Collections.Generic;
+
+using HeuristicLab.Core;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
+//using HeuristicLab.Collections;
+//using HeuristicLab.Data;
 
 public class MyScript : HeuristicLab.Scripting.CSharpScriptBase {