Changeset 372 for binary-improvements/MapRendering/Web/WebPermissions.cs

Timestamp:

Jul 27, 2022, 7:17:17 PM (2 years ago)

Author:

alloc

Message:

A few bits of code cleanup

File:

• binary-improvements/MapRendering/Web/WebPermissions.cs (modified) (4 diffs)

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -18 +18 @@
                 private readonly Dictionary<string, WebModulePermission> modules = new CaseInsensitiveStringDictionary<WebModulePermission> ();
 
-                public WebPermissions () {
+                private WebPermissions () {
                         allModulesList = new List<WebModulePermission> ();
                         allModulesListRO = new ReadOnlyCollection<WebModulePermission> (allModulesList);
@@ -29 +29 @@
                         get {
                                 lock (typeof (WebPermissions)) {
-                                        if (instance == null) {
-                                                instance = new WebPermissions ();
-                                        }
-
-                                        return instance;
+                                        return instance ?? (instance = new WebPermissions ());
                                 }
                         }
@@ -52 +48 @@
 
                 public WebModulePermission GetModulePermission (string _module) {
-                        WebModulePermission result;
-                        if (modules.TryGetValue (_module, out result)) {
+                        if (modules.TryGetValue (_module, out WebModulePermission result)) {
                                 return result;
                         }
@@ -192 +187 @@
 
                         if (!File.Exists (GetFullPath ())) {
-                                Log.Out (string.Format ("Permissions file '{0}' not found, creating.", GetFileName ()));
+                                Log.Out ($"Permissions file '{GetFileName ()}' not found, creating.");
                                 Save ();
                                 return;
                         }
 
-                        Log.Out (string.Format ("Loading permissions file at '{0}'", GetFullPath ()));
+                        Log.Out ($"Loading permissions file at '{GetFullPath ()}'");
 
                         XmlDocument xmlDoc = new XmlDocument ();