Changeset 4668 for branches/CloningRefactoring/HeuristicLab.Core/3.3/NamedItem.cs

Timestamp:

10/29/10 17:38:42 (13 years ago)

Author:

swagner

Message:

Finished cloning refactoring of HeuristicLab.Common, HeuristicLab.Collections and HeuristicLab.Core (#922)

File:

• branches/CloningRefactoring/HeuristicLab.Core/3.3/NamedItem.cs (modified) (5 diffs)

branches/CloningRefactoring/HeuristicLab.Core/3.3/NamedItem.cs

@@ -66 +66 @@
     }
 
+    [StorableConstructor]
+    protected NamedItem(bool deserializing) : base(deserializing) { }
+    protected NamedItem(NamedItem original, Cloner cloner)
+      : base(original, cloner) {
+      name = original.name;
+      description = original.description;
+    }
     /// <summary>
     /// Initializes a new instance of <see cref="Variable"/> with name <c>Anonymous</c> 
@@ -91 +98 @@
       else this.description = description;
     }
-    [StorableConstructor]
-    protected NamedItem(bool deserializing) : base(deserializing) { }
-
-    /// <summary>
-    /// Clones the current instance (deep clone).
-    /// </summary>
-    /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
-    /// <returns>The cloned object as <see cref="Variable"/>.</returns>
-    public override IDeepCloneable Clone(Cloner cloner) {
-      NamedItem clone = (NamedItem)base.Clone(cloner);
-      clone.name = name;
-      clone.description = description;
-      return clone;
-    }
 
     /// <summary>
@@ -121 +114 @@
     /// <param name="e">The event arguments of the changing.</param>
     protected virtual void OnNameChanging(CancelEventArgs<string> e) {
-      if (NameChanging != null)
-        NameChanging(this, e);
+      var handler = NameChanging;
+      if (handler != null) handler(this, e);
     }
     /// <inheritdoc/>
@@ -131 +124 @@
     /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
     protected virtual void OnNameChanged() {
-      if (NameChanged != null)
-        NameChanged(this, EventArgs.Empty);
+      var handler = NameChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
       OnToStringChanged();
     }
@@ -142 +135 @@
     /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
     protected virtual void OnDescriptionChanged() {
-      if (DescriptionChanged != null)
-        DescriptionChanged(this, EventArgs.Empty);
+      var handler = DescriptionChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }
   }