IMixedRealityServiceProvider -> IMixedRealityExtensionService

StephenHodgson · StephenHodgson · commit 100889b35807 · 2018-10-24T13:05:13.000-07:00
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityServiceConfiguration.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityServiceConfiguration.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions
 {
     /// <summary>
-    /// Defines a system, feature, or manager to be registered with as a <see cref="IMixedRealityServiceProvider"/> on startup.
+    /// Defines a system, feature, or manager to be registered with as a <see cref="IMixedRealityExtensionService"/> on startup.
     /// </summary>
     [Serializable]
     public struct MixedRealityServiceConfiguration
@@ -33,7 +33,7 @@ public MixedRealityServiceConfiguration(SystemType componentType, string compone
         }
 
         [SerializeField]
-        [Implements(typeof(IMixedRealityServiceProvider), TypeGrouping.ByNamespaceFlat)]
+        [Implements(typeof(IMixedRealityExtensionService), TypeGrouping.ByNamespaceFlat)]
         private SystemType componentType;
 
         /// <summary>
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.WindowsMixedReality
 {
-    public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider
+    public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityExtensionService
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseDeviceManager.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
 {
-    public class MouseDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider
+    public class MouseDeviceManager : BaseDeviceManager, IMixedRealityExtensionService
     {
         public MouseDeviceManager(string name, uint priority) : base(name, priority) { }
 
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs
@@ -16,7 +16,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
     /// <summary>
     /// Manages joysticks using unity input system.
     /// </summary>
-    public class UnityJoystickManager : BaseDeviceManager, IMixedRealityServiceProvider
+    public class UnityJoystickManager : BaseDeviceManager, IMixedRealityExtensionService
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityTouchDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityTouchDeviceManager.cs
@@ -15,7 +15,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
     /// <summary>
     /// Manages Touch devices using unity input system.
     /// </summary>
-    public class UnityTouchDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider
+    public class UnityTouchDeviceManager : BaseDeviceManager, IMixedRealityExtensionService
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealityDictationSystem.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealityDictationSystem.cs
@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices
     /// <summary>
     /// Mixed Reality Toolkit controller definition, used to manage a specific controller type
     /// </summary>
-    public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityServiceProvider
+    public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityExtensionService
     {
         /// <summary>
         /// Is the system currently listing to dictation input?
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealitySpeechSystem.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealitySpeechSystem.cs
@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices
     /// <summary>
     /// Mixed Reality Toolkit controller definition, used to manage a specific controller type
     /// </summary>
-    public interface IMixedRealitySpeechSystem : IMixedRealityDeviceManager, IMixedRealityServiceProvider
+    public interface IMixedRealitySpeechSystem : IMixedRealityDeviceManager, IMixedRealityExtensionService
     {
         /// <summary>
         /// Make sure the keyword recognizer is on, then stop it.
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityExtensionService.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityExtensionService.cs
@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces
     /// <summary>
     /// Generic interface for all optional Mixed Reality systems, components, or features that can be added to the <see cref="Definitions.MixedRealityServiceConfiguration"/>
     /// </summary>
-    public interface IMixedRealityServiceProvider : IMixedRealityService
+    public interface IMixedRealityExtensionService : IMixedRealityService // IMixedRealityComponent
     {
         // Empty for now, but it is used to filter out the valid class types in the inspector dropdown.
     }
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityExtensionService.cs.meta b/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityExtensionService.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityService.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityService.cs
@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces
     /// <summary>
     /// Generic interface for all Mixed Reality Services
     /// </summary>
-    public interface IMixedRealityService
+    public interface IMixedRealityService // IMixedRealityManager
     {
         /// <summary>
         /// Optional Priority attribute if multiple services of the same type are required, enables targeting a service for action.
diff --git a/Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs b/Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs
@@ -108,9 +108,9 @@ public void ResetConfiguration(MixedRealityToolkitConfigurationProfile profile)
         #region Mixed Reality runtime component registry
 
         /// <summary>
-        /// Local component registry for the Mixed Reality Toolkit, to allow runtime use of the <see cref="IMixedRealityServiceProvider"/>.
+        /// Local component registry for the Mixed Reality Toolkit, to allow runtime use of the <see cref="IMixedRealityExtensionService"/>.
         /// </summary>
-        public List<Tuple<Type, IMixedRealityServiceProvider>> MixedRealityComponents { get; } = new List<Tuple<Type, IMixedRealityServiceProvider>>();
+        public List<Tuple<Type, IMixedRealityExtensionService>> MixedRealityComponents { get; } = new List<Tuple<Type, IMixedRealityExtensionService>>();
 
         private int mixedRealityComponentsCount = 0;
 
@@ -231,7 +231,7 @@ private void Initialize()
                     {
                         if (configuration.ComponentType.Type != null)
                         {
-                            RegisterService(typeof(IMixedRealityServiceProvider), Activator.CreateInstance(configuration.ComponentType, configuration.ComponentName, configuration.Priority) as IMixedRealityServiceProvider);
+                            RegisterService(typeof(IMixedRealityExtensionService), Activator.CreateInstance(configuration.ComponentType, configuration.ComponentName, configuration.Priority) as IMixedRealityExtensionService);
                         }
                     }
                 }
@@ -530,7 +530,7 @@ public void RegisterService(Type type, IMixedRealityService service)
             }
             else
             {
-                MixedRealityComponents.Add(new Tuple<Type, IMixedRealityServiceProvider>(type, (IMixedRealityServiceProvider)service));
+                MixedRealityComponents.Add(new Tuple<Type, IMixedRealityExtensionService>(type, (IMixedRealityExtensionService)service));
                 if (!isInitializing) { service.Initialize(); }
                 mixedRealityComponentsCount = MixedRealityComponents.Count;
             }
@@ -661,7 +661,7 @@ public void UnregisterService(Type type)
                 GetService(type, out service);
                 if (service != null)
                 {
-                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityServiceProvider>(type, (IMixedRealityServiceProvider)service));
+                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityExtensionService>(type, (IMixedRealityExtensionService)service));
                 }
             }
         }
@@ -702,7 +702,7 @@ public void UnregisterService(Type type, string serviceName)
 
                 if (GetService(type, serviceName, out service))
                 {
-                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityServiceProvider>(type, (IMixedRealityServiceProvider)service));
+                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityExtensionService>(type, (IMixedRealityExtensionService)service));
                 }
             }
         }
