Changeset 1357 for branches/New Persistence Exploration/Persistence/Persistence/DeSerializer.cs

Timestamp:

03/18/09 18:13:40 (15 years ago)

Author:

epitzer

Message:

Pluginification and major refactoring. (#506)

File:

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

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

@@ -1 +1 @@
 using System.Collections.Generic;
 using System;
+using HeuristicLab.Persistence.Interfaces;
 
-namespace Persistence {
+namespace HeuristicLab.Persistence {
+
+
+  struct ParentReference { }
+  delegate void Setter(object value);
+
+
+  interface IAccessibleObject {
+    object Obj { get; }
+    Setter GetSetter(string name);
+  }
+
+
+  class CustomObject : IAccessibleObject {
+
+    public object Obj { get; private set; }
+    public readonly List<object> customValues;
+
+    public CustomObject(object obj) {
+      Obj = obj;
+      customValues = new List<object>();
+    }
+
+    public void AddValue(object value) {
+      customValues.Add(value);
+    }
+
+    public Setter GetSetter(string name) {
+      int index = customValues.Count - 1;
+      return value => customValues[index] = value;
+    }
+  }
+
+
+  class CompositeObject : IAccessibleObject {
+
+    public object Obj { get; private set; }
+    public readonly Dictionary<string, DataMemberAccessor> accessorDict;
+
+    public CompositeObject(object obj, Dictionary<string, DataMemberAccessor> accessorDict) {
+      Obj = obj;
+      this.accessorDict = new Dictionary<string, DataMemberAccessor>();
+      foreach (KeyValuePair<string, DataMemberAccessor> pair in accessorDict) {
+        this.accessorDict.Add(
+          pair.Value.Name,
+          pair.Value);
+      }
+    }
+
+    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);
+      }
+    }
+  }
+
 
   public class DeSerializer {
 
-    struct ParentReference { }
-
-    delegate void Setter(object value);
-
-    interface IAccessibleObject {
-      object Obj { get; }      
-      Setter GetSetter(string name);
-    }
-
-    class CustomObject : IAccessibleObject {
-      public object Obj { get; private set; }
-      public readonly List<object> customValues;
-      public CustomObject(object obj) {
-        Obj = obj;
-        customValues = new List<object>();
-      }
-      public void AddValue(object value) {
-        customValues.Add(value);
-      }
-      public Setter GetSetter(string name) {
-        int index = customValues.Count-1;
-        return value => customValues[index] = value;
-      }
-    }
-
-    class CompositeObject : IAccessibleObject {
-      public object Obj { get; private set; }
-      public readonly Dictionary<string, DataMemberAccessor> accessorDict;
-      public CompositeObject(object obj, Dictionary<string, DataMemberAccessor> accessorDict) {
-        Obj = obj;
-        this.accessorDict = new Dictionary<string, DataMemberAccessor>();
-        foreach (KeyValuePair<string, DataMemberAccessor> pair in accessorDict) {
-          this.accessorDict.Add(
-            pair.Value.Name,
-            pair.Value);
-        }
-      }
-      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);
-        }        
-      }
-    }
-
     private delegate void Handler(ISerializationToken token);
+    private delegate void Thunk();
 
     private readonly Dictionary<int, object> id2obj;
@@ -63 +78 @@
     private readonly Stack<IAccessibleObject> compositeStack;
     private readonly PersistenceConfiguration persistenceConfiguration;
-    private readonly Dictionary<int, Type> typeIds;
-
-    delegate void Thunk();
+    private readonly Dictionary<int, Type> typeIds;    
     private List<Thunk> finalFixes;
 
@@ -115 +128 @@
         id2obj.Add((int)start.Id, instance);
     }
+
     private void CompositeEndHandler(ISerializationToken token) {
       EndToken end = (EndToken)token;
@@ -132 +146 @@
       }
     }
+
     private void PrimitiveHandler(ISerializationToken token) {
       PrimitiveToken primitive = (PrimitiveToken)token;
@@ -142 +157 @@
       SetValue(primitive.Name, value);
     }
+
     private void ReferenceHandler(ISerializationToken token) {
       ReferenceToken reference = (ReferenceToken)token;
@@ -152 +168 @@
       } 
     }
+
     private void NullHandler(ISerializationToken token) {
       NullReferenceToken nil = (NullReferenceToken)token;
       SetValue(nil.Name, null);
     }
+
     private void SetValue(string name, object value) {
       if (compositeStack.Count == 0) {