Some code cleanups from Manoochehr Mojgani

lovettchris · lovettchris · commit 41e997640cab · 2021-10-27T13:10:15.000-07:00
diff --git a/src/Application/FormMain.cs b/src/Application/FormMain.cs
@@ -48,10 +48,13 @@ public partial class FormMain : Form, ISite
 
         public FormMain()
         {
-            this._settings = new Settings();
-            this._settings.StartupPath = Application.StartupPath;
-            this._settings.ExecutablePath = Application.ExecutablePath;
-            this._settings.Resolver = new XmlProxyResolver(this);
+            this.DoubleBuffered = true;
+            this._settings = new Settings()
+            {
+                StartupPath = Application.StartupPath,
+                ExecutablePath = Application.ExecutablePath,
+                Resolver = new XmlProxyResolver(this)
+            };
 
             this._delayedActions = _settings.DelayedActions = new DelayedActions((action) =>
             {
@@ -184,10 +187,10 @@ private async System.Threading.Tasks.Task AsyncSetup()
             // install Xml notepad as an available editor for .xml files.
             FileAssociation.AddXmlProgids(Application.ExecutablePath);
 
-            CheckNetwork();
+            await CheckNetwork();
         }
 
-        private void CheckNetwork()
+        private async System.Threading.Tasks.Task CheckNetwork()
         {
             if (System.Net.NetworkInformation.NetworkInterface.GetIsNetworkAvailable())
             {
@@ -196,7 +199,7 @@ private void CheckNetwork()
                     client.UseDefaultCredentials = true;
                     try
                     {
-                        string html = client.DownloadString(Utilities.HelpBaseUri);
+                        string html = await client.DownloadStringTaskAsync(Utilities.HelpBaseUri);
                         if (html.Contains("XML Notepad"))
                         {
                             this.BeginInvoke(new Action(FoundOnlineHelp));
diff --git a/src/Model/SchemaCache.cs b/src/Model/SchemaCache.cs
@@ -602,7 +602,7 @@ public void ReadXml(XmlReader r)
                         bool.TryParse(s, out disabled);
                     }
                     string filename = r.ReadString();
-                    this.Add(nsuri, pfn.GetAbsoluteFilename(filename), disabled);
+                    this.Add(nsuri, pfn.GetAbsoluteFileName(filename), disabled);
                 }
             }
         }
diff --git a/src/Model/Settings.cs b/src/Model/Settings.cs
@@ -40,11 +40,11 @@ public enum ColorTheme
     public class Settings : IDisposable
     {
         private static Settings _instance;
-        private string filename;
-        private FileSystemWatcher watcher;
-        private Hashtable map = new Hashtable();
-        private System.Threading.Timer timer;
-        private PersistentFileNames pfn;
+        private string _filename;
+        private FileSystemWatcher _watcher;
+        private Hashtable _map = new Hashtable();
+        private System.Threading.Timer _timer;
+        private PersistentFileNames _pfn;
 
         public static string DefaultUpdateLocation = "https://lovettsoftwarestorage.blob.core.windows.net/downloads/XmlNotepad/Updates.xml";
 
@@ -103,10 +103,10 @@ public static Settings Instance
         /// </summary>
         public void StopWatchingFileChanges()
         {
-            if (this.watcher != null)
+            if (this._watcher != null)
             {
-                this.watcher.Dispose();
-                this.watcher = null;
+                this._watcher.Dispose();
+                this._watcher = null;
             }
         }
 
@@ -135,12 +135,12 @@ public void OnChanged(string name)
         /// <returns>The setting value or null if not found.</returns>
         public object this[string name]
         {
-            get { return this.map[name]; }
+            get { return this._map[name]; }
             set
             {
-                if (this.map[name] != value)
+                if (this._map[name] != value)
                 {
-                    this.map[name] = value;
+                    this._map[name] = value;
                     OnChanged(name);
                 }
             }
@@ -151,7 +151,7 @@ public object this[string name]
         /// </summary>
         public void Reload()
         {
-            Load(this.filename);
+            Load(this._filename);
         }
 
         /// <summary>
@@ -161,7 +161,7 @@ public void Reload()
         /// <param name="filename">XmlNotepad settings xml file.</param>
         public void Load(string filename)
         {
-            pfn = new PersistentFileNames(Settings.Instance.StartupPath);
+            _pfn = new PersistentFileNames(Settings.Instance.StartupPath);
 
             // we don't use the serializer because it's too slow to fire up.
             try
@@ -175,7 +175,7 @@ public void Load(string filename)
                             if (r.NodeType == XmlNodeType.Element)
                             {
                                 string name = r.Name;
-                                object o = map[name];
+                                object o = _map[name];
                                 if (o != null)
                                 {
                                     object value = null;
@@ -219,20 +219,20 @@ public void Load(string filename)
 
         public string FileName
         {
-            get { return this.filename; }
+            get { return this._filename; }
             set
             {
-                if (this.filename != value)
+                if (this._filename != value)
                 {
-                    this.filename = value;
+                    this._filename = value;
 
                     StopWatchingFileChanges();
 
-                    this.watcher = new FileSystemWatcher(Path.GetDirectoryName(filename),
-                        Path.GetFileName(filename));
+                    this._watcher = new FileSystemWatcher(Path.GetDirectoryName(_filename),
+                        Path.GetFileName(_filename));
 
-                    this.watcher.Changed += new FileSystemEventHandler(watcher_Changed);
-                    this.watcher.EnableRaisingEvents = true;
+                    this._watcher.Changed += new FileSystemEventHandler(watcher_Changed);
+                    this._watcher.EnableRaisingEvents = true;
                 }
             }
         }
@@ -241,7 +241,7 @@ string ConvertToString(object value)
         {
             if (value is Uri)
             {
-                return pfn.GetPersistentFileName((Uri)value);
+                return _pfn.GetPersistentFileName((Uri)value);
             }
             else if (value is string)
             {
@@ -263,7 +263,7 @@ object ConvertToType(string value, Type type)
         {
             if (type == typeof(Uri))
             {
-                return pfn.GetAbsoluteFilename(value);
+                return _pfn.GetAbsoluteFileName(value);
             }
             else if (type == typeof(string))
             {
@@ -294,9 +294,9 @@ public void Save(string filename)
                 {
                     w.Formatting = Formatting.Indented;
                     w.WriteStartElement("Settings");
-                    foreach (string key in map.Keys)
+                    foreach (string key in _map.Keys)
                     {
-                        object value = map[key];
+                        object value = _map[key];
                         if (value != null)
                         {
                             if (value is Hashtable)
@@ -418,19 +418,19 @@ private void watcher_Changed(object sender, FileSystemEventArgs e)
             // events and we don't want to have lots of dialogs popping up asking the
             // user to reload settings, so we insert a delay to let the events
             // settle down, then we tell the hosting app that the settings have changed.
-            if (e.ChangeType == WatcherChangeTypes.Changed && this.timer == null)
+            if (e.ChangeType == WatcherChangeTypes.Changed && this._timer == null)
             {
-                this.timer = new System.Threading.Timer(new TimerCallback(OnDelay), this, 2000, Timeout.Infinite);
+                this._timer = new System.Threading.Timer(new TimerCallback(OnDelay), this, 2000, Timeout.Infinite);
             }
         }
 
         void OnDelay(object state)
         {
             OnChanged("File");
-            if (this.timer != null)
+            if (this._timer != null)
             {
-                this.timer.Dispose();
-                this.timer = null;
+                this._timer.Dispose();
+                this._timer = null;
             }
         }
 
@@ -447,11 +447,11 @@ public void Dispose()
         protected virtual void Dispose(bool disposing)
         {
             this.StopWatchingFileChanges();
-            if (this.timer != null)
+            if (this._timer != null)
             {
-                this.timer.Dispose();
+                this._timer.Dispose();
             }
-            this.timer = null;
+            this._timer = null;
             GC.SuppressFinalize(this);
         }
 
@@ -461,31 +461,19 @@ protected virtual void Dispose(bool disposing)
         public bool GetBoolean(string settingName, bool defaultValue = false)
         {
             object settingValue = this[settingName];
-            if (settingValue is bool)
-            {
-                return (bool)settingValue;
-            }
-            return defaultValue;
+            return settingValue is bool value ? value : defaultValue;
         }
 
         public int GetInteger(string settingName, int defaultValue = 0)
         {
             object settingValue = this[settingName];
-            if (settingValue is int)
-            {
-                return (int)settingValue;
-            }
-            return defaultValue;
+            return settingValue is int value ? value : defaultValue;
         }
 
         public string GetString(string settingName, string defaultValue = "")
         {
             object settingValue = this[settingName];
-            if (settingValue != null)
-            {
-                return settingValue.ToString();
-            }
-            return defaultValue;
+            return settingValue != null ? settingValue.ToString() : defaultValue;
         }
 
         public Hashtable GetDefaultColors(ColorTheme theme)
@@ -551,14 +539,14 @@ public void AddDefaultColors(string name, ColorTheme theme)
     /// </summary>
     class PersistentFileNames
     {
-        Hashtable variables = new Hashtable();
+        private readonly Hashtable _variables = new Hashtable();
 
         public PersistentFileNames(string startupPath)
         {
-            variables["StartupPath"] = startupPath;
-            variables["ProgramFiles"] = Environment.GetEnvironmentVariable("ProgramFiles");
-            variables["UserProfile"] = Environment.GetEnvironmentVariable("UserProfile");
-            variables["SystemRoot"] = Environment.GetEnvironmentVariable("SystemRoot");
+            _variables["StartupPath"] = startupPath;
+            _variables["ProgramFiles"] = Environment.GetEnvironmentVariable("ProgramFiles");
+            _variables["UserProfile"] = Environment.GetEnvironmentVariable("UserProfile");
+            _variables["SystemRoot"] = Environment.GetEnvironmentVariable("SystemRoot");
         }
 
         public string GetPersistentFileName(Uri uri)
@@ -574,9 +562,9 @@ public string GetPersistentFileName(Uri uri)
                     return null;
 
                 // replace absolute paths with variables.
-                foreach (string key in variables.Keys)
+                foreach (string key in _variables.Keys)
                 {
-                    string baseDir = (string)variables[key];
+                    string baseDir = (string)_variables[key];
                     if (!baseDir.EndsWith(Path.DirectorySeparatorChar.ToString()))
                         baseDir += Path.DirectorySeparatorChar;
                     Uri baseUri = new Uri(baseDir);
@@ -602,17 +590,17 @@ public string GetPersistentFileName(Uri uri)
             return result;
         }
 
-        public Uri GetAbsoluteFilename(string filename)
+        public Uri GetAbsoluteFileName(string filename)
         {
             try
             {
                 // replace variables with absolute paths.
-                foreach (string key in variables.Keys)
+                foreach (string key in _variables.Keys)
                 {
                     string var = "%" + key + "%";
                     if (filename.StartsWith(var, StringComparison.CurrentCultureIgnoreCase))
                     {
-                        string baseDir = (string)variables[key];
+                        string baseDir = (string)_variables[key];
                         string relPath = filename.Substring(var.Length);
                         if (!baseDir.EndsWith(Path.DirectorySeparatorChar.ToString()))
                             baseDir += Path.DirectorySeparatorChar;
diff --git a/src/XmlNotepad/XsltViewer.cs b/src/XmlNotepad/XsltViewer.cs
@@ -109,7 +109,7 @@ public void DisplayXsltResults()
                 output = this._model.XsltDefaultOutput;
             }
             output = this.xsltControl.DisplayXsltResults(this._model.Document, xpath, output);
-            if (!string.IsNullOrEmpty(output))
+            if (!string.IsNullOrWhiteSpace(output))
             {
                 this.OutputFileName.Text = MakeRelative(output);
             }

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,13 @@ public partial class FormMain : Form, ISite`
`48`	`48`
`49`	`49`	`public FormMain()`
`50`	`50`	`{`
`51`		`- this._settings = new Settings();`
`52`		`- this._settings.StartupPath = Application.StartupPath;`
`53`		`- this._settings.ExecutablePath = Application.ExecutablePath;`
`54`		`- this._settings.Resolver = new XmlProxyResolver(this);`
	`51`	`+ this.DoubleBuffered = true;`
	`52`	`+ this._settings = new Settings()`
	`53`	`+ {`
	`54`	`+ StartupPath = Application.StartupPath,`
	`55`	`+ ExecutablePath = Application.ExecutablePath,`
	`56`	`+ Resolver = new XmlProxyResolver(this)`
	`57`	`+ };`
`55`	`58`
`56`	`59`	`this._delayedActions = _settings.DelayedActions = new DelayedActions((action) =>`
`57`	`60`	`{`
`@@ -184,10 +187,10 @@ private async System.Threading.Tasks.Task AsyncSetup()`
`184`	`187`	`// install Xml notepad as an available editor for .xml files.`
`185`	`188`	`FileAssociation.AddXmlProgids(Application.ExecutablePath);`
`186`	`189`
`187`		`- CheckNetwork();`
	`190`	`+ await CheckNetwork();`
`188`	`191`	`}`
`189`	`192`
`190`		`- private void CheckNetwork()`
	`193`	`+ private async System.Threading.Tasks.Task CheckNetwork()`
`191`	`194`	`{`
`192`	`195`	`if (System.Net.NetworkInformation.NetworkInterface.GetIsNetworkAvailable())`
`193`	`196`	`{`
`@@ -196,7 +199,7 @@ private void CheckNetwork()`
`196`	`199`	`client.UseDefaultCredentials = true;`
`197`	`200`	`try`
`198`	`201`	`{`
`199`		`- string html = client.DownloadString(Utilities.HelpBaseUri);`
	`202`	`+ string html = await client.DownloadStringTaskAsync(Utilities.HelpBaseUri);`
`200`	`203`	`if (html.Contains("XML Notepad"))`
`201`	`204`	`{`
`202`	`205`	`this.BeginInvoke(new Action(FoundOnlineHelp));`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ public void ReadXml(XmlReader r)`
`602`	`602`	`bool.TryParse(s, out disabled);`
`603`	`603`	`}`
`604`	`604`	`string filename = r.ReadString();`
`605`		`- this.Add(nsuri, pfn.GetAbsoluteFilename(filename), disabled);`
	`605`	`+ this.Add(nsuri, pfn.GetAbsoluteFileName(filename), disabled);`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ public enum ColorTheme`
`40`	`40`	`public class Settings : IDisposable`
`41`	`41`	`{`
`42`	`42`	`private static Settings _instance;`
`43`		`- private string filename;`
`44`		`- private FileSystemWatcher watcher;`
`45`		`- private Hashtable map = new Hashtable();`
`46`		`- private System.Threading.Timer timer;`
`47`		`- private PersistentFileNames pfn;`
	`43`	`+ private string _filename;`
	`44`	`+ private FileSystemWatcher _watcher;`
	`45`	`+ private Hashtable _map = new Hashtable();`
	`46`	`+ private System.Threading.Timer _timer;`
	`47`	`+ private PersistentFileNames _pfn;`
`48`	`48`
`49`	`49`	`public static string DefaultUpdateLocation = "https://lovettsoftwarestorage.blob.core.windows.net/downloads/XmlNotepad/Updates.xml";`
`50`	`50`
`@@ -103,10 +103,10 @@ public static Settings Instance`
`103`	`103`	`/// </summary>`
`104`	`104`	`public void StopWatchingFileChanges()`
`105`	`105`	`{`
`106`		`- if (this.watcher != null)`
	`106`	`+ if (this._watcher != null)`
`107`	`107`	`{`
`108`		`- this.watcher.Dispose();`
`109`		`- this.watcher = null;`
	`108`	`+ this._watcher.Dispose();`
	`109`	`+ this._watcher = null;`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -135,12 +135,12 @@ public void OnChanged(string name)`
`135`	`135`	`/// <returns>The setting value or null if not found.</returns>`
`136`	`136`	`public object this[string name]`
`137`	`137`	`{`
`138`		`- get { return this.map[name]; }`
	`138`	`+ get { return this._map[name]; }`
`139`	`139`	`set`
`140`	`140`	`{`
`141`		`- if (this.map[name] != value)`
	`141`	`+ if (this._map[name] != value)`
`142`	`142`	`{`
`143`		`- this.map[name] = value;`
	`143`	`+ this._map[name] = value;`
`144`	`144`	`OnChanged(name);`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -151,7 +151,7 @@ public object this[string name]`
`151`	`151`	`/// </summary>`
`152`	`152`	`public void Reload()`
`153`	`153`	`{`
`154`		`- Load(this.filename);`
	`154`	`+ Load(this._filename);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`/// <summary>`
`@@ -161,7 +161,7 @@ public void Reload()`
`161`	`161`	`/// <param name="filename">XmlNotepad settings xml file.</param>`
`162`	`162`	`public void Load(string filename)`
`163`	`163`	`{`
`164`		`- pfn = new PersistentFileNames(Settings.Instance.StartupPath);`
	`164`	`+ _pfn = new PersistentFileNames(Settings.Instance.StartupPath);`
`165`	`165`
`166`	`166`	`// we don't use the serializer because it's too slow to fire up.`
`167`	`167`	`try`
`@@ -175,7 +175,7 @@ public void Load(string filename)`
`175`	`175`	`if (r.NodeType == XmlNodeType.Element)`
`176`	`176`	`{`
`177`	`177`	`string name = r.Name;`
`178`		`- object o = map[name];`
	`178`	`+ object o = _map[name];`
`179`	`179`	`if (o != null)`
`180`	`180`	`{`
`181`	`181`	`object value = null;`
`@@ -219,20 +219,20 @@ public void Load(string filename)`
`219`	`219`
`220`	`220`	`public string FileName`
`221`	`221`	`{`
`222`		`- get { return this.filename; }`
	`222`	`+ get { return this._filename; }`
`223`	`223`	`set`
`224`	`224`	`{`
`225`		`- if (this.filename != value)`
	`225`	`+ if (this._filename != value)`
`226`	`226`	`{`
`227`		`- this.filename = value;`
	`227`	`+ this._filename = value;`
`228`	`228`
`229`	`229`	`StopWatchingFileChanges();`
`230`	`230`
`231`		`- this.watcher = new FileSystemWatcher(Path.GetDirectoryName(filename),`
`232`		`- Path.GetFileName(filename));`
	`231`	`+ this._watcher = new FileSystemWatcher(Path.GetDirectoryName(_filename),`
	`232`	`+ Path.GetFileName(_filename));`
`233`	`233`
`234`		`- this.watcher.Changed += new FileSystemEventHandler(watcher_Changed);`
`235`		`- this.watcher.EnableRaisingEvents = true;`
	`234`	`+ this._watcher.Changed += new FileSystemEventHandler(watcher_Changed);`
	`235`	`+ this._watcher.EnableRaisingEvents = true;`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`}`
`@@ -241,7 +241,7 @@ string ConvertToString(object value)`
`241`	`241`	`{`
`242`	`242`	`if (value is Uri)`
`243`	`243`	`{`
`244`		`- return pfn.GetPersistentFileName((Uri)value);`
	`244`	`+ return _pfn.GetPersistentFileName((Uri)value);`
`245`	`245`	`}`
`246`	`246`	`else if (value is string)`
`247`	`247`	`{`
`@@ -263,7 +263,7 @@ object ConvertToType(string value, Type type)`
`263`	`263`	`{`
`264`	`264`	`if (type == typeof(Uri))`
`265`	`265`	`{`
`266`		`- return pfn.GetAbsoluteFilename(value);`
	`266`	`+ return _pfn.GetAbsoluteFileName(value);`
`267`	`267`	`}`
`268`	`268`	`else if (type == typeof(string))`
`269`	`269`	`{`
`@@ -294,9 +294,9 @@ public void Save(string filename)`
`294`	`294`	`{`
`295`	`295`	`w.Formatting = Formatting.Indented;`
`296`	`296`	`w.WriteStartElement("Settings");`
`297`		`- foreach (string key in map.Keys)`
	`297`	`+ foreach (string key in _map.Keys)`
`298`	`298`	`{`
`299`		`- object value = map[key];`
	`299`	`+ object value = _map[key];`
`300`	`300`	`if (value != null)`
`301`	`301`	`{`
`302`	`302`	`if (value is Hashtable)`
`@@ -418,19 +418,19 @@ private void watcher_Changed(object sender, FileSystemEventArgs e)`
`418`	`418`	`// events and we don't want to have lots of dialogs popping up asking the`
`419`	`419`	`// user to reload settings, so we insert a delay to let the events`
`420`	`420`	`// settle down, then we tell the hosting app that the settings have changed.`
`421`		`- if (e.ChangeType == WatcherChangeTypes.Changed && this.timer == null)`
	`421`	`+ if (e.ChangeType == WatcherChangeTypes.Changed && this._timer == null)`
`422`	`422`	`{`
`423`		`- this.timer = new System.Threading.Timer(new TimerCallback(OnDelay), this, 2000, Timeout.Infinite);`
	`423`	`+ this._timer = new System.Threading.Timer(new TimerCallback(OnDelay), this, 2000, Timeout.Infinite);`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`void OnDelay(object state)`
`428`	`428`	`{`
`429`	`429`	`OnChanged("File");`
`430`		`- if (this.timer != null)`
	`430`	`+ if (this._timer != null)`
`431`	`431`	`{`
`432`		`- this.timer.Dispose();`
`433`		`- this.timer = null;`
	`432`	`+ this._timer.Dispose();`
	`433`	`+ this._timer = null;`
`434`	`434`	`}`
`435`	`435`	`}`
`436`	`436`
`@@ -447,11 +447,11 @@ public void Dispose()`
`447`	`447`	`protected virtual void Dispose(bool disposing)`
`448`	`448`	`{`
`449`	`449`	`this.StopWatchingFileChanges();`
`450`		`- if (this.timer != null)`
	`450`	`+ if (this._timer != null)`
`451`	`451`	`{`
`452`		`- this.timer.Dispose();`
	`452`	`+ this._timer.Dispose();`
`453`	`453`	`}`
`454`		`- this.timer = null;`
	`454`	`+ this._timer = null;`
`455`	`455`	`GC.SuppressFinalize(this);`
`456`	`456`	`}`
`457`	`457`
`@@ -461,31 +461,19 @@ protected virtual void Dispose(bool disposing)`
`461`	`461`	`public bool GetBoolean(string settingName, bool defaultValue = false)`
`462`	`462`	`{`
`463`	`463`	`object settingValue = this[settingName];`
`464`		`- if (settingValue is bool)`
`465`		`- {`
`466`		`- return (bool)settingValue;`
`467`		`- }`
`468`		`- return defaultValue;`
	`464`	`+ return settingValue is bool value ? value : defaultValue;`
`469`	`465`	`}`
`470`	`466`
`471`	`467`	`public int GetInteger(string settingName, int defaultValue = 0)`
`472`	`468`	`{`
`473`	`469`	`object settingValue = this[settingName];`
`474`		`- if (settingValue is int)`
`475`		`- {`
`476`		`- return (int)settingValue;`
`477`		`- }`
`478`		`- return defaultValue;`
	`470`	`+ return settingValue is int value ? value : defaultValue;`
`479`	`471`	`}`
`480`	`472`
`481`	`473`	`public string GetString(string settingName, string defaultValue = "")`
`482`	`474`	`{`
`483`	`475`	`object settingValue = this[settingName];`
`484`		`- if (settingValue != null)`
`485`		`- {`
`486`		`- return settingValue.ToString();`
`487`		`- }`
`488`		`- return defaultValue;`
	`476`	`+ return settingValue != null ? settingValue.ToString() : defaultValue;`
`489`	`477`	`}`
`490`	`478`
`491`	`479`	`public Hashtable GetDefaultColors(ColorTheme theme)`
`@@ -551,14 +539,14 @@ public void AddDefaultColors(string name, ColorTheme theme)`
`551`	`539`	`/// </summary>`
`552`	`540`	`class PersistentFileNames`
`553`	`541`	`{`
`554`		`- Hashtable variables = new Hashtable();`
	`542`	`+ private readonly Hashtable _variables = new Hashtable();`
`555`	`543`
`556`	`544`	`public PersistentFileNames(string startupPath)`
`557`	`545`	`{`
`558`		`- variables["StartupPath"] = startupPath;`
`559`		`- variables["ProgramFiles"] = Environment.GetEnvironmentVariable("ProgramFiles");`
`560`		`- variables["UserProfile"] = Environment.GetEnvironmentVariable("UserProfile");`
`561`		`- variables["SystemRoot"] = Environment.GetEnvironmentVariable("SystemRoot");`
	`546`	`+ _variables["StartupPath"] = startupPath;`
	`547`	`+ _variables["ProgramFiles"] = Environment.GetEnvironmentVariable("ProgramFiles");`
	`548`	`+ _variables["UserProfile"] = Environment.GetEnvironmentVariable("UserProfile");`
	`549`	`+ _variables["SystemRoot"] = Environment.GetEnvironmentVariable("SystemRoot");`
`562`	`550`	`}`
`563`	`551`
`564`	`552`	`public string GetPersistentFileName(Uri uri)`
`@@ -574,9 +562,9 @@ public string GetPersistentFileName(Uri uri)`
`574`	`562`	`return null;`
`575`	`563`
`576`	`564`	`// replace absolute paths with variables.`
`577`		`- foreach (string key in variables.Keys)`
	`565`	`+ foreach (string key in _variables.Keys)`
`578`	`566`	`{`
`579`		`- string baseDir = (string)variables[key];`
	`567`	`+ string baseDir = (string)_variables[key];`
`580`	`568`	`if (!baseDir.EndsWith(Path.DirectorySeparatorChar.ToString()))`
`581`	`569`	`baseDir += Path.DirectorySeparatorChar;`
`582`	`570`	`Uri baseUri = new Uri(baseDir);`
`@@ -602,17 +590,17 @@ public string GetPersistentFileName(Uri uri)`
`602`	`590`	`return result;`
`603`	`591`	`}`
`604`	`592`
`605`		`- public Uri GetAbsoluteFilename(string filename)`
	`593`	`+ public Uri GetAbsoluteFileName(string filename)`
`606`	`594`	`{`
`607`	`595`	`try`
`608`	`596`	`{`
`609`	`597`	`// replace variables with absolute paths.`
`610`		`- foreach (string key in variables.Keys)`
	`598`	`+ foreach (string key in _variables.Keys)`
`611`	`599`	`{`
`612`	`600`	`string var = "%" + key + "%";`
`613`	`601`	`if (filename.StartsWith(var, StringComparison.CurrentCultureIgnoreCase))`
`614`	`602`	`{`
`615`		`- string baseDir = (string)variables[key];`
	`603`	`+ string baseDir = (string)_variables[key];`
`616`	`604`	`string relPath = filename.Substring(var.Length);`
`617`	`605`	`if (!baseDir.EndsWith(Path.DirectorySeparatorChar.ToString()))`
`618`	`606`	`baseDir += Path.DirectorySeparatorChar;`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void DisplayXsltResults()`
`109`	`109`	`output = this._model.XsltDefaultOutput;`
`110`	`110`	`}`
`111`	`111`	`output = this.xsltControl.DisplayXsltResults(this._model.Document, xpath, output);`
`112`		`- if (!string.IsNullOrEmpty(output))`
	`112`	`+ if (!string.IsNullOrWhiteSpace(output))`
`113`	`113`	`{`
`114`	`114`	`this.OutputFileName.Text = MakeRelative(output);`
`115`	`115`	`}`