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

Timestamp:

04/14/09 13:23:08 (16 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/DictionaryDecomposer.cs (modified) (4 diffs)

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

@@ -5 +5 @@
 using System.Collections.Generic;
 
-namespace HeuristicLab.Persistence.Default.Decomposers {
-
-  class DictionaryAdder {
-
-    bool keyIsSet, valueIsSet;
-    object key;
-    object value;
-    readonly IDictionary dict;
-
-    public DictionaryAdder(IDictionary dict) {
-      this.dict = dict;
-      keyIsSet = false;
-      valueIsSet = false;
-    }
-
-    public void SetKey(object v) {
-      key = v;
-      keyIsSet = true;
-      Check();
-    }
-
-    public void SetValue(object v) {
-      value = v;
-      valueIsSet = true;
-      Check();
-    }
-
-    private void Check() {
-      if ( keyIsSet && valueIsSet )
-        dict.Add(key, value);
-    }
-
-  }
+namespace HeuristicLab.Persistence.Default.Decomposers {  
   
   public class DictionaryDecomposer : IDecomposer {
@@ -50 +18 @@
     }
 
+    public IEnumerable<Tag> CreateMetaInfo(object o) {
+      return new Tag[] { };
+    }
+
     public IEnumerable<Tag> Decompose(object o) {
       IDictionary dict = (IDictionary)o;      
@@ -58 +30 @@
     }
 
-    public object CreateInstance(Type t) {
+    public object CreateInstance(Type t, IEnumerable<Tag> metaInfo) {
       return Activator.CreateInstance(t, true);
     }
 
-    public object Populate(object instance, IEnumerable<Tag> o, Type t) {
+    public void Populate(object instance, IEnumerable<Tag> o, Type t) {
       IDictionary dict = (IDictionary)instance;
       IEnumerator<Tag> iter = o.GetEnumerator();
@@ -69 +41 @@
         iter.MoveNext();
         Tag value = iter.Current;
-        DictionaryAdder da = new DictionaryAdder(dict);
-        key.SafeSet(da.SetKey);
-        value.SafeSet(da.SetValue);        
-      }
-      return dict;
+        dict.Add(key.Value, value.Value);
+      }      
     }
   }