Changeset 2526 for trunk/sources/HeuristicLab.Logging/3.3

Timestamp:

11/23/09 16:43:34 (15 years ago)

Author:

swagner

Message:

Refactored cloning (#806)

Location:

trunk/sources/HeuristicLab.Logging/3.3

Files:

• Linechart.cs (modified) (1 diff)
• Log.cs (modified) (1 diff)
• PointXYChart.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Logging/3.3/Linechart.cs

@@ -85 +85 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
+    /// <remarks>Deep clone through <see cref="cloner.Clone"/> method of helper class 
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already clone objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="Linechart"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Linechart clone = (Linechart)base.Clone(clonedObjects);
-      clone.myNumberOfLines = (IntData)Auxiliary.Clone(myNumberOfLines, clonedObjects);
-      clone.myValues = (ItemList)Auxiliary.Clone(Values, clonedObjects);
+    public override IItem Clone(ICloner cloner) {
+      Linechart clone = (Linechart)base.Clone(cloner);
+      clone.myNumberOfLines = (IntData)cloner.Clone(myNumberOfLines);
+      clone.myValues = (ItemList)cloner.Clone(Values);
       return clone;
     }

trunk/sources/HeuristicLab.Logging/3.3/Log.cs

@@ -59 +59 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
+    /// <remarks>Deep clone through <see cref="cloner.Clone"/> method of helper class 
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already clone objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="Log"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Log clone = (Log)base.Clone(clonedObjects);
-      clone.myItems = (ItemList)Auxiliary.Clone(Items, clonedObjects);
+    public override IItem Clone(ICloner cloner) {
+      Log clone = (Log)base.Clone(cloner);
+      clone.myItems = (ItemList)cloner.Clone(Items);
       return clone;
     }

trunk/sources/HeuristicLab.Logging/3.3/PointXYChart.cs

@@ -87 +87 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
+    /// <remarks>Deep clone through <see cref="cloner.Clone"/> method of helper class 
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already clone objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="PointXYChart"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      PointXYChart clone = (PointXYChart)base.Clone(clonedObjects);
-      clone.myValues = (ItemList)Auxiliary.Clone(Values, clonedObjects);
+    public override IItem Clone(ICloner cloner) {
+      PointXYChart clone = (PointXYChart)base.Clone(cloner);
+      clone.myValues = (ItemList)cloner.Clone(Values);
       return clone;
     }