diff --git a/Configuration/SystemConfig.cs b/Configuration/SystemConfig.cs index 13e7998f..a959c410 100644 --- a/Configuration/SystemConfig.cs +++ b/Configuration/SystemConfig.cs @@ -31,13 +31,11 @@ private SystemConfig(string file){ this.file = file; } - public bool Save(){ + public void Save(){ try{ Serializer.Write(file, this); - return true; }catch(Exception e){ Program.Reporter.HandleException("Configuration Error", "Could not save the system configuration file.", true, e); - return false; } } diff --git a/Configuration/UserConfig.cs b/Configuration/UserConfig.cs index 06bdec1a..5c43c2b7 100644 --- a/Configuration/UserConfig.cs +++ b/Configuration/UserConfig.cs @@ -140,7 +140,7 @@ private UserConfig(string file){ this.file = file; } - public bool Save(){ + public void Save(){ try{ if (File.Exists(file)){ string backupFile = GetBackupFile(file); @@ -149,29 +149,23 @@ public bool Save(){ } Serializer.Write(file, this); - return true; }catch(Exception e){ Program.Reporter.HandleException("Configuration Error", "Could not save the configuration file.", true, e); - return false; } } - public bool Reload(){ + public void Reload(){ try{ LoadInternal(false); - return true; }catch(FileNotFoundException){ try{ Serializer.Write(file, new UserConfig(file)); LoadInternal(false); - return true; }catch(Exception e){ Program.Reporter.HandleException("Configuration Error", "Could not regenerate configuration file.", true, e); - return false; } }catch(Exception e){ Program.Reporter.HandleException("Configuration Error", "Could not reload configuration file.", true, e); - return false; } } diff --git a/Core/Other/Analytics/AnalyticsFile.cs b/Core/Other/Analytics/AnalyticsFile.cs index c9cf7f74..35e99daf 100644 --- a/Core/Other/Analytics/AnalyticsFile.cs +++ b/Core/Other/Analytics/AnalyticsFile.cs @@ -26,13 +26,11 @@ private AnalyticsFile(string file){ this.file = file; } - public bool Save(){ + public void Save(){ try{ Serializer.Write(file, this); - return true; }catch(Exception e){ Program.Reporter.HandleException("Analytics File Error", "Could not save the analytics file.", true, e); - return false; } } diff --git a/Plugins/PluginConfig.cs b/Plugins/PluginConfig.cs index 9537ae7e..a35b2730 100644 --- a/Plugins/PluginConfig.cs +++ b/Plugins/PluginConfig.cs @@ -32,6 +32,20 @@ public bool IsEnabled(Plugin plugin){ return !disabled.Contains(plugin.Identifier); } + public void Save(string file){ + try{ + using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){ + writer.WriteLine("#Disabled"); + + foreach(string identifier in disabled){ + writer.WriteLine(identifier); + } + } + }catch(Exception e){ + Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e); + } + } + public void Load(string file){ try{ using(StreamReader reader = new StreamReader(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)){ @@ -54,19 +68,5 @@ public void Load(string file){ Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e); } } - - public void Save(string file){ - try{ - using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){ - writer.WriteLine("#Disabled"); - - foreach(string identifier in disabled){ - writer.WriteLine(identifier); - } - } - }catch(Exception e){ - Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e); - } - } } } diff --git a/tests/Configuration/TestUserConfig.cs b/tests/Configuration/TestUserConfig.cs index af68e553..da9160d3 100644 --- a/tests/Configuration/TestUserConfig.cs +++ b/tests/Configuration/TestUserConfig.cs @@ -76,7 +76,7 @@ public void TestReload(){ cfg.Save(); cfg.ZoomLevel = 200; - Assert.IsTrue(cfg.Reload()); + cfg.Reload(); Assert.AreEqual(123, cfg.ZoomLevel); } @@ -87,7 +87,7 @@ public void TestReset(){ cfg.Save(); File.Delete("reset"); - Assert.IsTrue(cfg.Reload()); + cfg.Reload(); Assert.AreEqual(100, cfg.ZoomLevel); Assert.IsTrue(File.Exists("reset")); }