[SpeechInputHandler] fixed public property PascalCase. Minor formatting.

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/Editor/SpeechInputHandlerEditor.cs

@@ -16,7 +16,7 @@ public class SpeechInputHandlerEditor : Editor
 
         private void OnEnable()
         {
-            keywordsProperty = serializedObject.FindProperty("keywords");
+            keywordsProperty = serializedObject.FindProperty("Keywords");
             registeredKeywords = RegisteredKeywords().Distinct().ToArray();
         }
 
@@ -33,29 +33,33 @@ public override void OnInspectorGUI()
             }
             else
             {
-                SpeechInputHandler handler = (SpeechInputHandler)target;
-                string duplicateKeyword = handler.keywords.GroupBy(keyword => keyword.Keyword.ToLower()).Where(group => group.Count() > 1).Select(group => group.Key).FirstOrDefault();
+                var handler = (SpeechInputHandler)target;
+                string duplicateKeyword = handler.Keywords
+                    .GroupBy(keyword => keyword.Keyword.ToLower())
+                    .Where(group => group.Count() > 1)
+                    .Select(group => group.Key).FirstOrDefault();
+
                 if (duplicateKeyword != null)
                 {
                     EditorGUILayout.HelpBox("Keyword '" + duplicateKeyword + "' is assigned more than once!", MessageType.Warning);
                 }
             }
         }
 
-        private static GUIContent removeButtonContent = new GUIContent("-", "Remove keyword");
-        private static GUIContent addButtonContent = new GUIContent("+", "Add keyword");
-        private static GUILayoutOption miniButtonWidth = GUILayout.Width(20.0f);
+        private static readonly GUIContent RemoveButtonContent = new GUIContent("-", "Remove keyword");
+        private static readonly GUIContent AddButtonContent = new GUIContent("+", "Add keyword");
+        private static readonly GUILayoutOption MiniButtonWidth = GUILayout.Width(20.0f);
 
         private void ShowList(SerializedProperty list)
         {
             EditorGUI.indentLevel++;
 
             // remove the keywords already assigned from the registered list
-            SpeechInputHandler handler = (SpeechInputHandler)target;
+            var handler = (SpeechInputHandler)target;
 
-            if (handler.keywords == null) { return; }
+            if (handler.Keywords == null) { return; }
 
-            string[] availableKeywords = registeredKeywords.Except(handler.keywords.Select(keywordAndResponse => keywordAndResponse.Keyword)).ToArray();
+            string[] availableKeywords = registeredKeywords.Except(handler.Keywords.Select(keywordAndResponse => keywordAndResponse.Keyword)).ToArray();
 
             // keyword rows
             for (int index = 0; index < list.arraySize; index++)
@@ -66,11 +70,13 @@ private void ShowList(SerializedProperty list)
                 bool elementExpanded = EditorGUILayout.PropertyField(elementProperty);
                 GUILayout.FlexibleSpace();
                 // the remove element button
-                bool elementRemoved = GUILayout.Button(removeButtonContent, EditorStyles.miniButton, miniButtonWidth);
+                bool elementRemoved = GUILayout.Button(RemoveButtonContent, EditorStyles.miniButton, MiniButtonWidth);
+
                 if (elementRemoved)
                 {
                     list.DeleteArrayElementAtIndex(index);
                 }
+
                 EditorGUILayout.EndHorizontal();
 
                 if (!elementRemoved && elementExpanded)
@@ -79,6 +85,7 @@ private void ShowList(SerializedProperty list)
                     string[] keywords = availableKeywords.Concat(new[] { keywordProperty.stringValue }).OrderBy(keyword => keyword).ToArray();
                     int previousSelection = ArrayUtility.IndexOf(keywords, keywordProperty.stringValue);
                     int currentSelection = EditorGUILayout.Popup("Keyword", previousSelection, keywords);
+
                     if (currentSelection != previousSelection)
                     {
                         keywordProperty.stringValue = keywords[currentSelection];
@@ -92,11 +99,13 @@ private void ShowList(SerializedProperty list)
             // add button row
             EditorGUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
+
             // the add element button
-            if (GUILayout.Button(addButtonContent, EditorStyles.miniButton, miniButtonWidth))
+            if (GUILayout.Button(AddButtonContent, EditorStyles.miniButton, MiniButtonWidth))
             {
                 list.InsertArrayElementAtIndex(list.arraySize);
             }
+
             EditorGUILayout.EndHorizontal();
 
             EditorGUI.indentLevel--;

Assets/HoloToolkit/Input/Scripts/Voice/SpeechInputHandler.cs

@@ -10,7 +10,7 @@ namespace HoloToolkit.Unity.InputModule
 {
     public class SpeechInputHandler : MonoBehaviour, ISpeechHandler
     {
-        [System.Serializable]
+        [Serializable]
         public struct KeywordAndResponse
         {
             [Tooltip("The keyword to handle.")]
@@ -20,21 +20,21 @@ public struct KeywordAndResponse
         }
 
         [Tooltip("The keywords to be recognized and optional keyboard shortcuts.")]
-        public KeywordAndResponse[] keywords;
+        public KeywordAndResponse[] Keywords;
 
         [NonSerialized]
         private readonly Dictionary<string, UnityEvent> responses = new Dictionary<string, UnityEvent>();
 
-        // Use this for initialization
         protected virtual void Start()
         {
             // Convert the struct array into a dictionary, with the keywords and the methods as the values.
             // This helps easily link the keyword recognized to the UnityEvent to be invoked.
-            int keywordCount = keywords.Length;
+            int keywordCount = Keywords.Length;
             for (int index = 0; index < keywordCount; index++)
             {
-                KeywordAndResponse keywordAndResponse = keywords[index];
+                KeywordAndResponse keywordAndResponse = Keywords[index];
                 string keyword = keywordAndResponse.Keyword.ToLower();
+
                 if (responses.ContainsKey(keyword))
                 {
                     Debug.LogError("Duplicate keyword '" + keyword + "' specified in '" + gameObject.name + "'.");

Assets/HoloToolkit/Input/Scripts/Voice/SpeechInputSource.cs

@@ -20,7 +20,7 @@ namespace HoloToolkit.Unity.InputModule
     /// </summary>
     public partial class SpeechInputSource : BaseInputSource
     {
-        [System.Serializable]
+        [Serializable]
         public struct KeywordAndKeyCode
         {
             [Tooltip("The keyword to recognize.")]
@@ -51,10 +51,12 @@ protected override void Start()
             if (keywordCount > 0)
             {
                 string[] keywords = new string[keywordCount];
+
                 for (int index = 0; index < keywordCount; index++)
                 {
                     keywords[index] = Keywords[index].Keyword;
                 }
+
                 keywordRecognizer = new KeywordRecognizer(keywords);
                 keywordRecognizer.OnPhraseRecognized += KeywordRecognizer_OnPhraseRecognized;