@@ -1115,7 +1115,7 @@ private void GetServices(Type type, string serviceName, ref List<IMixedRealitySe
             }
         }
 
-        private static bool CheckComponentMatch(Type type, string serviceName, Tuple<Type, IMixedRealityServiceProvider> components)
+        private static bool CheckComponentMatch(Type type, string serviceName, Tuple<Type, IMixedRealityExtensionService> components)
         {
             bool isValid = string.IsNullOrEmpty(serviceName) || components.Item2.Name == serviceName;
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`namespace Microsoft.MixedReality.Toolkit.Core.Devices.WindowsMixedReality`
`21`	`21`	`{`
`22`		`- public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider`
	`22`	`+ public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityExtensionService`
`23`	`23`	`{`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// Constructor.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput`
`13`	`13`	`{`
`14`		`- public class MouseDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider`
	`14`	`+ public class MouseDeviceManager : BaseDeviceManager, IMixedRealityExtensionService`
`15`	`15`	`{`
`16`	`16`	`public MouseDeviceManager(string name, uint priority) : base(name, priority) { }`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Manages joysticks using unity input system.`
`18`	`18`	`/// </summary>`
`19`		`- public class UnityJoystickManager : BaseDeviceManager, IMixedRealityServiceProvider`
	`19`	`+ public class UnityJoystickManager : BaseDeviceManager, IMixedRealityExtensionService`
`20`	`20`	`{`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Constructor.`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput`
`15`	`15`	`/// <summary>`
`16`	`16`	`/// Manages Touch devices using unity input system.`
`17`	`17`	`/// </summary>`
`18`		`- public class UnityTouchDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider`
	`18`	`+ public class UnityTouchDeviceManager : BaseDeviceManager, IMixedRealityExtensionService`
`19`	`19`	`{`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// Constructor.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Mixed Reality Toolkit controller definition, used to manage a specific controller type`
`11`	`11`	`/// </summary>`
`12`		`- public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityServiceProvider`
	`12`	`+ public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityExtensionService`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Is the system currently listing to dictation input?`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Mixed Reality Toolkit controller definition, used to manage a specific controller type`
`8`	`8`	`/// </summary>`
`9`		`- public interface IMixedRealitySpeechSystem : IMixedRealityDeviceManager, IMixedRealityServiceProvider`
	`9`	`+ public interface IMixedRealitySpeechSystem : IMixedRealityDeviceManager, IMixedRealityExtensionService`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Make sure the keyword recognizer is on, then stop it.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Generic interface for all optional Mixed Reality systems, components, or features that can be added to the <see cref="Definitions.MixedRealityServiceConfiguration"/>`
`8`	`8`	`/// </summary>`
`9`		`- public interface IMixedRealityServiceProvider : IMixedRealityService`
	`9`	`+ public interface IMixedRealityExtensionService : IMixedRealityService // IMixedRealityComponent`
`10`	`10`	`{`
`11`	`11`	`// Empty for now, but it is used to filter out the valid class types in the inspector dropdown.`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Generic interface for all Mixed Reality Services`
`8`	`8`	`/// </summary>`
`9`		`- public interface IMixedRealityService`
	`9`	`+ public interface IMixedRealityService // IMixedRealityManager`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Optional Priority attribute if multiple services of the same type are required, enables targeting a service for action.`