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

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/OperatorGraph.cs (modified) (5 diffs)

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

@@ -76 +76 @@
     }
 
+    [StorableConstructor]
+    protected OperatorGraph(bool deserializing) : base(deserializing) { }
+    protected OperatorGraph(OperatorGraph original, Cloner cloner)
+      : base(original, cloner) {
+      operators = cloner.Clone(original.operators);
+      initialOperator = cloner.Clone(original.initialOperator);
+      visualizationInfo = cloner.Clone(original.visualizationInfo);
+      Initialize();
+    }
     /// <summary>
     /// Initializes a new instance of <see cref="OperatorGraph"/>.
@@ -85 +94 @@
       Initialize();
     }
-    [StorableConstructor]
-    protected OperatorGraph(bool deserializing) : base(deserializing) { }
 
     //mkommend: IMPORTANT DO NOT REMOVE THIS PRIVATE EVENT
@@ -93 +100 @@
     private void OnOperatorGraphDeserializationFinished() {
       EventHandler handler = DeserializationFinished;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
-    }
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
     private void Initialize() {
       RegisterOperatorsEvents();
@@ -110 +120 @@
     /// <returns>The cloned object as <see cref="OperatorGraph"/>.</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      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;
+      return new OperatorGraph(this, cloner);
     }
 
@@ -124 +129 @@
     /// </summary>
     protected virtual void OnInitialOperatorChanged() {
-      if (InitialOperatorChanged != null)
-        InitialOperatorChanged(this, EventArgs.Empty);
+      var handler = InitialOperatorChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }