Changeset 1361 for branches/New Persistence Exploration/Persistence/Persistence/Core/Serializer.cs

Timestamp:

03/19/09 13:30:58 (15 years ago)

Author:

epitzer

Message:

Split all classes into their own file (#506)

File:

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

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

@@ -45 +45 @@
         yield return iterator.Current;      
     }
-
     
     private IEnumerator<ISerializationToken> Serialize(DataMemberAccessor accessor) {
       object value = accessor.Get();
       if (value == null)
-        return NullReferenceEnumeration(accessor.Name);
+        return NullReferenceEnumerator(accessor.Name);
       if (obj2id.ContainsKey(value))
-        return ReferenceTokenEnumeration(accessor.Name, obj2id[value]);              
+        return ReferenceEnumerator(accessor.Name, obj2id[value]);              
       if ( ! typeCache.ContainsKey(value.GetType()))
         typeCache.Add(value.GetType(), typeCache.Count);
@@ -63 +62 @@
       IFormatter formatter = configuration.GetFormatter(value.GetType());
       if (formatter != null)
-        return PrimitiveEnumeration(accessor.Name, typeId, formatter.DoFormat(value), id);
+        return PrimitiveEnumerator(accessor.Name, typeId, formatter.DoFormat(value), id);
       IDecomposer decomposer = configuration.GetDecomposer(value.GetType()); 
       if (decomposer != null)
-        return CompositeEnumeration(accessor.Name, decomposer.DeCompose(value), id, typeId);            
-      return StorableEnumeration(accessor.Name, value, id, typeId);
+        return CompositeEnumerator(accessor.Name, decomposer.DeCompose(value), id, typeId);            
+      return StorableEnumerator(accessor.Name, value, id, typeId);
     }
 
-    private IEnumerator<ISerializationToken> NullReferenceEnumeration(string name) {
+    private IEnumerator<ISerializationToken> NullReferenceEnumerator(string name) {
       yield return new NullReferenceToken(name);
     }
 
-    private IEnumerator<ISerializationToken> ReferenceTokenEnumeration(string name, int id) {
+    private IEnumerator<ISerializationToken> ReferenceEnumerator(string name, int id) {
       yield return new ReferenceToken(name, id);
     }
 
-    private IEnumerator<ISerializationToken> PrimitiveEnumeration(string name, int typeId, object serializedValue, int? id) {
+    private IEnumerator<ISerializationToken> PrimitiveEnumerator(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) {
+    private IEnumerator<ISerializationToken> CompositeEnumerator(string name,
+        IEnumerable values, int? id, int typeId) {
       yield return new BeginToken(name, typeId, id);      
         foreach (object o in values) {
@@ -92 +93 @@
     }
 
-    private IEnumerator<ISerializationToken> StorableEnumeration(string name, object value, int? id, int typeId) {            
+    private IEnumerator<ISerializationToken> StorableEnumerator(string name,
+        object value, int? id, int typeId) {            
       yield return new BeginToken(name, typeId, id);
       int nSubComponents = 0;
       foreach (KeyValuePair<string, DataMemberAccessor> mapping in
         StorableAttribute.GetAutostorableAccessors(value)) {
-        nSubComponents += 1;
+        nSubComponents += 1;                
         IEnumerator<ISerializationToken> iterator = Serialize(mapping.Value);
         while (iterator.MoveNext()) {
@@ -104 +106 @@
       }
       if (nSubComponents == 0) {
-        throw new ApplicationException(String.Format(
-                                         "Composite value of type \"{0}\" contains no subcomponents",
-                                         value.GetType().FullName));
+        throw new ApplicationException(
+          String.Format(
+            "CustomComposite value of type \"{0}\" contains no subcomponents",
+            value.GetType().FullName));
       }
       yield return new EndToken(name, typeId, id);