Changeset 1434 for branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/KeyValuePairDecomposer.cs

Timestamp:

03/26/09 17:56:55 (15 years ago)

Author:

epitzer

Message:

Almost complete solution for correctly handling parent references. (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/KeyValuePairDecomposer.cs (modified) (3 diffs)

branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/KeyValuePairDecomposer.cs

@@ -5 +5 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Interfaces;
+using System.Reflection;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -23 +24 @@
 
     public object CreateInstance(Type type) {
-      return null;
+      return Activator.CreateInstance(type, true);
     }
 
@@ -29 +30 @@
       IEnumerator<Tag> iter = o.GetEnumerator();
       iter.MoveNext();
-      object key = iter.Current.Value;
+      FieldInfo keyFieldInfo =
+        t.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+        .Single((fi) => fi.Name == "key");
+      FieldInfo valueFieldInfo = 
+        t.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+        .Single((fi) => fi.Name == "value");
+      iter.Current.SafeSet((value) => keyFieldInfo.SetValue(instance, value));      
       iter.MoveNext();
-      object value = iter.Current.Value;
-      return Activator.CreateInstance(t, new object[] { key, value });      
+      iter.Current.SafeSet((value) => valueFieldInfo.SetValue(instance, value));
+      return instance;
     }    
   }