Changeset 1553 for trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/StorableDecomposer.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/StorableDecomposer.cs (modified) (3 diffs)

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

@@ -17 +17 @@
         EmptyStorableClassAttribute.IsEmpyStorable(type);
 
-    }    
+    }
+
+    public IEnumerable<Tag> CreateMetaInfo(object o) {
+      return new Tag[] { };
+    }
 
     public IEnumerable<Tag> Decompose(object obj) {
@@ -25 +29 @@
     }
 
-    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> objects, Type type) {           
+    public void Populate(object instance, IEnumerable<Tag> objects, Type type) {           
       var memberDict = new Dictionary<string, Tag>();      
       IEnumerator<Tag> iter = objects.GetEnumerator();      
@@ -37 +41 @@
       foreach (var mapping in StorableAttribute.GetAutostorableAccessors(instance)) {
         if (memberDict.ContainsKey(mapping.Key)) {
-          memberDict[mapping.Key].SafeSet(mapping.Value.Set);
+          mapping.Value.Set(memberDict[mapping.Key].Value);          
         } else if (mapping.Value.DefaultValue != null) {
           mapping.Value.Set(mapping.Value.DefaultValue);
         }
       }
-      return instance;
     }
-
   }
 }