Changeset 4722 for trunk/sources/HeuristicLab.Analysis/3.3/DataTable.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.Analysis/3.3/DataTable.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/DataTable.cs

@@ -47 +47 @@
     }
 
+    #region Storing & Cloning
+    [StorableConstructor]
+    private DataTable(bool deserializing) : base(deserializing) { }
+    private DataTable(DataTable original, Cloner cloner)
+      : base(original, cloner) {
+      this.rows = cloner.Clone(original.rows);
+      this.RegisterRowsEvents();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DataTable(this, cloner);
+    }
+    #endregion
     public DataTable()
       : base() {
@@ -127 +139 @@
     private void Values_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<double>> e) {
       this.OnReset();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      DataTable clone = new DataTable(Name, Description);
-      cloner.RegisterClonedObject(this, clone);
-      clone.rows = (NamedItemCollection<DataRow>)cloner.Clone(rows);
-      return clone;
     }