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

trunk/sources/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -45 +45 @@
     }
 
+    [StorableConstructor]
+    protected ParameterizedNamedItem(bool deserializing) : base(deserializing) { }
+    protected ParameterizedNamedItem(ParameterizedNamedItem original, Cloner cloner)
+      : base(original, cloner) {
+      parameters = cloner.Clone(original.parameters);
+      readOnlyParameters = null;
+    }
     protected ParameterizedNamedItem()
       : base() {
@@ -74 +81 @@
       readOnlyParameters = null;
     }
-    [StorableConstructor]
-    protected ParameterizedNamedItem(bool deserializing) : base(deserializing) { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      ParameterizedNamedItem clone = (ParameterizedNamedItem)base.Clone(cloner);
-      clone.parameters = (ParameterCollection)cloner.Clone(parameters);
-      clone.readOnlyParameters = null;
-      return clone;
-    }
 
     public virtual void CollectParameterValues(IDictionary<string, IItem> values) {