Changeset 1542 for trunk/sources/HeuristicLab.Persistence/3.3/Core/Serializer.cs

Timestamp:

04/08/09 17:05:17 (15 years ago)

Author:

epitzer

Message:

Numerous small changes, coding conventions, renames, mini refactoring (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/Serializer.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/Serializer.cs

@@ -3 +3 @@
 using System;
 using HeuristicLab.Persistence.Interfaces;
+using HeuristicLab.Persistence.Interfaces.Tokens;
 
 namespace HeuristicLab.Persistence.Core {
@@ -49 +50 @@
 
     public IEnumerator<ISerializationToken> GetEnumerator() {
-      DataMemberAccessor rootAccessor = new DataMemberAccessor(
-        rootName, null, () => obj, null);
-      IEnumerator<ISerializationToken> iterator = Serialize(rootAccessor);
-      while (iterator.MoveNext())
-        yield return iterator.Current;      
+      return Serialize(new DataMemberAccessor(rootName, null, () => obj, null));
     }
     
@@ -75 +72 @@
       IDecomposer decomposer = configuration.GetDecomposer(value.GetType()); 
       if (decomposer != null)
-        return CompositeEnumerator(accessor.Name, decomposer.DeCompose(value), id, typeId);                  
+        return CompositeEnumerator(accessor.Name, decomposer.Decompose(value), id, typeId);                  
       throw new ApplicationException(
           String.Format(
@@ -92 +89 @@
     private IEnumerator<ISerializationToken> PrimitiveEnumerator(string name,
         int typeId, object serializedValue, int? id) {
-      yield return new PrimitiveToken(name, typeId, serializedValue, id);
+      yield return new PrimitiveToken(name, typeId, id, serializedValue);
     }