Changeset 1278 for branches/New Persistence Exploration

Timestamp:

03/06/09 17:18:22 (16 years ago)

Author:

epitzer

Message:

Configurable de-serializers. (#506)

Location:

branches/New Persistence Exploration/Persistence/Persistence

Files:

• NewSerializationTest.cs (modified) (1 diff)
• PersistenceManager.cs (modified) (2 diffs)

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

@@ -49 +49 @@
       writer.Close();
       XmlParser parser = new XmlParser(new StreamReader("test.xml"));
-      DeSerializer deSerializer = new DeSerializer();      
+      DeSerializer deSerializer = new DeSerializer(
+        new IPrimitiveSerializer[] { new Int2XMLSerializer(), new String2XMLSerializer() },
+        new ICustomSerializer[] { new ArraySerializer(), new EnumerableSerializer() });
       object o = deSerializer.DeSerialize(parser);
       Console.Out.WriteLine(Util.AutoFormat(o, true));

branches/New Persistence Exploration/Persistence/Persistence/PersistenceManager.cs

@@ -270 +270 @@
     private List<ICustomSerializer> customSerializers;
 
-    public DeSerializer() {
+    public DeSerializer(
+        IEnumerable<IPrimitiveSerializer> primitiveSerializers,
+        IEnumerable<ICustomSerializer> customSerializers) {
       id2obj = new Dictionary<int, object>();
       compositeStack = new Stack<IAccessibleObject>();
@@ -280 +282 @@
       handlers.Add(typeof(Null), new Handler(NullHandler));
       // TODO: make this configurable
-      primitiveSerializers = new Dictionary<Type, IPrimitiveSerializer>();
-      primitiveSerializers.Add(typeof(int), new Int2XMLSerializer());
-      primitiveSerializers.Add(typeof(string), new String2XMLSerializer());
-      customSerializers = new List<ICustomSerializer>();
-      customSerializers.Add(new ArraySerializer());
-      customSerializers.Add(new EnumerableSerializer());      
+      this.primitiveSerializers = new Dictionary<Type, IPrimitiveSerializer>();
+      foreach (IPrimitiveSerializer ps in primitiveSerializers) {
+        this.primitiveSerializers.Add(ps.Type, ps);
+      }
+      this.customSerializers = new List<ICustomSerializer>(customSerializers);
+     
     }
     public object DeSerialize(IEnumerable<IParseToken> tokens) {