Changeset 4668 for branches/CloningRefactoring/HeuristicLab.Core/3.3/Scope.cs

Timestamp:

10/29/10 17:38:42 (14 years ago)

Author:

swagner

Message:

Finished cloning refactoring of HeuristicLab.Common, HeuristicLab.Collections and HeuristicLab.Core (#922)

File:

• branches/CloningRefactoring/HeuristicLab.Core/3.3/Scope.cs (modified) (5 diffs)

branches/CloningRefactoring/HeuristicLab.Core/3.3/Scope.cs

@@ -59 +59 @@
     }
 
+    [StorableConstructor]
+    private Scope(bool deserializing) : base(deserializing) { }
+    private Scope(Scope original, Cloner cloner)
+      : base(original, cloner) {
+      if (original.variables.Count > 0) variables = cloner.Clone(original.variables);
+      if (original.subScopes.Count > 0) {
+        subScopes = cloner.Clone(original.subScopes);
+        foreach (IScope child in SubScopes)
+          child.Parent = this;
+        RegisterSubScopesEvents();
+      }
+    }
     /// <summary>
     /// Initializes a new instance of <see cref="Scope"/> having "Anonymous" as default name.
@@ -67 +79 @@
       variables = new VariableCollection();
       subScopes = new ScopeList();
-      Initialize();
+      RegisterSubScopesEvents();
     }
     /// <summary>
@@ -78 +90 @@
       variables = new VariableCollection();
       subScopes = new ScopeList();
-      Initialize();
+      RegisterSubScopesEvents();
     }
     public Scope(string name, string description)
@@ -85 +97 @@
       variables = new VariableCollection();
       subScopes = new ScopeList();
-      Initialize();
+      RegisterSubScopesEvents();
     }
-    [StorableConstructor]
-    private Scope(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
-    private void Initialize() {
+    private void AfterDeserialization() {
       RegisterSubScopesEvents();
     }
@@ -103 +113 @@
     /// <inheritdoc/>
     public override IDeepCloneable Clone(Cloner cloner) {
-      Scope clone = new Scope();
-      cloner.RegisterClonedObject(this, clone);
-      clone.name = name;
-      clone.description = description;
-      if (variables.Count > 0) clone.variables = (VariableCollection)cloner.Clone(variables);
-      if (subScopes.Count > 0) {
-        clone.subScopes = (ScopeList)cloner.Clone(subScopes);
-        foreach (IScope child in clone.SubScopes)
-          child.Parent = clone;
-        clone.Initialize();
-      }
-      return clone;
+      return new Scope(this, cloner);
     }