Changeset 1565 for trunk/sources

Timestamp:

04/16/09 12:43:01 (16 years ago)

Author:

epitzer

Message:

Adapt Persistence.GUI to new formatter structure. (#548)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs (modified) (16 diffs)
• HeuristicLab.Persistence.Test/NewSerializationTest.cs (modified) (4 diffs)

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

@@ -9 +9 @@
 using System.Text;
 using HeuristicLab.Persistence.Default.Decomposers;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Persistence.GUI {
@@ -15 +16 @@
 
     private readonly Dictionary<string, IFormatter> formatterTable;
+    private readonly Dictionary<string, bool> simpleFormatterTable;
     private readonly Dictionary<IFormatter, string> reverseFormatterTable;    
     private readonly Dictionary<string, Type> typeNameTable;
@@ -22 +24 @@
       InitializeComponent();
       formatterTable = new Dictionary<string, IFormatter>();
+      simpleFormatterTable = new Dictionary<string, bool>();
       reverseFormatterTable = new Dictionary<IFormatter, string>();
       typeNameTable = new Dictionary<string, Type>();
-      reverseTypeNameTable = new Dictionary<Type, string>();      
-      initializeConfigPages();      
+      reverseTypeNameTable = new Dictionary<Type, string>();
+      InitializeNameTables();
+      initializeConfigPages();
       UpdateFromConfigurationService();
     }
@@ -68 +72 @@
 
     private void UpdateFromConfigurationService() {
-      foreach (IFormat format in ConfigurationService.Instance.Formatters.Keys) {
-        Configuration config = ConfigurationService.Instance.GetConfiguration(format);        
+      foreach ( IFormat format in ConfigurationService.Instance.Formats ) {
+        Configuration config = ConfigurationService.Instance.GetConfiguration(format);
         UpdateFormatterGrid(
           (DataGridView)GetControlsOnPage(format.Name, "GridView"),
@@ -80 +84 @@
 
     private void initializeConfigPages() {
-      configurationTabs.TabPages.Clear();
-      foreach ( var formats in ConfigurationService.Instance.Formatters ) {        
-        TabPage page = new TabPage(formats.Key.Name) {
-          Name = formats.Key.Name,
-          Tag = formats.Key,
+      configurationTabs.TabPages.Clear();      
+      foreach ( IFormat format in ConfigurationService.Instance.Formats ) {
+        List<IFormatter> formatters = ConfigurationService.Instance.Formatters[format.SerialDataType];
+        TabPage page = new TabPage(format.Name) {
+          Name = format.Name,
+          Tag = format,
         };
         configurationTabs.TabPages.Add(page);
@@ -103 +108 @@
         DataGridView gridView = createGridView();
         verticalSplit.Panel2.Controls.Add(gridView);        
-        fillDataGrid(gridView, formats.Value);
+        fillDataGrid(gridView, formatters);
         ListBox checkBox = new ListBox {
           Name = "CheckBox",
@@ -171 +176 @@
     }
 
-    private void fillDataGrid(DataGridView gridView, IEnumerable<IFormatter> formatters) {      
-      updateNameTables(formatters);
+    private void fillDataGrid(DataGridView gridView, IEnumerable<IFormatter> formatters) {            
       Dictionary<string, List<string>> formatterMap = createFormatterMap(formatters);
       foreach ( var formatterMapping in formatterMap ) {
@@ -196 +200 @@
       foreach (var formatter in formatters) {
         string formatterName = reverseFormatterTable[formatter];
-        string typeName = reverseTypeNameTable[formatter.Type];          
+        string typeName = reverseTypeNameTable[formatter.SourceType];          
         if (!formatterMap.ContainsKey(typeName))
           formatterMap.Add(typeName, new List<string>());
@@ -204 +208 @@
     }
 
-    private void updateNameTables(IEnumerable<IFormatter> formatters) {
-      foreach (var formatter in formatters) {
-        string formatterName = formatter.GetType().Name;
-        if (formatterTable.ContainsKey(formatterName)) {
-          IFormatter otherFormatter = formatterTable[formatterName];
-          formatterTable.Remove(formatterName);
-          reverseFormatterTable.Remove(otherFormatter);
-          formatterTable.Add(otherFormatter.GetType().VersionInvariantName(), otherFormatter);
-          reverseFormatterTable.Add(otherFormatter, otherFormatter.GetType().VersionInvariantName());
-          formatterName = formatter.GetType().VersionInvariantName();
+    private void InitializeNameTables() {
+      foreach (var serialDataType in ConfigurationService.Instance.Formatters.Keys) {
+        foreach (var formatter in ConfigurationService.Instance.Formatters[serialDataType]) {
+          string formatterName = formatter.GetType().Name;
+          if (simpleFormatterTable.ContainsKey(formatterName)) {
+            IFormatter otherFormatter = formatterTable[formatterName];
+            formatterTable.Remove(formatterName);
+            reverseFormatterTable.Remove(otherFormatter);
+            formatterTable.Add(otherFormatter.GetType().VersionInvariantName(), otherFormatter);
+            reverseFormatterTable.Add(otherFormatter, otherFormatter.GetType().VersionInvariantName());
+            formatterName = formatter.GetType().VersionInvariantName();
+          }
+          simpleFormatterTable[formatter.GetType().Name] = true;
+          formatterTable.Add(formatterName, formatter);          
+          reverseFormatterTable.Add(formatter, formatterName);
+
+          string typeName = formatter.SourceType.IsGenericType ?
+            formatter.SourceType.SimpleFullName() :
+            formatter.SourceType.Name;
+          if (typeNameTable.ContainsKey(typeName)) {
+            Type otherType = typeNameTable[typeName];
+            if (otherType != formatter.SourceType) {
+              typeNameTable.Remove(typeName);
+              reverseTypeNameTable.Remove(otherType);
+              typeNameTable.Add(otherType.VersionInvariantName(), otherType);
+              reverseTypeNameTable.Add(otherType, otherType.VersionInvariantName());
+              typeName = formatter.SourceType.VersionInvariantName();
+              typeNameTable.Add(typeName, formatter.SourceType);
+              reverseTypeNameTable.Add(formatter.SourceType, typeName);
+            }
+          } else {
+            typeNameTable.Add(typeName, formatter.SourceType);
+            reverseTypeNameTable.Add(formatter.SourceType, typeName);
+          }
         }
-        formatterTable.Add(formatterName, formatter);
-        reverseFormatterTable.Add(formatter, formatterName);
-
-        string typeName = formatter.Type.IsGenericType ?
-          formatter.Type.SimpleFullName() : 
-          formatter.Type.Name;
-        if (typeNameTable.ContainsKey(typeName)) {
-          Type otherType = typeNameTable[typeName];
-          if (otherType != formatter.Type) {
-            typeNameTable.Remove(typeName);
-            reverseTypeNameTable.Remove(otherType);
-            typeNameTable.Add(otherType.VersionInvariantName(), otherType);
-            reverseTypeNameTable.Add(otherType, otherType.VersionInvariantName());
-            typeName = formatter.Type.VersionInvariantName();
-            typeNameTable.Add(typeName, formatter.Type);
-            reverseTypeNameTable.Add(formatter.Type, typeName);
-          }
-        } else {
-          typeNameTable.Add(typeName, formatter.Type);
-          reverseTypeNameTable.Add(formatter.Type, typeName);
-        }          
       }
     }    
@@ -321 +328 @@
     }
 
-    private Configuration GenerateConfiguration(DataGridView formatterGrid, ListView decomposerList) {
+    private Configuration GenerateConfiguration(IFormat format, DataGridView formatterGrid, ListView decomposerList) {
       if (formatterGrid == null || decomposerList == null)
         return null;
@@ -340 +347 @@
           decomposers.Add((IDecomposer)item.Tag);
       }
-      return new Configuration(formatters, decomposers);
-    }
-
-    private Configuration GetActiveConfiguration() {      
-      return GenerateConfiguration(
+      return new Configuration(format, formatters, decomposers);
+    }
+
+    private Configuration GetActiveConfiguration() {
+      IFormat format = (IFormat)configurationTabs.SelectedTab.Tag;
+      return GenerateConfiguration(format,
         (DataGridView)GetActiveControl("GridView"),
         (ListView)GetActiveControl("DecomposerList"));
@@ -350 +358 @@
 
     private Configuration GetConfiguration(IFormat format) {
-       return GenerateConfiguration(
+       return GenerateConfiguration(format,
         (DataGridView)GetControlsOnPage(format.Name, "GridView"),
         (ListView)GetControlsOnPage(format.Name, "DecomposerList"));
@@ -359 +367 @@
       if (format != null)
         ConfigurationService.Instance.DefineConfiguration(
-          format,
           GetActiveConfiguration());
     }    
@@ -365 +372 @@
   }
 
+  public class Empty : ISerialData { }
+
   [EmptyStorableClass]
-  public class EmptyFormat : FormatBase {
+  public class EmptyFormat : FormatBase<Empty> {
     public override string Name { get { return "Empty"; } }
-    public static EmptyFormat Instance = new EmptyFormat();
   }
 
   [EmptyStorableClass]
-  public class EmptyFormatter : IFormatter {
-
-    public Type Type { get { return typeof(Type); } }
-    public IFormat  Format { get { return EmptyFormat.Instance; } }
-
-    public object DoFormat(object o) {
+  public class EmptyFormatter : FormatterBase<Type, Empty> {
+
+    public override Empty Format(Type o) {
      return null;
     }
 
-    public object Parse(object o) {
+    public override Type Parse(Empty o) {
       return null;
     }
@@ -387 +392 @@
 
   [EmptyStorableClass]
-  public class FakeBoolean2XmlFormatter : IFormatter {    
-
-    public Type Type { get { return typeof (Boolean); } }
-
-    public IFormat Format { get { return XmlFormat.Instance; } }
-
-    public object DoFormat(object o) {
+  public class FakeBoolean2XmlFormatter : FormatterBase<bool, Empty> {
+
+    public override Empty Format(bool o) {
       return null;
     }
 
-    public object Parse(object o) {
+    public override bool Parse(Empty o) {
+      return false;
+    }    
+  }  
+
+  [EmptyStorableClass]
+  public class Int2XmlFormatter : FormatterBase<int, Empty> {
+
+    public override Empty Format(int o) {
       return null;
-    }    
-  }  
-
-  [EmptyStorableClass]
-  public class Int2XmlFormatter: IFormatter {
-    public Type Type { get { return typeof (int);  } }
-    public IFormat Format { get { return XmlFormat.Instance; } }
-    public object DoFormat(object o) {
-      return null;
-    }
-    public object Parse(object o) {
-      return null;
-    }
+    }
+
+    public override int Parse(Empty o) {
+      return 0;
+    }
+
   }
 
@@ -424 +426 @@
     private static void SimpleFullName(Type type, StringBuilder sb) {      
       if (type.IsGenericType) {
-        sb.Append(type.Name, 0, type.Name.LastIndexOf('`'));      
+        sb.Append(type.Name, 0, type.Name.LastIndexOf('`'));
         sb.Append("<");
         foreach (Type t in type.GetGenericArguments()) {
-          SimpleFullName(t, sb);          
+          SimpleFullName(t, sb);
           sb.Append(", ");
         }

trunk/sources/HeuristicLab.Persistence.Test/NewSerializationTest.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.Persistence.Interfaces;
-using HeuristicLab.Persistence.Default.ViewOnly;
 using HeuristicLab.Tracing;
 using log4net;
 using log4net.Config;
+using HeuristicLab.Persistence.Default.ViewOnly;
 
 namespace HeuristicLab.Persistence.Test {
@@ -273 +273 @@
       Console.WriteLine(ViewOnlyGenerator.Serialize(o));
     }
+
+    public static void Test9() {
+      Root r = new Root();
+      //BinaryGenerator.Serialize(r, "test.bin");
+    }
     
     class Float {
@@ -279 +284 @@
     }
 
-    public static void Test9() {            
+    public static void Test10() {            
       XmlGenerator.Serialize(12.3f, "test9.zip");
       object o = XmlParser.DeSerialize("test9.zip");
@@ -299 +304 @@
       Test8();
       Test9();
+      Test10();
       //SpeedTest();
       //SpeedTest2();