Merge pull request #2742 from keveleigh/MixedRealityManagerGetCalls

Fix GetManager(s) calls in MixedRealityManager

Author: David Kline

Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs

@@ -721,26 +721,14 @@ public List<IMixedRealityManager> GetManagers(Type type, string managerName)
             }
             else
             {
-                //If no name provided, return all components of the same type. Else return the type/name combination.
+                // If no name provided, return all components of the same type. Else return the type/name combination.
                 if (string.IsNullOrWhiteSpace(managerName))
                 {
-                    for (int i = 0; i < mixedRealityComponentsCount; i++)
-                    {
-                        if (MixedRealityComponents[i].Item1.Name == type.Name)
-                        {
-                            managers.Add(MixedRealityComponents[i].Item2);
-                        }
-                    }
+                    GetComponentsByType(type, ref managers);
                 }
                 else
                 {
-                    for (int i = 0; i < mixedRealityComponentsCount; i++)
-                    {
-                        if (MixedRealityComponents[i].Item1.Name == type.Name && MixedRealityComponents[i].Item2.Name == managerName)
-                        {
-                            managers.Add(MixedRealityComponents[i].Item2);
-                        }
-                    }
+                    GetComponentsByTypeAndName(type, managerName, ref managers);
                 }
             }
 
@@ -893,32 +881,7 @@ private void GetComponentByType(Type type, out IMixedRealityManager manager)
         {
             if (type == null) { throw new ArgumentNullException(nameof(type)); }
 
-            manager = null;
-
-            for (int i = 0; i < mixedRealityComponentsCount; i++)
-            {
-                if (MixedRealityComponents[i].Item1.Name == type.Name ||
-                    MixedRealityComponents[i].Item2.GetType().Name == type.Name)
-                {
-                    manager = MixedRealityComponents[i].Item2;
-                    break;
-                }
-
-                var interfaces = MixedRealityComponents[i].Item2.GetType().GetInterfaces();
-                for (int j = 0; j < interfaces.Length; j++)
-                {
-                    if (interfaces[j].Name == type.Name)
-                    {
-                        manager = MixedRealityComponents[i].Item2;
-                        break;
-                    }
-                }
-            }
-
-            if (manager == null)
-            {
-                throw new NullReferenceException($"Unable to find {type.Name} Manager.");
-            }
+            GetComponentByTypeAndName(type, string.Empty, out manager);
         }
 
         /// <summary>
@@ -930,22 +893,67 @@ private void GetComponentByType(Type type, out IMixedRealityManager manager)
         private void GetComponentByTypeAndName(Type type, string managerName, out IMixedRealityManager manager)
         {
             if (type == null) { throw new ArgumentNullException(nameof(type)); }
-            if (string.IsNullOrEmpty(managerName)) { throw new ArgumentNullException(nameof(managerName)); }
 
             manager = null;
 
             for (int i = 0; i < mixedRealityComponentsCount; i++)
             {
-                if (MixedRealityComponents[i].Item1.Name == type.Name &&
-                    MixedRealityComponents[i].Item2.Name == managerName)
+                if (CheckComponentMatch(type, managerName, MixedRealityComponents[i]))
                 {
                     manager = MixedRealityComponents[i].Item2;
                     break;
                 }
             }
         }
 
+        private void GetComponentsByType(Type type, ref List<IMixedRealityManager> managers)
+        {
+            if (type == null) { throw new ArgumentNullException(nameof(type)); }
+
+            GetComponentsByTypeAndName(type, string.Empty, ref managers);
+        }
+
+        private void GetComponentsByTypeAndName(Type type, string managerName, ref List<IMixedRealityManager> managers)
+        {
+            if (type == null) { throw new ArgumentNullException(nameof(type)); }
+
+            for (int i = 0; i < mixedRealityComponentsCount; i++)
+            {
+                if (CheckComponentMatch(type, managerName, MixedRealityComponents[i]))
+                {
+                    managers.Add(MixedRealityComponents[i].Item2);
+                }
+            }
+        }
+
+        private bool CheckComponentMatch(Type type, string managerName, Tuple<Type, IMixedRealityManager> managerTuple)
+        {
+            if ((managerTuple.Item1.Name == type.Name ||
+                managerTuple.Item2.GetType().Name == type.Name) &&
+                (string.IsNullOrEmpty(managerName) ? true :
+                managerTuple.Item2.Name == managerName))
+            {
+                return true;
+            }
+            else
+            {
+                var interfaces = managerTuple.Item2.GetType().GetInterfaces();
+                for (int j = 0; j < interfaces.Length; j++)
+                {
+                    if (interfaces[j].Name == type.Name &&
+                        (string.IsNullOrEmpty(managerName) ? true :
+                        managerTuple.Item2.Name == managerName))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         #endregion Manager Utilities
+
         #endregion Manager Container Management
     }
 }