Changeset 1323 for branches/New Persistence Exploration/Persistence/Persistence/Serializer.cs

Timestamp:

03/11/09 14:20:51 (15 years ago)

Author:

epitzer

Message:

resharping...

File:

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

branches/New Persistence Exploration/Persistence/Persistence/Serializer.cs

@@ -2 +2 @@
 using System.Collections;
 using System;
-using System.Reflection;
 
 namespace Persistence {
@@ -8 +7 @@
   public class Serializer : IEnumerable<ISerializationToken> {
 
-    private object obj;
-    private string rootName;
-    private Dictionary<object, int> obj2id;
-    private Dictionary<Type, IPrimitiveSerializer> primitiveSerializers;
-    private List<ICompoundSerializer> compoundSerializers;
+    private readonly object obj;
+    private readonly string rootName;
+    private readonly Dictionary<object, int> obj2id;
+    private readonly Dictionary<Type, IPrimitiveSerializer> primitiveSerializers;
+    private readonly List<ICompoundSerializer> compoundSerializers;
 
     public Serializer(object obj) :
@@ -34 +33 @@
       }
       this.compoundSerializers = new List<ICompoundSerializer>(compoundSerializers);
-      this.obj2id = new Dictionary<object, int>();
-      obj2id.Add(new object(), 0);
-    }
+      obj2id = new Dictionary<object, int> {{new object(), 0}};
+        }
 
     IEnumerator IEnumerable.GetEnumerator() {
-      return this.GetEnumerator();
+      return GetEnumerator();
     }
 
     public IEnumerator<ISerializationToken> GetEnumerator() {
       DataMemberAccessor rootAccessor = new DataMemberAccessor(
-        this.rootName, obj.GetType(), null, () => this.obj, null);
+        rootName, obj.GetType(), null, () => obj, null);
       IEnumerator<ISerializationToken> iterator = Serialize(rootAccessor);
       while (iterator.MoveNext())
@@ -54 +52 @@
       if (value == null) {
         yield return new NullReferenceToken(accessor.Name);
-      } else if (this.primitiveSerializers.ContainsKey(value.GetType())) {
-        yield return new PrimitiveToken(accessor, this.primitiveSerializers[value.GetType()].Serialize(value));
-      } else if (this.obj2id.ContainsKey(value)) {
-        yield return new ReferenceToken(accessor.Name, this.obj2id[value]);
+      } else if (primitiveSerializers.ContainsKey(value.GetType())) {
+        yield return new PrimitiveToken(accessor, primitiveSerializers[value.GetType()].Serialize(value));
+      } else if (obj2id.ContainsKey(value)) {
+        yield return new ReferenceToken(accessor.Name, obj2id[value]);
       } else {
         int id = obj2id.Count;
-        this.obj2id.Add(value, id);
+        obj2id.Add(value, id);
         yield return new BeginToken(accessor, id);
-        ICompoundSerializer customSerializer = this.FindCompoundSerializer(value.GetType());
+        ICompoundSerializer customSerializer = FindCompoundSerializer(value.GetType());
         if (customSerializer != null) {
-          foreach (object obj in customSerializer.Serialize(value)) {
-            IEnumerator<ISerializationToken> iterator = this.Serialize(new DataMemberAccessor(obj));
+          foreach (object o in customSerializer.Serialize(value)) {
+            IEnumerator<ISerializationToken> iterator = Serialize(new DataMemberAccessor(o));
             while (iterator.MoveNext())
               yield return iterator.Current;
@@ -74 +72 @@
             StorableAttribute.GetAutostorableAccessors(value)) {
             nSubComponents += 1;
-            IEnumerator<ISerializationToken> iterator = this.Serialize(mapping.Value);                        
+            IEnumerator<ISerializationToken> iterator = Serialize(mapping.Value);                        
             while (iterator.MoveNext()) {                            
               yield return iterator.Current;