Changeset 11529 for branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views

Timestamp:

11/10/14 02:34:58 (9 years ago)

Author:

swagner

Message:

#2205: Implemented review comments

• made Node and Network abstract
• renamed GenericNode to UserDefinedNode and sealed it
• added sealed UserDefinedNetwork
• made Nodes in Network not changeable by default
• made Parameters in ParameterizedPort not changeable by default
• removed value None in PortParameterType
• refactored call algorithm.PrepareMessage() in AlgorithmNode

Location:

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3

Files:

• Core.Networks.Views/GenericPortView.cs (modified) (1 diff)
• Core.Networks.Views/UserDefinedNetworkView.Designer.cs (added)
• Core.Networks.Views/UserDefinedNetworkView.cs (added)
• Core.Networks.Views/UserDefinedNodeView.Designer.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/GenericNodeView.Designer.cs) (1 diff)
• Core.Networks.Views/UserDefinedNodeView.cs (moved) (moved from branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/GenericNodeView.cs) (1 diff)
• HeuristicLab.Optimization.Networks.Views-3.3.csproj (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/GenericPortView.cs

@@ -66 +66 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      portParameterCollectionView.Content = Content == null ? null : Content.Parameters;
       connectedPortView.Content = Content == null ? null : Content.ConnectedPort;
       portParameterCollectionView.Content = Content == null ? null : Content.Parameters;

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/UserDefinedNodeView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Core.Networks.Views {
-  partial class GenericNodeView {
+  partial class UserDefinedNodeView {
     /// <summary>
     /// Required designer variable.

branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/Core.Networks.Views/UserDefinedNodeView.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Core.Networks.Views {
-  [View("GenericNode View")]
-  [Content(typeof(GenericNode), true)]
-  [Content(typeof(IGenericNode), false)]
-  public partial class GenericNodeView : NodeView {
-    public new IGenericNode Content {
-      get { return (IGenericNode)base.Content; }
+  [View("UserDefinedNode View")]
+  [Content(typeof(UserDefinedNode), true)]
+  [Content(typeof(IUserDefinedNode), false)]
+  public partial class UserDefinedNodeView : NodeView {
+    public new IUserDefinedNode Content {
+      get { return (IUserDefinedNode)base.Content; }
       set { base.Content = value; }
     }
 
-    public GenericNodeView() {
+    public UserDefinedNodeView() {
       InitializeComponent();
     }

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

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Core.Networks.Views\GenericNodeView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Core.Networks.Views\GenericNodeView.Designer.cs">
-      <DependentUpon>GenericNodeView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Core.Networks.Views\GenericPortView.cs">
       <SubType>UserControl</SubType>
@@ -192 +186 @@
     <Compile Include="Core.Networks.Views\PortView.Designer.cs">
       <DependentUpon>PortView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Core.Networks.Views\UserDefinedNetworkView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Core.Networks.Views\UserDefinedNetworkView.Designer.cs">
+      <DependentUpon>UserDefinedNetworkView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Core.Networks.Views\UserDefinedNodeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Core.Networks.Views\UserDefinedNodeView.Designer.cs">
+      <DependentUpon>UserDefinedNodeView.cs</DependentUpon>
     </Compile>
     <Compile Include="Operators.Views\HookOperatorView.cs">