Rename AccessModifiers and optimize its serialization

1 files changed, 77 insertions, 5 deletions

diff --git a/src/WixToolset.Data/AccessModifier.cs b/src/WixToolset.Data/AccessModifier.cs
index 64f29f26..191558b5 100644
--- a/src/WixToolset.Data/AccessModifier.cs
+++ b/src/WixToolset.Data/AccessModifier.cs
@@ -2,26 +2,98 @@
 
 namespace WixToolset.Data
 {
+    using System;
+
     public enum AccessModifier
     {
         /// <summary>
-        /// Indicates the identifier is publicly visible to all other sections.
+        /// Indicates the identifier is globally visible to all other sections.
         /// </summary>
-        Public,
+        Global,
+        [Obsolete]
+        Public = Global,
 
         /// <summary>
         /// Indicates the identifier is visible only to sections in the same library.
         /// </summary>
-        Internal,
+        Library,
+        [Obsolete]
+        Internal = Library,
 
         /// <summary>
         /// Indicates the identifier is visible only to sections in the same source file.
         /// </summary>
-        Protected,
+        File,
+        [Obsolete]
+        Protected = File,
 
         /// <summary>
         /// Indicates the identifiers is visible only to the section where it is defined.
         /// </summary>
-        Private,
+        Section,
+        [Obsolete]
+        Private = Section,
+    }
+
+    /// <summary>
+    /// Extensions for converting <c>AccessModifier</c> to and from strings optimally.
+    /// </summary>
+    public static class AccessModifierExtensions
+    {
+        /// <summary>
+        /// Converts a string to an <c>AccessModifier</c>.
+        /// </summary>
+        /// <param name="access">String value to convert.</param>
+        /// <returns>Converted <c>AccessModifier</c>.</returns>
+        public static AccessModifier AsAccessModifier(this string access)
+        {
+            switch (access)
+            {
+                case "global":
+                case "public":
+                    return AccessModifier.Global;
+
+                case "library":
+                case "internal":
+                    return AccessModifier.Library;
+
+                case "file":
+                case "protected":
+                    return AccessModifier.File;
+
+                case "section":
+                case "private":
+                    return AccessModifier.Section;
+
+                default:
+                    throw new ArgumentException($"Unknown AccessModifier: {access}", nameof(access));
+            }
+        }
+
+        /// <summary>
+        /// Converts an <c>AccessModifier</c> to a string.
+        /// </summary>
+        /// <param name="access"><c>AccessModifier</c> value to convert.</param>
+        /// <returns>Converted string.</returns>
+        public static string AsString(this AccessModifier access)
+        {
+            switch (access)
+            {
+                case AccessModifier.Global:
+                    return "global";
+
+                case AccessModifier.Library:
+                    return "library";
+
+                case AccessModifier.File:
+                    return "file";
+
+                case AccessModifier.Section:
+                    return "section";
+
+                default:
+                    throw new ArgumentException($"Unknown AccessModifier: {access}", nameof(access));
+            }
+        }
     }
 }