Changeset 4668 for branches/CloningRefactoring/HeuristicLab.Core/3.3/Variable.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/Variable.cs (modified) (4 diffs)

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

@@ -55 +55 @@
     }
 
+    [StorableConstructor]
+    private Variable(bool deserializing) : base(deserializing) { }
+    private Variable(Variable original, Cloner cloner)
+      : base(original, cloner) {
+      value = cloner.Clone(original.value);
+      RegisterValueEvents();
+    }
     /// <summary>
     /// Initializes a new instance of <see cref="Variable"/> with name <c>Anonymous</c> 
@@ -80 +87 @@
       : base(name) {
       this.value = value;
-      Initialize();
+      RegisterValueEvents();
     }
     public Variable(string name, string description, IItem value)
       : base(name, description) {
       this.value = value;
-      Initialize();
+      RegisterValueEvents();
     }
-    [StorableConstructor]
-    private Variable(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
-    private void Initialize() {
+    private void AfterDeserialization() {
       RegisterValueEvents();
     }
@@ -101 +106 @@
     /// <returns>The cloned object as <see cref="Variable"/>.</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      Variable clone = new Variable(Name, Description);
-      cloner.RegisterClonedObject(this, clone);
-      clone.value = (IItem)cloner.Clone(value);
-      clone.Initialize();
-      return clone;
+      return new Variable(this, cloner);
     }
 
@@ -125 +126 @@
     /// </summary>
     private void OnValueChanged() {
-      if (ValueChanged != null)
-        ValueChanged(this, EventArgs.Empty);
+      var handler = ValueChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
       OnItemImageChanged();
       OnToStringChanged();