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

Timestamp:

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

Author:

epitzer

Message:

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

Location:

trunk/sources/HeuristicLab.Persistence/3.3/Core

Files:

• Configuration.cs (modified) (1 diff)
• ConfigurationService.cs (modified) (5 diffs)
• DataMemberAccessor.cs (modified) (2 diffs)
• DeSerializer.cs (modified) (5 diffs)
• Serializer.cs (modified) (4 diffs)
• Tag.cs (modified) (2 diffs)
• TypeMapping.cs (modified) (1 diff)

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

@@ -13 +13 @@
     private readonly Dictionary<Type, IDecomposer> decomposerCache;
     [Storable]
-    public readonly IFormat Format;
+    public IFormat Format { get; set; }
 
     private Configuration() {

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

@@ -7 +7 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Tracing;
+using HeuristicLab.Persistence.Interfaces.Tokens;
 
 namespace HeuristicLab.Persistence.Core {
@@ -14 +15 @@
     private static ConfigurationService instance;
     private readonly Dictionary<IFormat, Configuration> customConfigurations;
-    public readonly Dictionary<IFormat, List<IFormatter>> Formatters;
-    public readonly List<IDecomposer> Decomposers;
+    public Dictionary<IFormat, List<IFormatter>> Formatters { get; private set; }
+    public List<IDecomposer> Decomposers { get; private set; }
     
     public static ConfigurationService Instance {
@@ -25 +26 @@
     }
 
-    public ConfigurationService() {
+    private ConfigurationService() {
       Formatters = new Dictionary<IFormat, List<IFormatter>>();
       Decomposers = new List<IDecomposer>();
@@ -35 +36 @@
     public void LoadSettings() {
       try {
-        if (String.IsNullOrEmpty(Properties.Settings.Default.customConfigurations) ||
-          String.IsNullOrEmpty(Properties.Settings.Default.customConfigurationsTypeCache))
+        if (String.IsNullOrEmpty(Properties.Settings.Default.CustomConfigurations) ||
+          String.IsNullOrEmpty(Properties.Settings.Default.CustomConfigurationsTypeCache))
           return;
-        DeSerializer deSerializer = new DeSerializer(
+        Deserializer deSerializer = new Deserializer(
           XmlParser.ParseTypeCache(
           new StringReader(
-            Properties.Settings.Default.customConfigurationsTypeCache)));
+            Properties.Settings.Default.CustomConfigurationsTypeCache)));
         XmlParser parser = new XmlParser(
           new StringReader(
-            Properties.Settings.Default.customConfigurations));
+            Properties.Settings.Default.CustomConfigurations));
         var newCustomConfigurations = (Dictionary<IFormat, Configuration>)
-          deSerializer.DeSerialize(parser);
+          deSerializer.Deserialize(parser);
         foreach (var config in newCustomConfigurations) {
           customConfigurations[config.Key] = config.Value;
@@ -68 +69 @@
       foreach (string s in generator.Format(serializer.TypeCache))
         configurationTypeCacheString.Append(s);
-      Properties.Settings.Default.customConfigurations =
+      Properties.Settings.Default.CustomConfigurations =
         configurationString.ToString();
-      Properties.Settings.Default.customConfigurationsTypeCache =
+      Properties.Settings.Default.CustomConfigurationsTypeCache =
         configurationTypeCacheString.ToString();
       Properties.Settings.Default.Save();

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

@@ -16 +16 @@
     public DataMemberAccessor(
         MemberInfo memberInfo,
-        StorableAttribute autoStorableAttribute,
+        StorableAttribute storableAttribute,
         object obj) {
       if (memberInfo.MemberType == MemberTypes.Field) {
@@ -34 +34 @@
                 "The Storable attribute can only be applied to fields and properties.");
       }
-      Name = autoStorableAttribute.Name ?? memberInfo.Name;
-      DefaultValue = autoStorableAttribute.DefaultValue;
+      Name = storableAttribute.Name ?? memberInfo.Name;
+      DefaultValue = storableAttribute.DefaultValue;
     }
 

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

@@ -2 +2 @@
 using System;
 using HeuristicLab.Persistence.Interfaces;
+using HeuristicLab.Persistence.Interfaces.Tokens;
 
 namespace HeuristicLab.Persistence.Core {  
 
-  public struct ParentReference {}  
+  public class ParentReference {}  
 
   class CompositeObject {
@@ -18 +19 @@
 
     public void AddValue(string name, object value, List<Thunk> finalFixes) {
-      Tag t = new Tag(name, value) {finalFixes = finalFixes};
+      Tag t = new Tag(name, value) {globalFinalFixes = finalFixes};
       customValues.Add(t);
     }
@@ -30 +31 @@
   public delegate void Thunk();
 
-  public class DeSerializer {
+  public class Deserializer {
     
     private readonly Dictionary<int, object> id2obj;
@@ -38 +39 @@
     private List<Thunk> finalFixes;
 
-    public DeSerializer(
+    public Deserializer(
       IEnumerable<TypeMapping> typeCache) {      
       id2obj = new Dictionary<int, object>();
       parentStack = new Stack<CompositeObject>();
       typeIds = new Dictionary<int, Type>();
-      serializerMapping = createSerializers(typeCache);
+      serializerMapping = CreateSerializers(typeCache);
     }
 
-    private Dictionary<Type, object> createSerializers(IEnumerable<TypeMapping> typeCache) {
+    private Dictionary<Type, object> CreateSerializers(IEnumerable<TypeMapping> typeCache) {
       var map = new Dictionary<Type, object>();
       foreach (var typeMapping in typeCache) {
@@ -59 +60 @@
     }
 
-    public object DeSerialize(IEnumerable<ISerializationToken> tokens) {
+    public object Deserialize(IEnumerable<ISerializationToken> tokens) {
       finalFixes = new List<Thunk>();      
       foreach (ISerializationToken token in tokens) {

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);
     }
 

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

@@ -4 +4 @@
 
   public class Tag {
-    public List<Thunk> finalFixes;
+    internal List<Thunk> globalFinalFixes; // reference to final fixes of Deserializer
     public string Name { get; private set; }
-    public object Value;      
+    public object Value { get; set; }     
 
     public Tag(string name, object value) {
@@ -17 +17 @@
     }
     public void SafeSet(Setter setter) {
-      if ( Value != null && Value.GetType() == typeof(ParentReference))
-        finalFixes.Add(() => setter(Value));
+      if ( Value as ParentReference != null)
+        globalFinalFixes.Add(() => setter(Value));
       else
         setter(Value);

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

@@ -3 +3 @@
 namespace HeuristicLab.Persistence.Core {
 
-  public struct TypeMapping {
+  public class TypeMapping {
     public readonly int Id;
     public readonly string TypeName;