Changeset 1708 for trunk

Timestamp:

04/29/09 18:03:17 (16 years ago)

Author:

epitzer

Message:

Include event registration in deserialization of VariableInjector. (#603)

File:

• trunk/sources/HeuristicLab.Operators/3.3/VariableInjector.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators/3.3/VariableInjector.cs

@@ -33 +33 @@
   public class VariableInjector : OperatorBase {
 
-    [Storable]
-    private Dictionary<IVariable, IVariableInfo> variableVariableInfoTable;
-
-    [Storable]
+    private Dictionary<IVariable, IVariableInfo> variableVariableInfoTable;    
     private Dictionary<IVariableInfo, IVariable> variableInfoVariableTable;
 
@@ -114 +111 @@
     }
 
+    [Storable]
+    private KeyValuePair<Dictionary<IVariableInfo, IVariable>, Dictionary<IVariable, IVariableInfo>> MappingPersistence {
+      get {
+        return new KeyValuePair<Dictionary<IVariableInfo, IVariable>, Dictionary<IVariable, IVariableInfo>>(
+          variableInfoVariableTable, variableVariableInfoTable);
+      }
+      set {
+        variableInfoVariableTable = value.Key;
+        variableVariableInfoTable = value.Value;
+        foreach (var pair in variableInfoVariableTable) {
+          pair.Key.ActualNameChanged += new EventHandler(VariableInfo_ActualNameChanged);
+          pair.Value.NameChanged += new EventHandler(Variable_NameChanged);          
+        }
+      }
+    }
+
     private void CreateVariableInfo(IVariable variable) {
       IVariableInfo info = new VariableInfo(Guid.NewGuid().ToString(), "Injected variable", variable.Value.GetType(), VariableKind.New);