Changeset 4682 for branches/CloningRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs

Timestamp:

10/29/10 19:47:39 (13 years ago)

Author:

mkommend

Message:

Refactored ExternalEvaluation.* and fixed some errors and warnings (ticket #922).

File:

• branches/CloningRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs (modified) (4 diffs)

branches/CloningRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs

@@ -50 +50 @@
     [StorableConstructor]
     protected SolutionMessageBuilder(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      AttachEventHandlers();
+    }
+
+    protected SolutionMessageBuilder(SolutionMessageBuilder original, Cloner cloner)
+      : base(original, cloner) {
+      convertersList = cloner.Clone(original.convertersList);
+      AttachEventHandlers();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SolutionMessageBuilder(this, cloner);
+    }
     public SolutionMessageBuilder()
       : base() {
@@ -63 +76 @@
 
       AttachEventHandlers();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      SolutionMessageBuilder clone = (SolutionMessageBuilder)base.Clone(cloner);
-      clone.convertersList = (CheckedItemList<IItemToSolutionMessageConverter>)cloner.Clone(convertersList);
-      clone.AttachEventHandlers();
-      return clone;
     }
 
@@ -87 +93 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
     private void AttachEventHandlers() {
       // BackwardsCompatibility3.3
       #region Backwards compatible code, remove with 3.4
-      #pragma warning disable 0612
+#pragma warning disable 0612
       if (converters != null) {
         if (convertersList == null) convertersList = new CheckedItemList<IItemToSolutionMessageConverter>();
@@ -99 +104 @@
         converters = null;
       }
-      #pragma warning restore 0612
+#pragma warning restore 0612
       #endregion
       convertersList.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);