Convert IUsesGameObjectLocking to IProvides/UsesGameObjectLocking

Interfaces/Providers/IProvidesGameObjectLocking.cs

@@ -0,0 +1,24 @@
+using Unity.Labs.ModuleLoader;
+using UnityEngine;
+
+namespace Unity.Labs.EditorXR.Interfaces
+{
+    /// <summary>
+    /// Provide access to grouping
+    /// </summary>
+    public interface IProvidesGameObjectLocking : IFunctionalityProvider
+    {
+        /// <summary>
+        /// Set a GameObject's locked status
+        /// </summary>
+        /// <param name="go">The GameObject to set locked or unlocked</param>
+        /// <param name="locked">Locked or unlocked status</param>
+        void SetLocked(GameObject go, bool locked);
+
+        /// <summary>
+        /// Check whether a GameObject is locked
+        /// </summary>
+        /// <param name="go">GameObject locked status to test</param>
+        bool IsLocked(GameObject go);
+    }
+}

Interfaces/Subscribers/IUsesGameObjectLocking.cs

@@ -0,0 +1,44 @@
+using Unity.Labs.ModuleLoader;
+using UnityEngine;
+
+namespace Unity.Labs.EditorXR.Interfaces
+{
+    /// <summary>
+    /// Gives decorated class access to grouping
+    /// </summary>
+    public interface IUsesGameObjectLocking : IFunctionalitySubscriber<IProvidesGameObjectLocking>
+    {
+    }
+
+    public static class UsesGameObjectLocking
+    {
+        /// <summary>
+        /// Set a GameObject's locked status
+        /// </summary>
+        /// <param name="user">The functionality user</param>
+        /// <param name="go">The GameObject to set locked or unlocked</param>
+        /// <param name="locked">Locked or unlocked status</param>
+        public static void SetLocked(this IUsesGameObjectLocking user, GameObject go, bool locked)
+        {
+            {
+#if !FI_AUTOFILL
+                user.provider.SetLocked(go, locked);
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Check whether a GameObject is locked
+        /// </summary>
+        /// <param name="user">The functionality user</param>
+        /// <param name="go">GameObject locked status to test</param>
+        public static bool IsLocked(this IUsesGameObjectLocking user, GameObject go)
+        {
+#if FI_AUTOFILL
+            return default(bool);
+#else
+            return user.provider.IsLocked(go);
+#endif
+        }
+    }
+}

Runtime/Scripts/Modules/HighlightModule/HighlightModule.cs

@@ -40,6 +40,10 @@ struct HighlightData
         Material m_RayHighlightMaterialCopy;
         Transform m_ModuleParent;
 
+#if !FI_AUTOFILL
+        IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
+#endif
+
         // Local method use only -- created here to reduce garbage collection
         static readonly List<KeyValuePair<Material, GameObject>> k_HighlightsToRemove = new List<KeyValuePair<Material, GameObject>>();
         static readonly List<MeshFilter> k_MeshFilters = new List<MeshFilter>();

Runtime/Scripts/Modules/IntersectionModule/IntersectionModule.cs

@@ -54,6 +54,10 @@ class DirectIntersection
 
         SpatialHashModule m_SpatialHashModule;
 
+#if !FI_AUTOFILL
+        IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
+#endif
+
         // Local method use only -- created here to reduce garbage collection
         readonly List<Renderer> m_Intersections = new List<Renderer>();
         readonly List<SortableRenderer> m_SortedIntersections = new List<SortableRenderer>();

Runtime/Scripts/Modules/LockModule/LockModule.cs

@@ -1,14 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.ModuleLoader;
 using Unity.Labs.Utils;
 using UnityEditor.Experimental.EditorVR.Core;
 using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Modules
 {
-    sealed class LockModule : ScriptableSettings<LockModule>, IModuleDependency<EditorXRMenuModule>, IActions, ISelectionChanged
+    sealed class LockModule : ScriptableSettings<LockModule>, IModuleDependency<EditorXRMenuModule>, IActions,
+        ISelectionChanged, IProvidesGameObjectLocking
     {
         class LockModuleAction : IAction, ITooltip
         {
@@ -54,9 +56,6 @@ public void LoadModule()
             UpdateAction(null);
 
             actions = new List<IAction> { m_LockModuleAction };
-
-            IUsesGameObjectLockingMethods.setLocked = SetLocked;
-            IUsesGameObjectLockingMethods.isLocked = IsLocked;
         }
 
         public void UnloadModule() { }
@@ -158,5 +157,18 @@ public void OnSelectionChanged()
         {
             UpdateAction(Selection.activeGameObject);
         }
+
+        public void LoadProvider() { }
+
+        public void ConnectSubscriber(object obj)
+        {
+#if !FI_AUTOFILL
+            var lockingSubscriber = obj as IFunctionalitySubscriber<IProvidesGameObjectLocking>;
+            if (lockingSubscriber != null)
+                lockingSubscriber.provider = this;
+#endif
+        }
+
+        public void UnloadProvider() { }
     }
 }

Runtime/Scripts/Modules/SelectionModule/SelectionModule.cs

@@ -25,6 +25,10 @@ sealed class SelectionModule : ScriptableSettings<SelectionModule>, IModule, IUs
 
         public event Action<Transform> selected;
 
+#if !FI_AUTOFILL
+        IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
+#endif
+
         // Local method use only -- created here to reduce garbage collection
         static readonly HashSet<Object> k_SelectedObjects = new HashSet<Object>();
         static readonly List<GameObject> k_SingleObjectList = new List<GameObject>();

Runtime/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Labs.EditorXR.Interfaces;
+using Unity.Labs.ModuleLoader;
 using Unity.Labs.Utils;
 using UnityEditor.Experimental.EditorVR.Handles;
 using UnityEditor.Experimental.EditorVR.UI;
@@ -91,6 +93,10 @@ public override List<HierarchyData> data
         public Func<string, bool> matchesFilter { private get; set; }
         public Func<string> getSearchQuery { private get; set; }
 
+#if !FI_AUTOFILL
+        IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
+#endif
+
         protected override void Start()
         {
             base.Start();

Runtime/Workspaces/InspectorWorkspace/Scripts/InspectorListViewController.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.ListView;
+using Unity.Labs.ModuleLoader;
 using Unity.Labs.Utils;
 using UnityEditor.Experimental.EditorVR.Data;
 using UnityEditor.Experimental.EditorVR.UI;
-using UnityEditor.Experimental.EditorVR.Utilities;
 using UnityEngine;
 
 namespace UnityEditor.Experimental.EditorVR.Workspaces
@@ -59,6 +60,10 @@ public override List<InspectorData> data
 
         public event Action<List<InspectorData>, PropertyData> arraySizeChanged;
 
+#if !FI_AUTOFILL
+        IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
+#endif
+
         protected override void Start()
         {
             base.Start();

Runtime/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs

@@ -1,5 +1,6 @@
 #if UNITY_EDITOR
 using System.Collections.Generic;
+using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.ModuleLoader;
 using UnityEditor.Experimental.EditorVR.Utilities;
 using UnityEngine;
@@ -19,6 +20,10 @@ class LockedObjectsWorkspace : HierarchyWorkspace, IUsesGameObjectLocking
         string m_BaseSearchQuery;
         string m_CachedSearchQuery;
 
+#if !FI_AUTOFILL
+        IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
+#endif
+
         public override string searchQuery
         {
             get