From e22e3967f512be563f35482686b3c89ac760e61a Mon Sep 17 00:00:00 2001
From: Sean Kaim <sean.kaim@gmail.com>
Date: Mon, 29 Aug 2016 16:11:38 -0400
Subject: [PATCH] code cleanup

---
 mRemoteV1/Config/Settings/SettingsSaver.cs | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/mRemoteV1/Config/Settings/SettingsSaver.cs b/mRemoteV1/Config/Settings/SettingsSaver.cs
index 9200ff2d..1c78bd8d 100644
--- a/mRemoteV1/Config/Settings/SettingsSaver.cs
+++ b/mRemoteV1/Config/Settings/SettingsSaver.cs
@@ -3,17 +3,15 @@ using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-using mRemoteNG.App;
 using mRemoteNG.App.Info;
-using mRemoteNG.Messages;
-using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
+using static mRemoteNG.App.Runtime;
 
 namespace mRemoteNG.Config.Settings
 {
-    public class SettingsSaver
+    public static class SettingsSaver
     {
         public static void SaveSettings()
         {
@@ -74,12 +72,11 @@ namespace mRemoteNG.Config.Settings
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                    "Saving settings failed" + Environment.NewLine + Environment.NewLine + ex.Message, false);
+                MessageCollector.AddExceptionStackTrace("Saving settings failed", ex);
             }
         }
 
-        public static void SavePanelsToXML()
+        private static void SavePanelsToXML()
         {
             try
             {
@@ -92,8 +89,7 @@ namespace mRemoteNG.Config.Settings
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                    "SavePanelsToXML failed" + Environment.NewLine + Environment.NewLine + ex.Message, false);
+                MessageCollector.AddExceptionStackTrace("SavePanelsToXML failed", ex);
             }
         }
 
@@ -108,14 +104,16 @@ namespace mRemoteNG.Config.Settings
 
                 var xmlTextWriter =
                     new XmlTextWriter(SettingsFileInfo.SettingsPath + "\\" + SettingsFileInfo.ExtAppsFilesName,
-                        Encoding.UTF8);
-                xmlTextWriter.Formatting = Formatting.Indented;
-                xmlTextWriter.Indentation = 4;
+                        Encoding.UTF8)
+                    {
+                        Formatting = Formatting.Indented,
+                        Indentation = 4
+                    };
 
                 xmlTextWriter.WriteStartDocument();
                 xmlTextWriter.WriteStartElement("Apps");
 
-                foreach (ExternalTool extA in Runtime.ExternalTools)
+                foreach (ExternalTool extA in ExternalTools)
                 {
                     xmlTextWriter.WriteStartElement("App");
                     xmlTextWriter.WriteAttributeString("DisplayName", "", extA.DisplayName);
@@ -133,8 +131,7 @@ namespace mRemoteNG.Config.Settings
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                    "SaveExternalAppsToXML failed" + Environment.NewLine + Environment.NewLine + ex.Message, false);
+                MessageCollector.AddExceptionStackTrace("SaveExternalAppsToXML failed", ex);
             }
         }
     }