From df8f367c7bc515be7f5652338f1e64e6a9e6acd8 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 5 Feb 2020 14:36:35 -0800
Subject: Code cleanup

---
 .../WindowsInstaller/WindowsInstallerData.cs       | 67 ++++++++++++----------
 1 file changed, 36 insertions(+), 31 deletions(-)

(limited to 'src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs')

diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index 0855997c..ac593152 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -60,6 +60,42 @@ namespace WixToolset.Data.WindowsInstaller
         /// <value>Collection of tables.</value>
         public TableIndexedCollection Tables { get; private set; }
 
+        /// <summary>
+        /// Ensure this output contains a particular table.
+        /// </summary>
+        /// <param name="tableDefinition">Definition of the table that should exist.</param>
+        /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param>
+        /// <returns>The table in this output.</returns>
+        public Table EnsureTable(TableDefinition tableDefinition)
+        {
+            if (!this.Tables.TryGetTable(tableDefinition.Name, out var table))
+            {
+                table = new Table(tableDefinition);
+                this.Tables.Add(table);
+            }
+
+            return table;
+        }
+
+        /// <summary>
+        /// Saves an output to a <c>WixOutput</c> container.
+        /// </summary>
+        /// <param name="wixout">Container to save to.</param>
+        public void Save(WixOutput wixout)
+        {
+            using (var writer = XmlWriter.Create(wixout.CreateDataStream(WixOutputStreamName)))
+            {
+                writer.WriteStartDocument();
+                this.Write(writer);
+                writer.WriteEndDocument();
+            }
+        }
+
+        /// <summary>
+        /// Gets table by name.
+        /// </summary>
+        public bool TryGetTable(string tableName, out Table table) => this.Tables.TryGetTable(tableName, out table);
+
         /// <summary>
         /// Loads an output from a path on disk.
         /// </summary>
@@ -84,20 +120,6 @@ namespace WixToolset.Data.WindowsInstaller
             }
         }
 
-        /// <summary>
-        /// Saves an output to a <c>WixOutput</c> container.
-        /// </summary>
-        /// <param name="wixout">Container to save to.</param>
-        public void Save(WixOutput wixout)
-        {
-            using (var writer = XmlWriter.Create(wixout.CreateDataStream(WixOutputStreamName)))
-            {
-                writer.WriteStartDocument();
-                this.Write(writer);
-                writer.WriteEndDocument();
-            }
-        }
-
         /// <summary>
         /// Processes an XmlReader and builds up the output object.
         /// </summary>
@@ -206,23 +228,6 @@ namespace WixToolset.Data.WindowsInstaller
             return output;
         }
 
-        /// <summary>
-        /// Ensure this output contains a particular table.
-        /// </summary>
-        /// <param name="tableDefinition">Definition of the table that should exist.</param>
-        /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param>
-        /// <returns>The table in this output.</returns>
-        public Table EnsureTable(TableDefinition tableDefinition)
-        {
-            if (!this.Tables.TryGetTable(tableDefinition.Name, out var table))
-            {
-                table = new Table(tableDefinition);
-                this.Tables.Add(table);
-            }
-
-            return table;
-        }
-
         /// <summary>
         /// Persists an output in an XML format.
         /// </summary>
-- 
cgit v1.2.3-55-g6feb