Changeset 7351 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation

Timestamp:

01/17/12 23:54:58 (12 years ago)

Author:

abeham

Message:

#1722

• fixed some problems that were identified with the first existing FxCop rules (duplicate storable hook in ExternalEvaluationProblem, multiple wrong names)
• generally renamed AttachEventHandlers to RegisterEventHandlers to be consistent
• fixed some backwards compatible regions to use the format from the snippet and the comment

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3

Files:

• ExternalEvaluationProblem.cs (modified) (4 diffs)
• SolutionMessageBuilder.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs

@@ -127 +127 @@
     [StorableConstructor]
     private ExternalEvaluationProblem(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
-      AttachEventHandlers();
-    }
-
     private ExternalEvaluationProblem(ExternalEvaluationProblem original, Cloner cloner)
       : base(original, cloner) {
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -154 +149 @@
 
       InitializeOperators();
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     [StorableHook(HookType.AfterDeserialization)]
@@ -170 +165 @@
       }
       #endregion
+      RegisterEventHandlers();
     }
 
@@ -220 +216 @@
 
     #region Helper
-    private void AttachEventHandlers() {
+    private void RegisterEventHandlers() {
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs

@@ -52 +52 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      AttachEventHandlers();
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+#pragma warning disable 0612
+      if (converters != null) {
+        if (convertersList == null) convertersList = new CheckedItemList<IItemToSolutionMessageConverter>();
+        foreach (IItemToSolutionMessageConverter c in converters)
+          convertersList.Add(c);
+        converters.Clear();
+        converters = null;
+      }
+#pragma warning restore 0612
+      #endregion
+      RegisterEventHandlers();
     }
 
@@ -58 +70 @@
       : base(original, cloner) {
       convertersList = cloner.Clone(original.convertersList);
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -75 +87 @@
       convertersList.Add(new TimeSpanValueConverter());
 
-      AttachEventHandlers();
+      RegisterEventHandlers();
     }
 
@@ -93 +105 @@
     }
 
-    private void AttachEventHandlers() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-#pragma warning disable 0612
-      if (converters != null) {
-        if (convertersList == null) convertersList = new CheckedItemList<IItemToSolutionMessageConverter>();
-        foreach (IItemToSolutionMessageConverter c in converters)
-          convertersList.Add(c);
-        converters.Clear();
-        converters = null;
-      }
-#pragma warning restore 0612
-      #endregion
+    private void RegisterEventHandlers() {
       convertersList.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);
       convertersList.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IItemToSolutionMessageConverter>>(convertersList_Changed);