Changeset 3385

Timestamp:

04/17/10 23:12:52 (14 years ago)

Author:

swagner

Message:

Added base class DeepCloneable again (#975)

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/DeepCloneable.cs (added)
• HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/ExecutionContext.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Item.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/OperationCollection.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj

@@ -89 +89 @@
     <None Include="HeuristicLabCommonPlugin.cs.frame" />
     <Compile Include="Cloner.cs" />
+    <Compile Include="DeepCloneable.cs" />
     <Compile Include="IContent.cs" />
     <Compile Include="IDeepCloneable.cs" />

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

@@ -27 +27 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  public sealed class ExecutionContext : IDeepCloneable, IExecutionContext, IAtomicOperation {
+  public sealed class ExecutionContext : DeepCloneable, IExecutionContext, IAtomicOperation {
     [Storable]
     private IParameterizedItem parameterizedItem;
@@ -63 +63 @@
     }
 
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-    public IDeepCloneable Clone(Cloner cloner) {
+    public override IDeepCloneable Clone(Cloner cloner) {
       ExecutionContext clone = new ExecutionContext();
       cloner.RegisterClonedObject(this, clone);

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

@@ -31 +31 @@
   [StorableClass]
   [Item("Item", "Base class for all HeuristicLab items.")]
-  public abstract class Item : IDeepCloneable, IItem {
+  public abstract class Item : DeepCloneable, IItem {
     public virtual string ItemName {
       get { return ItemAttribute.GetName(this.GetType()); }
@@ -61 +61 @@
     protected Item(bool deserializing) { }
 
-
-    /// <summary>
-    /// Creates a deep clone of this instance.
-    /// </summary>
-    /// <remarks>
-    /// This method is the entry point for creating a deep clone of a whole object graph.
-    /// </remarks>
-    /// <returns>A clone of this instance.</returns>
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-
     /// <summary>
     /// Clones the current instance (deep clone).
@@ -78 +66 @@
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="Variable"/>.</returns>
-    public virtual IDeepCloneable Clone(Cloner cloner) {
-      Item clone = (Item)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
+    public override IDeepCloneable Clone(Cloner cloner) {
+      Item clone = (Item)base.Clone(cloner);
       clone.readOnlyView = readOnlyView;
       return clone;

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

@@ -28 +28 @@
 namespace HeuristicLab.Core {
   [StorableClass]
-  public sealed class OperationCollection : IDeepCloneable, IList<IOperation>, IOperation {
+  public sealed class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
     [Storable]
     private IList<IOperation> operations;
@@ -52 +52 @@
     }
 
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-    public IDeepCloneable Clone(Cloner cloner) {
+    public override IDeepCloneable Clone(Cloner cloner) {
       OperationCollection clone = (OperationCollection)Activator.CreateInstance(this.GetType());
       cloner.RegisterClonedObject(this, clone);