Changeset 1660 for trunk/sources/HeuristicLab.Persistence/3.3/Core

Timestamp:

04/24/09 15:58:19 (16 years ago)

Author:

epitzer

Message:

Display a MessageBox if persistence application settings are corrupted. (#548)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs (modified) (1 diff)

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

@@ -37 +37 @@
     }
 
-    protected void LoadSettings() {
+    public void LoadSettings() {
+      LoadSettings(false);
+    }
+
+    public void LoadSettings(bool throwOnError) {
       try {
-        if (String.IsNullOrEmpty(Properties.Settings.Default.CustomConfigurations) ||
+        TryLoadSettings();
+      } catch (Exception e) {
+        if (throwOnError) {
+          throw new PersistenceException("Could not load persistence settings.", e);
+        } else {
+          Logger.Warn("Could not load settings.", e);
+        }
+      }      
+    }
+
+    protected void TryLoadSettings() {
+      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;
-        }
-      } catch (Exception e) {
-        Logger.Warn("Could not load settings.", e);
+        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;
       }
     }