Changeset 3317 for trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

Timestamp:

04/13/10 06:41:56 (14 years ago)

Author:

swagner

Message:

Implemented ReadOnlyView property for items (#969).

File:

• trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core/3.3/OperatorGraph.cs

@@ -37 +37 @@
   [StorableClass]
   public class OperatorGraph : Item {
+    [Storable]
     private OperatorSet operators;
     /// <summary>
     /// Gets all operators of the current instance.
     /// </summary>
-    [Storable]
     public OperatorSet Operators {
       get { return operators; }
-      private set {
-        DeregisterOperatorsEvents();
-        operators = value;
-        RegisterOperatorsEvents();
-      }
     }
 
@@ -87 +82 @@
     /// </summary>
     public OperatorGraph() {
-      Operators = new OperatorSet();
+      operators = new OperatorSet();
       initialOperator = null;
       visualizationInfo = null;
+      Initialize();
+    }
+    [StorableConstructor]
+    protected OperatorGraph(bool deserializing) : base(deserializing) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      RegisterOperatorsEvents();
     }
 
@@ -100 +103 @@
     /// <returns>The cloned object as <see cref="OperatorGraph"/>.</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      OperatorGraph clone = new OperatorGraph();
-      cloner.RegisterClonedObject(this, clone);
-      clone.Operators = (OperatorSet)cloner.Clone(operators);
+      OperatorGraph clone = (OperatorGraph)base.Clone(cloner);
+      clone.operators = (OperatorSet)cloner.Clone(operators);
       clone.initialOperator = (IOperator)cloner.Clone(initialOperator);
       clone.visualizationInfo = cloner.Clone(visualizationInfo);
+      clone.Initialize();
       return clone;
     }
@@ -166 +169 @@
       }
     }
-    private void DeregisterOperatorsEvents() {
-      if (operators != null) {
-        foreach (IOperator op in operators) {
-          foreach (IParameter param in op.Parameters) {
-            IValueParameter<IOperator> opParam = param as IValueParameter<IOperator>;
-            if (opParam != null) DeregisterOperatorParameterEvents(opParam);
-          }
-          DeregisterOperatorEvents(op);
-        }
-        operators.ItemsAdded -= new CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsAdded);
-        operators.ItemsRemoved -= new CollectionItemsChangedEventHandler<IOperator>(Operators_ItemsRemoved);
-        operators.CollectionReset -= new CollectionItemsChangedEventHandler<IOperator>(Operators_CollectionReset);
-      }
-    }
     private void RegisterOperatorEvents(IOperator op) {
       op.Parameters.ItemsAdded += new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsAdded);