Changeset 1357 for branches/New Persistence Exploration/Persistence/Persistence/Serializer.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/Serializer.cs (modified) (4 diffs)

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

@@ -3 +3 @@
 using System;
 using System.Linq;
+using HeuristicLab.Persistence.Interfaces;
 
-namespace Persistence {
+namespace HeuristicLab.Persistence {
 
   public class Serializer : IEnumerable<ISerializationToken> {
@@ -46 +47 @@
     }
 
+    
     private IEnumerator<ISerializationToken> Serialize(DataMemberAccessor accessor) {
-
       object value = accessor.Get();
-
-      if (value == null) {
-        yield return new NullReferenceToken(accessor.Name);
-        yield break;
-      }
-
-      if (obj2id.ContainsKey(value)) {
-        yield return new ReferenceToken(accessor.Name, obj2id[value]);
-        yield break;
-      }
-      
+      if (value == null)
+        return NullReferenceEnumeration(accessor.Name);
+      if (obj2id.ContainsKey(value))
+        return ReferenceTokenEnumeration(accessor.Name, obj2id[value]);              
       if ( ! typeCache.ContainsKey(value.GetType()))
         typeCache.Add(value.GetType(), typeCache.Count);
       int typeId = typeCache[value.GetType()];
-
       int? id = null;
       if ( ! value.GetType().IsValueType) {
@@ -69 +62 @@
         obj2id.Add(value, (int)id);
       }
+      IFormatter formatter = persistenceConfiguration.GetFormatter(XmlFormat.Instance, value.GetType());
+      if (formatter != null)
+        return PrimitiveEnumeration(accessor.Name, typeId, formatter.Serialize(value), id);
+      IDecomposer decomposer = persistenceConfiguration.GetDecomposer(value.GetType()); 
+      if (decomposer != null)
+        return CompositeEnumeration(accessor.Name, decomposer.Serialize(value), id, typeId);            
+      return StorableEnumeration(accessor.Name, value, id, typeId);
+    }
 
-      IFormatter formatter = persistenceConfiguration.GetFormatter(XmlFormat.Instance, value.GetType());     
-      if (formatter != null) {
-        yield return new PrimitiveToken(
-          accessor.Name,
-          typeId,
-          formatter.Serialize(value),          
-          id);
-        yield break;
-      }
-      
-      yield return new BeginToken(accessor.Name, typeId, id);
-      IDecomposer decomposer = persistenceConfiguration.GetDecomposer(value.GetType());      
+    private IEnumerator<ISerializationToken> NullReferenceEnumeration(string name) {
+      yield return new NullReferenceToken(name);
+    }
 
-      if (decomposer != null) {
-        foreach (object o in decomposer.Serialize(value)) {
+    private IEnumerator<ISerializationToken> ReferenceTokenEnumeration(string name, int id) {
+      yield return new ReferenceToken(name, id);
+    }
+
+    private IEnumerator<ISerializationToken> PrimitiveEnumeration(string name, int typeId, object serializedValue, int? id) {
+      yield return new PrimitiveToken(name, typeId, serializedValue, id);
+    }
+
+    private IEnumerator<ISerializationToken> CompositeEnumeration(string name, IEnumerable values, int? id, int typeId) {
+      yield return new BeginToken(name, typeId, id);      
+        foreach (object o in values) {
           IEnumerator<ISerializationToken> iterator = Serialize(new DataMemberAccessor(o));
           while (iterator.MoveNext())
             yield return iterator.Current;
         }
-        yield return new EndToken(accessor.Name, typeId, id);
-        yield break;
-      }
+      yield return new EndToken(name, typeId, id);        
+    }
 
+    private IEnumerator<ISerializationToken> StorableEnumeration(string name, object value, int? id, int typeId) {            
+      yield return new BeginToken(name, typeId, id);
       int nSubComponents = 0;
       foreach (KeyValuePair<string, DataMemberAccessor> mapping in
@@ -107 +109 @@
                                          value.GetType().FullName));
       }
-      yield return new EndToken(accessor.Name, typeId, id);
+      yield return new EndToken(name, typeId, id);
     }
-    
   }
+
+
 }