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

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

@@ -66 +66 @@
     #endregion
 
+    #region Storing & Cloning
+    [StorableConstructor]
+    private DataRow(bool deserializing) : base(deserializing) { }
+    private DataRow(DataRow original, Cloner cloner)
+      : base(original, cloner) {
+      this.VisualProperties = (DataRowVisualProperties)cloner.Clone(original.visualProperties);
+      this.values = new ObservableList<double>(original.values);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DataRow(this, cloner);
+    }
+    #endregion
     public DataRow()
       : base() {
@@ -86 +98 @@
       values = new ObservableList<double>();
     }
-    [StorableConstructor]
-    private DataRow(bool deserializing) { }
 
     // BackwardsCompatibility3.3
@@ -96 +106 @@
     }
     #endregion
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      DataRow clone = new DataRow(Name, Description);
-      cloner.RegisterClonedObject(this, clone);
-      clone.VisualProperties = (DataRowVisualProperties)cloner.Clone(visualProperties);
-      clone.values.AddRange(values);
-      return clone;
-    }
 
     public event EventHandler VisualPropertiesChanged;