Changeset 1336 for branches/New Persistence Exploration/Persistence

Timestamp:

03/12/09 16:40:17 (16 years ago)

Author:

epitzer

Message:

Initialize non-serialized values with specified default values. (#506)

Location:

branches/New Persistence Exploration/Persistence/Persistence

Files:

• DeSerializer.cs (modified) (3 diffs)
• Test/NewSerializationTest.cs (modified) (2 diffs)

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

@@ -44 +44 @@
       public void SetValue(string name, object value) {
         accessorDict[name].Set(value);
+        accessorDict.Remove(name);
       }
       public Setter GetSetter(string name) {
         return value => accessorDict[name].Set(value);
+      }
+      public void PopulateDefaultValues() {
+        foreach (var pair in accessorDict) {
+          pair.Value.Set(pair.Value.DefaultValue);
+        }        
       }
     }
@@ -106 +112 @@
         instance = Activator.CreateInstance(start.Type, true);
         Dictionary<string, DataMemberAccessor> accessorDict =
-        StorableAttribute.GetAutostorableAccessors(instance);
+          StorableAttribute.GetAutostorableAccessors(instance);
         compositeStack.Push(new CompositeObject(instance, accessorDict));
         id2obj.Add(start.Id, instance);
@@ -113 +119 @@
     private void CompositeEndHandler(IParseToken token) {
       CompositeEnd end = (CompositeEnd)token;
-      ICompoundSerializer customSerializer = FindCompoundSerializer(end.Type);
-      if (customSerializer != null) {
+      ICompoundSerializer compoundSerializer = FindCompoundSerializer(end.Type);
+      if (compoundSerializer != null) {
         CustomObject customObject = (CustomObject)compositeStack.Pop();
         object deserializedObject =
-          customSerializer.DeSerialize(customObject.customValues, end.Type);
+          compoundSerializer.DeSerialize(customObject.customValues, end.Type);
         id2obj[end.Id] = deserializedObject;        
         SetValue(end.Name, deserializedObject);          
       } else {
         CompositeObject compositeObject = (CompositeObject)compositeStack.Pop();
+        compositeObject.PopulateDefaultValues();
         SetValue(end.Name, compositeObject.Obj);
       }

branches/New Persistence Exploration/Persistence/Persistence/Test/NewSerializationTest.cs

@@ -34 +34 @@
     [Storable]
     public Dictionary<string, int> dict = new Dictionary<string, int>();
+    [Storable(DefaultValue = "default")]
+    public string uninitialized;
   }
 
@@ -151 +153 @@
       Serializer s = new Serializer(r);        
       Persistence.XmlFormatter xmlFormatter = new XmlFormatter();
-      StreamWriter writer = new StreamWriter("test.xml");
+      //StreamWriter writer = new StreamWriter("test.xml");
       foreach (ISerializationToken token in s) {
         string line = xmlFormatter.Format(token);
-        writer.Write(line);
+        //writer.Write(line);
         Console.Out.Write(line);
       }
-      writer.Close();
+      //writer.Close();
       XmlParser parser = new XmlParser(new StreamReader("test.xml"));
       DeSerializer deSerializer = new DeSerializer();