Changeset 1406 for branches/New Persistence Exploration/Persistence/Persistence

Timestamp:

03/24/09 17:04:02 (15 years ago)

Author:

epitzer

Message:

Incorporate settings infrastructure. (#506)

Location:

branches/New Persistence Exploration/Persistence/Persistence

Files:

• Core/Configuration.cs (modified) (3 diffs)
• Core/ConfigurationService.cs (modified) (4 diffs)
• HeuristicLab.Persistence.csproj (modified) (4 diffs)

branches/New Persistence Exploration/Persistence/Persistence/Core/Configuration.cs

@@ -1 +1 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Interfaces;
@@ -8 +7 @@
   public class Configuration {
 
+    [Storable]
     private readonly Dictionary<Type, IFormatter> formatters;
+    [Storable]
     private readonly List<IDecomposer> decomposers;
     private readonly Dictionary<Type, IDecomposer> decomposerCache;
+    [Storable]
     public readonly IFormat Format;
+
+    private Configuration() {}
 
     public Configuration(Dictionary<Type, IFormatter> formatters, IEnumerable<IDecomposer> decomposers) {      
@@ -27 +31 @@
     }
 
-    public IEnumerable Formatters {
+    public IEnumerable<IFormatter> Formatters {
       get { return formatters.Values; }
     }

branches/New Persistence Exploration/Persistence/Persistence/Core/ConfigurationService.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Text;
+using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.Persistence.Interfaces;
 
@@ -9 +14 @@
 
     private static ConfigurationService instance;
-    private Dictionary<IFormat, Configuration> customConfigurations;
+    private readonly Dictionary<IFormat, Configuration> customConfigurations;
     public readonly Dictionary<IFormat, List<IFormatter>> Formatters;
     public readonly List<IDecomposer> Decomposers;
@@ -24 +29 @@
       Formatters = new Dictionary<IFormat, List<IFormatter>>();
       Decomposers = new List<IDecomposer>();
-      customConfigurations = new Dictionary<IFormat, Configuration>();
+      customConfigurations = new Dictionary<IFormat, Configuration>();      
       Reset();
+      LoadSettings();
+    }
+
+    public void LoadSettings() {
+      if ( String.IsNullOrEmpty(Properties.Settings.Default.customConfigurations) ||
+        String.IsNullOrEmpty(Properties.Settings.Default.customConfigurationsTypeCache) )
+        return;
+      DeSerializer deSerializer = new DeSerializer(
+        XmlParser.ParseTypeCache(
+        new StringReader(
+          Properties.Settings.Default.customConfigurationsTypeCache)));
+      XmlParser parser = new XmlParser(
+        new StringReader(
+          Properties.Settings.Default.customConfigurations));
+      var newCustomConfigurations = (Dictionary<IFormat, Configuration>)
+        deSerializer.DeSerialize(parser);      
+      foreach ( var config in newCustomConfigurations ) {
+        customConfigurations[config.Key] = config.Value;
+      }
+    }
+
+    public void SaveSettings() {      
+      Serializer serializer = new Serializer(
+        customConfigurations,
+        GetDefaultConfig(XmlFormat.Instance),
+        "CustomConfigurations");
+      XmlGenerator generator = new XmlGenerator();
+      StringBuilder configurationString = new StringBuilder();
+      foreach (ISerializationToken token in serializer) {
+        configurationString.Append(generator.Format(token));
+      }
+      StringBuilder configurationTypeCacheString = new StringBuilder();
+      foreach (string s in generator.Format(serializer.TypeCache))
+        configurationTypeCacheString.Append(s);
+      Properties.Settings.Default.customConfigurations =
+        configurationString.ToString();
+      Properties.Settings.Default.customConfigurationsTypeCache =
+        configurationTypeCacheString.ToString();
+      Properties.Settings.Default.Save();
     }
 
     public void Reset() {      
       customConfigurations.Clear();
+      Formatters.Clear();
+      Decomposers.Clear();
       Assembly defaultAssembly = Assembly.GetExecutingAssembly();
       DiscoverFrom(defaultAssembly);
@@ -77 +123 @@
     public void DefineConfiguration(IFormat format, Configuration configuration) {
       customConfigurations[format] = configuration;
+      SaveSettings();
     }
 

branches/New Persistence Exploration/Persistence/Persistence/HeuristicLab.Persistence.csproj

@@ -45 +45 @@
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -60 +61 @@
     <Compile Include="Default\Decomposers\KeyValuePairDecomposer.cs" />
     <Compile Include="Default\Decomposers\DictionaryDecomposer.cs" />
+    <Compile Include="Default\Decomposers\TypeDecomposer.cs" />
     <Compile Include="Default\Xml\Compact\IntArray2XmlFormatters.cs" />
     <Compile Include="Default\Xml\Compact\DoubleArray2XmlFormatters.cs" />
@@ -81 +83 @@
     <Compile Include="Core\Serializer.cs" />
     <Compile Include="Interfaces\Tokens.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="Util.cs" />
     <Compile Include="Core\StorableAttribute.cs" />
@@ -97 +104 @@
   </PropertyGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="HeuristicLab.snk" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>