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

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/ExecutionContext.cs (modified) (2 diffs)

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

@@ -50 +50 @@
     }
 
+    [StorableConstructor]
+    private ExecutionContext(bool deserializing) { }
+    private ExecutionContext(ExecutionContext original, Cloner cloner)
+      : base(original, cloner) {
+      parent = cloner.Clone(original.parent);
+      parameterizedItem = cloner.Clone(original.parameterizedItem);
+      scope = cloner.Clone(original.scope);
+    }
     private ExecutionContext() {
       parent = null;
@@ -63 +71 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ExecutionContext clone = new ExecutionContext();
-      cloner.RegisterClonedObject(this, clone);
-      clone.parent = (IExecutionContext)cloner.Clone(parent);
-      clone.parameterizedItem = (IParameterizedItem)cloner.Clone(parameterizedItem);
-      clone.scope = (IScope)cloner.Clone(scope);
-      return clone;
+      return new ExecutionContext(this, cloner);
     }