Changeset 12944 for branches/OptimizationNetworks

Timestamp:

09/07/15 11:42:17 (9 years ago)

Author:

jkarder

Message:

#2205: added code resources

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3

Files:

• CodeResources.Designer.cs (added)
• CodeResources.resx (added)
• HeuristicLab.Networks-3.3.csproj (modified) (4 diffs)
• KSPTSPConcurrentControlNetwork.cs (modified) (1 diff)
• KSPTSPConnector.cs (modified) (1 diff)
• KSPTSPControl.cs (modified) (1 diff)
• KSPTSPNetwork.cs (modified) (1 diff)
• Programmable/ProgrammableNetwork.cs (modified) (1 diff)
• Programmable/ProgrammableNetworkItem.cs (modified) (2 diffs)
• Programmable/ProgrammableNode.cs (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/HeuristicLab.Networks-3.3.csproj

@@ -205 +205 @@
   <ItemGroup>
     <Compile Include="AlgorithmNode.cs" />
+    <Compile Include="CodeResources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>CodeResources.resx</DependentUpon>
+    </Compile>
     <Compile Include="ConfigurationPort.cs" />
     <Compile Include="ExecutionPort.cs" />
@@ -214 +219 @@
     <Compile Include="IExecutionPort.cs" />
     <Compile Include="IUserDefinedMessagePort.cs" />
-    <EmbeddedResource Include="KSPTSPConnectorCode.cs" />
+    <EmbeddedResource Include="CodeResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>CodeResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <Compile Include="KSPTSPConnectorCode.cs" />
     <Compile Include="KSPTSPConcurrentControlNetwork.cs" />
     <Compile Include="KSPTSPConnector.cs">
@@ -220 +229 @@
     </Compile>
     <Compile Include="KSPTSPControl.cs" />
-    <EmbeddedResource Include="KSPTSPControlCode.cs" />
+    <Compile Include="KSPTSPControlCode.cs" />
     <Compile Include="KSPTSPNetwork.cs" />
-    <EmbeddedResource Include="KSPTSPNetworkCode.cs" />
-    <EmbeddedResource Include="KSPTSPConcurrentControlNetworkCode.cs" />
+    <Compile Include="KSPTSPNetworkCode.cs" />
+    <Compile Include="KSPTSPConcurrentControlNetworkCode.cs" />
     <Compile Include="Core\IConnectablePort.cs" />
     <Compile Include="Core\IMessage.cs" />
@@ -258 +267 @@
     <Compile Include="Programmable\IUserDefinedNode.cs" />
     <Compile Include="Programmable\ProgrammableNetwork.cs" />
-    <EmbeddedResource Include="Programmable\ProgrammableNetworkCode.cs" />
+    <Compile Include="Programmable\ProgrammableNetworkCode.cs" />
     <Compile Include="Programmable\ProgrammableNetworkItem.cs" />
-    <EmbeddedResource Include="Programmable\ProgrammableNetworkItemCode.cs" />
+    <Compile Include="Programmable\ProgrammableNetworkItemCode.cs" />
     <Compile Include="Programmable\ProgrammableNode.cs" />
-    <EmbeddedResource Include="Programmable\ProgrammableNodeCode.cs" />
+    <Compile Include="Programmable\ProgrammableNodeCode.cs" />
     <Compile Include="Programmable\UserDefinedNetwork.cs" />
     <Compile Include="Programmable\UserDefinedNode.cs" />

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPConcurrentControlNetwork.cs

@@ -36 +36 @@
 
     protected override string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPConcurrentControlNetworkCode.cs"); }
+      get { return CodeResources.KSPTSPConcurrentControlNetworkCode; }
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPConnector.cs

@@ -30 +30 @@
   public class KSPTSPConnector : ProgrammableNode {
     protected override string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPConnectorCode.cs"); }
+      get { return CodeResources.KSPTSPConnectorCode; }
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPControl.cs

@@ -58 +58 @@
 
     protected override string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPControlCode.cs"); }
+      get { return CodeResources.KSPTSPControlCode; }
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/KSPTSPNetwork.cs

@@ -31 +31 @@
   public class KSPTSPNetwork : ProgrammableNetwork {
     protected override string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPNetworkCode.cs"); }
+      get { return CodeResources.KSPTSPNetworkCode; }
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetwork.cs

@@ -56 +56 @@
 
     protected override string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.Programmable.ProgrammableNetworkCode.cs"); }
+      get { return CodeResources.ProgrammableNetworkCode; }
     }
 

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItem.cs

@@ -101 +101 @@
 
     protected virtual string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.Programmable.ProgrammableNetworkItemCode.cs"); }
+      get { return CodeResources.ProgrammableNetworkItemCode; }
     }
     [Storable]
@@ -397 +397 @@
     }
     #endregion
-
-    #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
   }
 }

branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNode.cs

@@ -61 +61 @@
 
     protected override string CodeTemplate {
-      get { return ReadCodeTemplate("HeuristicLab.Networks.Programmable.ProgrammableNodeCode.cs"); }
+      get { return CodeResources.ProgrammableNodeCode; }
     }