Changeset 11712 for branches/OptimizationNetworks/HeuristicLab.Networks

Timestamp:

12/22/14 02:20:11 (10 years ago)

Author:

swagner

Message:

#2205: Implemented review comments:

• checked and adapted item images

Location:

branches/OptimizationNetworks/HeuristicLab.Networks/3.3

Files:

• KSPTSPConnector.cs (modified) (2 diffs)
• KSPTSPConnectorCode.cs (modified) (2 diffs)
• KSPTSPNetwork.cs (modified) (2 diffs)
• KSPTSPNetworkCode.cs (modified) (2 diffs)
• Programmable/ProgrammableNetwork.cs (modified) (3 diffs)
• Programmable/ProgrammableNetworkItem.cs (modified) (2 diffs)
• Programmable/ProgrammableNode.cs (modified) (3 diffs)
• Programmable/UserDefinedNetwork.cs (modified) (2 diffs)
• Programmable/UserDefinedNode.cs (modified) (2 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Networks.Programmable;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Drawing;
 
 namespace HeuristicLab.Networks {
@@ -30 +29 @@
   [StorableClass]
   public class KSPTSPConnector : ProgrammableNode {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
-    }
-
     protected override string CodeTemplate {
       get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPConnectorCode.cs"); }

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

@@ -27 +27 @@
 using HeuristicLab.Networks.Programmable;
 using HeuristicLab.Problems.TravelingSalesman;
-using System.Drawing;
 using System.Linq;
 using System.Threading;
@@ -34 +33 @@
   [Item("KSPTSPConnector", "A node of an optimization network which connects a KSP and a TSP.")]
   public class CompiledKSPTSPConnector : ProgrammableNode.CompiledProgrammableNode {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
-    }
-
     protected CompiledKSPTSPConnector(CompiledKSPTSPConnector original, Cloner cloner) : base(original, cloner) { }
     public CompiledKSPTSPConnector(ProgrammableNode context)

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

@@ -24 +24 @@
 using HeuristicLab.Networks.Programmable;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Drawing;
 
 namespace HeuristicLab.Networks {
@@ -31 +30 @@
   [StorableClass]
   public class KSPTSPNetwork : ProgrammableNetwork {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
-    }
-
     protected override string CodeTemplate {
       get { return ReadCodeTemplate("HeuristicLab.Networks.KSPTSPNetworkCode.cs"); }

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

@@ -32 +32 @@
 using HeuristicLab.Problems.Knapsack;
 using HeuristicLab.Problems.TravelingSalesman;
-using System.Drawing;
 using System.Linq;
 
@@ -38 +37 @@
   [Item("KSPTSPNetwork", "An optimization network which connects a KSP and a TSP.")]
   public class CompiledKSPTSPNetwork : ProgrammableNetwork.CompiledProgrammableNetwork {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
-    }
-
     protected CompiledKSPTSPNetwork(CompiledKSPTSPNetwork original, Cloner cloner) : base(original, cloner) { }
     public CompiledKSPTSPNetwork(ProgrammableNetwork context)

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

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 
@@ -31 +32 @@
   [StorableClass]
   public abstract class ProgrammableNetwork : ProgrammableNode, IProgrammableNetwork, IStorableContent {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
+    }
+
     #region IStorableContent Members
     public string Filename { get; set; }
@@ -84 +89 @@
     [Item("CompiledProgrammableNetwork", "Abstract base class for compiled programmable networks.")]
     public abstract class CompiledProgrammableNetwork : CompiledProgrammableNode, INetwork {
+      public static new Image StaticItemImage {
+        get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
+      }
+
       #region Network Members
       public override IEnumerable<INetworkItem> Children {

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

@@ -40 +40 @@
   public abstract class ProgrammableNetworkItem : Item, IProgrammableNetworkItem {
     public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
     }
 
@@ -292 +292 @@
     public abstract class CompiledProgrammableNetworkItem : Item, INetworkItem {
       public static new Image StaticItemImage {
-        get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
+        get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
       }
 

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

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Threading;
@@ -32 +33 @@
   [StorableClass]
   public abstract class ProgrammableNode : ProgrammableNetworkItem, IProgrammableNode {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
+    }
+
     #region Node Members
     new public INetwork Parent {
@@ -89 +94 @@
     [Item("CompiledProgrammableNode", "Abstract base class for compiled programmable nodes of a network.")]
     public abstract class CompiledProgrammableNode : CompiledProgrammableNetworkItem, INode {
+      public static new Image StaticItemImage {
+        get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
+      }
+
       #region Node Members
       new public INetwork Parent {

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

@@ -24 +24 @@
 using HeuristicLab.Core.Networks;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Drawing;
 
 namespace HeuristicLab.Networks.Programmable {
@@ -30 +31 @@
   [StorableClass]
   public sealed class UserDefinedNetwork : ProgrammableNetwork, IUserDefinedNetwork {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
+    }
+
     new public PortCollection Ports {
       get { return base.Ports; }

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

@@ -24 +24 @@
 using HeuristicLab.Core.Networks;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Drawing;
 
 namespace HeuristicLab.Networks.Programmable {
@@ -29 +30 @@
   [StorableClass]
   public sealed class UserDefinedNode : ProgrammableNode, IUserDefinedNode {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Script; }
+    }
+
     new public PortCollection Ports {
       get { return base.Ports; }