Changeset 1654 for trunk/sources

Timestamp:

04/24/09 14:21:54 (15 years ago)

Author:

epitzer

Message:

Streamline formatter configuration interface. Source types are already embedded in formatter generic type. (#548)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs (modified) (2 diffs)
• HeuristicLab.Persistence/3.3/Core/Configuration.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs (modified) (1 diff)
• HeuristicLab.Persistence/UnitTests/UseCases.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs

@@ -376 +376 @@
       if (formatterGrid == null || decomposerList == null)
         return null;
-      var formatters = new Dictionary<Type, IFormatter>();
+      var formatters = new List<IFormatter>();
       foreach (DataGridViewRow row in formatterGrid.Rows) {
         if (row.Cells["Type"].Value != null &&
@@ -382 +382 @@
              row.Cells["Formatter"].Value != null &&
              (bool)row.Cells["Active"].Value == true) {
-          formatters.Add(
-            typeNameTable[(string)row.Cells["Type"].Value],
-            formatterTable[(string)row.Cells["Formatter"].Value]);
+          formatters.Add(formatterTable[(string)row.Cells["Formatter"].Value]);
         }
       }

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

@@ -22 +22 @@
     }
 
-    public Configuration(IFormat format, Dictionary<Type, IFormatter> formatters, IEnumerable<IDecomposer> decomposers) {
+    public Configuration(IFormat format, IEnumerable<IFormatter> formatters, IEnumerable<IDecomposer> decomposers) {
       this.Format = format;
       this.formatters = new Dictionary<Type, IFormatter>();
-      foreach (var pair in formatters) {
-        if (pair.Value.SerialDataType != format.SerialDataType) {
+      foreach (IFormatter formatter in formatters) {
+        if (formatter.SerialDataType != format.SerialDataType) {
           throw new ArgumentException("All formatters must have the same IFormat.");
         }
-        this.formatters.Add(pair.Key, pair.Value);
+        this.formatters.Add(formatter.SourceType, formatter);
       }
       this.decomposers = new List<IDecomposer>(decomposers);

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

@@ -160 +160 @@
           format.SerialDataType.VersionInvariantName()));
       }
-      return new Configuration(format, formatterConfig, Decomposers.Where((d) => d.Priority > 0));
+      return new Configuration(format, formatterConfig.Values, Decomposers.Where((d) => d.Priority > 0));
     }
 

trunk/sources/HeuristicLab.Persistence/UnitTests/UseCases.cs

@@ -379 +379 @@
       XmlGenerator.Serialize(sdt, tempFile,
         new Configuration(new XmlFormat(),
-          new Dictionary<Type, IFormatter> {
-          { typeof(string), new String2XmlFormatter() } },
+          new List<IFormatter> { new String2XmlFormatter() },
           new List<IDecomposer> { 
             new StorableDecomposer(),