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

Timestamp:

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

Author:

epitzer

Message:

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

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs (modified) (5 diffs)

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