Changeset 1553 for trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/KeyValuePairDecomposer.cs

Timestamp:

04/14/09 13:23:08 (15 years ago)

Author:

epitzer

Message:

Replace final fixes for broken parent references with separation of instance creation with meta information. (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/KeyValuePairDecomposer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/KeyValuePairDecomposer.cs

@@ -21 +21 @@
     }
 
-    public IEnumerable<Tag> Decompose(object o) {      
+    public IEnumerable<Tag> CreateMetaInfo(object o) {
+      return new Tag[] { };
+    }
+
+    public IEnumerable<Tag> Decompose(object o) {
       Type t = o.GetType();
       yield return new Tag("key", t.GetProperty("Key").GetValue(o, null));
@@ -27 +31 @@
     }
 
-    public object CreateInstance(Type type) {
+    public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
       return Activator.CreateInstance(type, true);
     }
 
-    public object Populate(object instance, IEnumerable<Tag> o, Type t) {
+    public void Populate(object instance, IEnumerable<Tag> o, Type t) {
       IEnumerator<Tag> iter = o.GetEnumerator();
+      iter.MoveNext();      
+      t.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+        .Single(fi => fi.Name == "key").SetValue(instance, iter.Current.Value);
       iter.MoveNext();
-      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();
-      iter.Current.SafeSet(value => valueFieldInfo.SetValue(instance, value));
-      return instance;
-    }    
+      t.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+        .Single(fi => fi.Name == "value").SetValue(instance, iter.Current.Value);      
+    }
   }
-
 }