Responding to code review feedback.

Author: wiwei

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableEvent.cs

@@ -99,7 +99,7 @@ public ReceiverData AddReceiver(Type type)
         /// <returns></returns>
         public static InteractableTypesContainer GetEventTypes()
         {
-            return InteractableTypeFinder.Find(candidateEventTypes, InteractableTypeFinder.TypeRestriction.DerivedOnly);
+            return InteractableTypeFinder.Find(candidateEventTypes, TypeRestriction.DerivedOnly);
         }
 
         /// <summary>

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Profile/InteractableProfileItem.cs

@@ -41,7 +41,7 @@ public class InteractableProfileItem
         /// <returns></returns>
         public static InteractableTypesContainer GetThemeTypes()
         {
-            return InteractableTypeFinder.Find(candidateThemeTypes, InteractableTypeFinder.TypeRestriction.DerivedOnly);
+            return InteractableTypeFinder.Find(candidateThemeTypes, TypeRestriction.DerivedOnly);
         }
 
         /// <summary>

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs

@@ -59,7 +59,7 @@ public InteractableStates SetupLogic()
 
         public void SetupStateOptions()
         {
-            StateOptions = InteractableTypeFinder.Find(candidateStateTypes, InteractableTypeFinder.TypeRestriction.AllowBase);
+            StateOptions = InteractableTypeFinder.Find(candidateStateTypes, TypeRestriction.AllowBase);
         }
 
         // redundant method, put in a utils with static methods!!!

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypeFinder.cs

@@ -10,29 +10,6 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.TypeResolution
     /// </summary>
     public class InteractableTypeFinder
     {
-        /// <summary>
-        /// Controls the behavior of the InteractableTypeFinder.FindTypes function. See individual
-        /// enum values for more details.
-        /// </summary>
-        public enum TypeRestriction
-        {
-            /// <summary>
-            /// When this is specified, only classes derived from the specified type will be
-            /// returned by the lookup. This means that if you pass InteractableStates, the
-            /// lookup will only return classes whose base class is InteractableStates but
-            /// will not return InteractableStates itself.
-            /// </summary>
-            DerivedOnly,
-
-            /// <summary>
-            /// When this is specified, classes derived from the specified type AND the class
-            /// itself will be returned by the lookup. This means that if you pass 
-            /// InteractableStates, the lookup will both classes whose base class is 
-            /// InteractableStates and InteractableStates itself.
-            /// </summary>
-            AllowBase,
-        };
-
         /// <summary>
         /// A convenience wrapper provided for editor code to turn a list of types into a form that 
         /// matches their existing structure.
@@ -119,14 +96,19 @@ private static void EnsureCacheForTypes(List<Type> types, TypeRestriction typeRe
         private static List<InteractableType> GetTypesFromAssemblies(Type type, TypeRestriction typeRestriction, Assembly[] assemblies)
         {
             List<InteractableType> interactableTypes = new List<InteractableType>();
+
+            if (typeRestriction == TypeRestriction.AllowBase)
+            {
+                InteractableType interactableType = new InteractableType(type);
+                interactableTypes.Add(interactableType);
+            }
+
             foreach (Assembly assembly in assemblies)
             {
                 foreach (Type assemblyType in assembly.GetTypes())
                 {
-                    TypeInfo info = assemblyType.GetTypeInfo();
-                    bool exactBaseMatch = typeRestriction == TypeRestriction.AllowBase && assemblyType.Equals(type);
-                    bool derivedMatch = info.BaseType != null && info.BaseType.Equals(type);
-                    if (exactBaseMatch || derivedMatch)
+                    TypeInfo info = assemblyType.GetTypeInfo();   
+                    if (info.IsSubclassOf(type))
                     {
                         InteractableType interactableType = new InteractableType(assemblyType);
                         interactableTypes.Add(interactableType);

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/TypeRestriction.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.TypeResolution
+{
+    /// <summary>
+    /// Controls the behavior of the InteractableTypeFinder.FindTypes function. See individual
+    /// enum values for more details.
+    /// </summary>
+    public enum TypeRestriction
+    {
+        /// <summary>
+        /// When this is specified, only classes derived from the specified type will be
+        /// returned by the lookup. This means that if you pass InteractableStates, the
+        /// lookup will only return classes whose base class is InteractableStates but
+        /// will not return InteractableStates itself.
+        /// </summary>
+        DerivedOnly,
+
+        /// <summary>
+        /// When this is specified, classes derived from the specified type AND the class
+        /// itself will be returned by the lookup. This means that if you pass 
+        /// InteractableStates, the lookup will both classes whose base class is 
+        /// InteractableStates and InteractableStates itself.
+        /// </summary>
+        AllowBase,
+    };
+}