Changeset 1419 for branches/New Persistence Exploration/Persistence/Persistence/Core/DeSerializer.cs

Timestamp:

03/25/09 17:16:32 (15 years ago)

Author:

epitzer

Message:

Implement persistence of storables as decomposer. (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/Core/DeSerializer.cs (modified) (5 diffs)

branches/New Persistence Exploration/Persistence/Persistence/Core/DeSerializer.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 
-namespace HeuristicLab.Persistence.Core {
-
+namespace HeuristicLab.Persistence.Core {  
 
   struct ParentReference { }
@@ -19 +18 @@
 
     public object Obj { get; private set; }
-    public readonly List<object> customValues;
+    public List<Tag> customValues;
 
     public CustomComposite(object obj) {
       Obj = obj;
-      customValues = new List<object>();
+      customValues = new List<Tag>();
     }
 
-    public void AddValue(object value) {
-      customValues.Add(value);
+    public void AddValue(string name, object value) {
+      customValues.Add(new Tag(name, value));
     }
 
-    public Setter GetSetter(string name) {
+    public Setter GetSetter(string name) {      
       int index = customValues.Count - 1;
-      return value => customValues[index] = value;
+      Tag t = customValues[index];      
+      return value => t.Value = value;
     }
   }
@@ -122 +122 @@
       if ( serializerMapping.ContainsKey(type) )
         decomposer = serializerMapping[type] as IDecomposer;      
-      if (decomposer != null) {
-        instance = new ParentReference();
+      if (decomposer != null) {        
+        instance = decomposer.CreateInstance(type);
+        if (instance == null)
+          instance = new ParentReference();
         parentStack.Push(new CustomComposite(instance));        
       } else {        
@@ -143 +145 @@
       if (decomposer != null) {
         CustomComposite customComposite = (CustomComposite)parentStack.Pop();
-        object deserializedObject =
-          decomposer.Compose(customComposite.customValues, type);
+        object deserializedObject =          
+          decomposer.Populate(customComposite.Obj, customComposite.customValues, type);
         if ( end.Id != null )
           id2obj[(int)end.Id] = deserializedObject;        
@@ -188 +190 @@
           ((StorableComposite)accessibleObject).SetValue(name, value);
         } else if (accessibleObject is CustomComposite) {
-          ((CustomComposite)accessibleObject).AddValue(value);
+          ((CustomComposite)accessibleObject).AddValue(name, value);
         }
       }