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

Timestamp:

03/27/09 13:45:33 (15 years ago)

Author:

epitzer

Message:

refactoring and code clean up. (#9999)

File:

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

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

@@ -18 +18 @@
 
     public void AddValue(string name, object value, List<Thunk> finalFixes) {
-      Tag t = new Tag(name, value);
-      t.finalFixes = finalFixes;
+      Tag t = new Tag(name, value) {finalFixes = finalFixes};
       customValues.Add(t);
     }
@@ -48 +47 @@
 
     private Dictionary<Type, object> createSerializers(IEnumerable<TypeMapping> typeCache) {
-      var serializerMapping = new Dictionary<Type, object>();
+      var map = new Dictionary<Type, object>();
       foreach (var typeMapping in typeCache) {
         Type type = Type.GetType(typeMapping.TypeName);
@@ -54 +53 @@
         if (typeMapping.Serializer != null) {
           Type serializerType = Type.GetType(typeMapping.Serializer);
-          serializerMapping.Add(type, Activator.CreateInstance(serializerType, true));
+          map.Add(type, Activator.CreateInstance(serializerType, true));
         }
       }
-      return serializerMapping;
+      return map;
     }
 
@@ -93 +92 @@
           "No suitable method for deserialization of type \"{0}\" found.",
           type.VersionInvariantName()));
-      object instance = decomposer.CreateInstance(type);
-      if (instance == null)
-        instance = new ParentReference();
+      object instance = 
+        decomposer.CreateInstance(type) ??
+        new ParentReference();
       parentStack.Push(new CompositeObject(instance));              
       if ( token.Id != null )
@@ -110 +109 @@
           "No suitable method for deserialization of type \"{0}\" found.",
           type.VersionInvariantName()));
-      CompositeObject customComposite = (CompositeObject)parentStack.Pop();
+      CompositeObject customComposite = parentStack.Pop();
       object deserializedObject =          
         decomposer.Populate(customComposite.Obj, customComposite.customValues, type);