Changeset 885 for branches/CloningRefactorBranch/HeuristicLab.Data/ConstrainedItemList.cs

Timestamp:

12/02/08 14:13:06 (15 years ago)

Author:

gkronber

Message:

Refactored cloning in HL.Core, HL.Data and HL.Constraints

#285 (Cloning could be improved by creating objects at the bottom of the cloning chain with 'new' instead of the top with Activator.CreateInstance())

File:

• branches/CloningRefactorBranch/HeuristicLab.Data/ConstrainedItemList.cs (modified) (4 diffs)

branches/CloningRefactorBranch/HeuristicLab.Data/ConstrainedItemList.cs

@@ -53 +53 @@
 
     /// <summary>
+    /// Copy constructor to create clones (deep).
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public ConstrainedItemList(ConstrainedItemList original) : this(original, new Dictionary<Guid, object>()) { }
+
+    /// <summary>
+    /// Copy constructor to create clones (deep) reusing already cloned object references.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    protected ConstrainedItemList(ConstrainedItemList original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      foreach (IConstraint constraint in original.Constraints)
+        this.AddConstraint((IConstraint)Auxiliary.Clone(constraint, clonedObjects));
+      this.suspendConstraintCheck = original.suspendConstraintCheck;
+      foreach (IItem item in original.list) {
+        this.list.Add((IItem)Auxiliary.Clone(item, clonedObjects));
+      }
+    }
+
+    /// <summary>
     /// Creates a new instance of <see cref="ConstrainedItemListView"/>.
     /// </summary>
@@ -64 +85 @@
     /// Clones the current instance.
     /// </summary>
-    /// <remarks>The elements of the current instance are cloned with the 
-    /// <see cref="HeuristicLab.Core.Auxiliary.Clone"/> method of the class <see cref="Auxiliary"/>.</remarks>
+    /// <remarks>The elements of the current instance are cloned with the copy constructor.</remarks>
     /// <param name="clonedObjects">A dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="ConstrainedItemList"/>.</returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ConstrainedItemList clone = new ConstrainedItemList();
-      clonedObjects.Add(Guid, clone);
-      foreach (IConstraint constraint in Constraints)
-        clone.AddConstraint((IConstraint)Auxiliary.Clone(constraint, clonedObjects));
-      clone.suspendConstraintCheck = suspendConstraintCheck;
-      foreach (IItem item in list) {
-        clone.list.Add((IItem)Auxiliary.Clone(item, clonedObjects));
-      }
-      return clone;
+      return new ConstrainedItemList(this, clonedObjects);
     }
 
@@ -94 +106 @@
     /// <param name="persistedObjects">A dictionary of all already persisted objects. (Needed to avoid cycles.)</param>
     /// <returns>The saved <see cref="XmlNode"/>.</returns>
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       XmlNode listNode = document.CreateNode(XmlNodeType.Element, "ListItems", null);
@@ -115 +127 @@
     /// <param name="node">The <see cref="XmlNode"/> where the int is saved.</param>
     /// <param name="restoredObjects">A dictionary of all already restored objects. (Needed to avoid cycles.)</param>
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
       XmlNode listNode = node.SelectSingleNode("ListItems");