Changeset 1564 for trunk/sources/HeuristicLab.Persistence/3.3/Core/Configuration.cs

Timestamp:

04/16/09 12:40:41 (15 years ago)

Author:

epitzer

Message:

Stronger typing for formatters with the help of generics. Separate format and serial data type. (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/Configuration.cs (modified) (2 diffs)

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

@@ -9 +9 @@
     [Storable]
     private readonly Dictionary<Type, IFormatter> formatters;
+
     [Storable]
     private readonly List<IDecomposer> decomposers;
     private readonly Dictionary<Type, IDecomposer> decomposerCache;
-    [Storable]
-    public IFormat Format { get; set; }
+
+    [Storable]    
+    public IFormat Format { get; private set; }
 
     private Configuration() {
@@ -19 +21 @@
     }
 
-    public Configuration(Dictionary<Type, IFormatter> formatters, IEnumerable<IDecomposer> decomposers) {      
+    public Configuration(IFormat format, Dictionary<Type, IFormatter> formatters, IEnumerable<IDecomposer> decomposers) {
+      this.Format = format;
       this.formatters = new Dictionary<Type, IFormatter>();
       foreach ( var pair in formatters ) {
-        if (Format == null) {
-          Format = pair.Value.Format;
-        } else if (pair.Value.Format != Format ) {
+        if (pair.Value.SerialDataType != format.SerialDataType ) {
           throw new ArgumentException("All formatters must have the same IFormat.");
         }