Changeset 4722 for trunk/sources/HeuristicLab.Core/3.3/Collections/ScopeList.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/Collections/ScopeList.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Collections/ScopeList.cs

@@ -29 +29 @@
   [Item("ScopeList", "Represents a list of scopes.")]
   public sealed class ScopeList : ItemList<IScope> {
+    [StorableConstructor]
+    private ScopeList(bool deserializing) : base(deserializing) { }
+    private ScopeList(ScopeList original, Cloner cloner)
+      : base(original, cloner) {
+      list = new List<IScope>(original.Select(x => cloner.Clone(x)));
+    }
     public ScopeList() : base() { }
     public ScopeList(int capacity) : base(capacity) { }
     public ScopeList(IEnumerable<IScope> collection) : base(collection) { }
-    [StorableConstructor]
-    private ScopeList(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ScopeList clone = new ScopeList();
-      cloner.RegisterClonedObject(this, clone);
-      clone.list = new List<IScope>(this.Select(x => (IScope)cloner.Clone(x)));
-      return clone;
+      return new ScopeList(this, cloner);
     }
   }