rename serializedproperty vars

Troy-Ferrell · Troy-Ferrell · commit b41fd0dd16ec · 2019-12-12T13:39:39.000-08:00
diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/DataProviderAccessServiceInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/DataProviderAccessServiceInspector.cs
@@ -16,8 +16,8 @@ public abstract class BaseDataProviderServiceInspector : BaseMixedRealityToolkit
     {
         protected class ServiceConfigurationProperties
         {
-            public SerializedProperty Name;
-            public SerializedProperty Type;
+            public SerializedProperty componentName;
+            public SerializedProperty componentType;
             public SerializedProperty providerProfile;
             public SerializedProperty runtimePlatform;
         }
@@ -50,7 +50,7 @@ protected virtual void AddDataProvider()
             SerializedProperty provider = providerConfigurations.GetArrayElementAtIndex(providerConfigurations.arraySize - 1);
 
             var providerProperties = GetDataProviderConfigurationProperties(provider);
-            providerProperties.Name.stringValue = $"New data provider {providerConfigurations.arraySize - 1}";
+            providerProperties.componentName.stringValue = $"New data provider {providerConfigurations.arraySize - 1}";
             providerProperties.runtimePlatform.intValue = -1;
             providerProperties.providerProfile.objectReferenceValue = null;
 
@@ -77,13 +77,13 @@ protected virtual void ApplyProviderConfiguration(Type dataProviderType, Service
                 MixedRealityDataProviderAttribute providerAttribute = MixedRealityDataProviderAttribute.Find(dataProviderType) as MixedRealityDataProviderAttribute;
                 if (providerAttribute != null)
                 {
-                    providerProperties.Name.stringValue = !string.IsNullOrWhiteSpace(providerAttribute.Name) ? providerAttribute.Name : dataProviderType.Name;
+                    providerProperties.componentName.stringValue = !string.IsNullOrWhiteSpace(providerAttribute.Name) ? providerAttribute.Name : dataProviderType.Name;
                     providerProperties.providerProfile.objectReferenceValue = providerAttribute.DefaultProfile;
                     providerProperties.runtimePlatform.intValue = (int)providerAttribute.RuntimePlatforms;
                 }
                 else
                 {
-                    providerProperties.Name.stringValue = dataProviderType.Name;
+                    providerProperties.componentName.stringValue = dataProviderType.Name;
                 }
 
                 serializedObject.ApplyModifiedProperties();
@@ -126,7 +126,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst
             {
                 using (new EditorGUILayout.HorizontalScope())
                 {
-                    providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.Name.stringValue, true);
+                    providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.componentName.stringValue, true);
 
                     if (GUILayout.Button(removeContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))
                     {
@@ -141,7 +141,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst
 
                     using (var c = new EditorGUI.ChangeCheckScope())
                     {
-                        EditorGUILayout.PropertyField(providerProperties.Type, ComponentTypeLabel);
+                        EditorGUILayout.PropertyField(providerProperties.componentType, ComponentTypeLabel);
                         if (c.changed)
                         {
                             serializedObject.ApplyModifiedProperties();
diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityCameraProfileInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityCameraProfileInspector.cs
@@ -137,8 +137,8 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr
         {
             return new ServiceConfigurationProperties()
             {
-                Name = providerEntry.FindPropertyRelative("componentName"),
-                Type = providerEntry.FindPropertyRelative("componentType"),
+                componentName = providerEntry.FindPropertyRelative("componentName"),
+                componentType = providerEntry.FindPropertyRelative("componentType"),
                 providerProfile = providerEntry.FindPropertyRelative("settingsProfile"),
                 runtimePlatform = providerEntry.FindPropertyRelative("runtimePlatform"),
             };
diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs
@@ -195,8 +195,8 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr
         {
             return new ServiceConfigurationProperties()
             {
-                Name = providerEntry.FindPropertyRelative("componentName"),
-                Type = providerEntry.FindPropertyRelative("componentType"),
+                componentName = providerEntry.FindPropertyRelative("componentName"),
+                componentType = providerEntry.FindPropertyRelative("componentType"),
                 providerProfile = providerEntry.FindPropertyRelative("deviceManagerProfile"),
                 runtimePlatform = providerEntry.FindPropertyRelative("runtimePlatform"),
             };
diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealitySpatialAwarenessSystemProfileInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealitySpatialAwarenessSystemProfileInspector.cs
@@ -57,8 +57,8 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr
         {
             return new ServiceConfigurationProperties()
             {
-                Name = providerEntry.FindPropertyRelative("componentName"),
-                Type = providerEntry.FindPropertyRelative("componentType"),
+                componentName = providerEntry.FindPropertyRelative("componentName"),
+                componentType = providerEntry.FindPropertyRelative("componentType"),
                 providerProfile = providerEntry.FindPropertyRelative("observerProfile"),
                 runtimePlatform = providerEntry.FindPropertyRelative("runtimePlatform"),
             };

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public abstract class BaseDataProviderServiceInspector : BaseMixedRealityToolkit`
`16`	`16`	`{`
`17`	`17`	`protected class ServiceConfigurationProperties`
`18`	`18`	`{`
`19`		`- public SerializedProperty Name;`
`20`		`- public SerializedProperty Type;`
	`19`	`+ public SerializedProperty componentName;`
	`20`	`+ public SerializedProperty componentType;`
`21`	`21`	`public SerializedProperty providerProfile;`
`22`	`22`	`public SerializedProperty runtimePlatform;`
`23`	`23`	`}`
`@@ -50,7 +50,7 @@ protected virtual void AddDataProvider()`
`50`	`50`	`SerializedProperty provider = providerConfigurations.GetArrayElementAtIndex(providerConfigurations.arraySize - 1);`
`51`	`51`
`52`	`52`	`var providerProperties = GetDataProviderConfigurationProperties(provider);`
`53`		`- providerProperties.Name.stringValue = $"New data provider {providerConfigurations.arraySize - 1}";`
	`53`	`+ providerProperties.componentName.stringValue = $"New data provider {providerConfigurations.arraySize - 1}";`
`54`	`54`	`providerProperties.runtimePlatform.intValue = -1;`
`55`	`55`	`providerProperties.providerProfile.objectReferenceValue = null;`
`56`	`56`
`@@ -77,13 +77,13 @@ protected virtual void ApplyProviderConfiguration(Type dataProviderType, Service`
`77`	`77`	`MixedRealityDataProviderAttribute providerAttribute = MixedRealityDataProviderAttribute.Find(dataProviderType) as MixedRealityDataProviderAttribute;`
`78`	`78`	`if (providerAttribute != null)`
`79`	`79`	`{`
`80`		`- providerProperties.Name.stringValue = !string.IsNullOrWhiteSpace(providerAttribute.Name) ? providerAttribute.Name : dataProviderType.Name;`
	`80`	`+ providerProperties.componentName.stringValue = !string.IsNullOrWhiteSpace(providerAttribute.Name) ? providerAttribute.Name : dataProviderType.Name;`
`81`	`81`	`providerProperties.providerProfile.objectReferenceValue = providerAttribute.DefaultProfile;`
`82`	`82`	`providerProperties.runtimePlatform.intValue = (int)providerAttribute.RuntimePlatforms;`
`83`	`83`	`}`
`84`	`84`	`else`
`85`	`85`	`{`
`86`		`- providerProperties.Name.stringValue = dataProviderType.Name;`
	`86`	`+ providerProperties.componentName.stringValue = dataProviderType.Name;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`serializedObject.ApplyModifiedProperties();`
`@@ -126,7 +126,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst`
`126`	`126`	`{`
`127`	`127`	`using (new EditorGUILayout.HorizontalScope())`
`128`	`128`	`{`
`129`		`- providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.Name.stringValue, true);`
	`129`	`+ providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.componentName.stringValue, true);`
`130`	`130`
`131`	`131`	`if (GUILayout.Button(removeContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))`
`132`	`132`	`{`
`@@ -141,7 +141,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst`
`141`	`141`
`142`	`142`	`using (var c = new EditorGUI.ChangeCheckScope())`
`143`	`143`	`{`
`144`		`- EditorGUILayout.PropertyField(providerProperties.Type, ComponentTypeLabel);`
	`144`	`+ EditorGUILayout.PropertyField(providerProperties.componentType, ComponentTypeLabel);`
`145`	`145`	`if (c.changed)`
`146`	`146`	`{`
`147`	`147`	`serializedObject.ApplyModifiedProperties();`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr`
`137`	`137`	`{`
`138`	`138`	`return new ServiceConfigurationProperties()`
`139`	`139`	`{`
`140`		`- Name = providerEntry.FindPropertyRelative("componentName"),`
`141`		`- Type = providerEntry.FindPropertyRelative("componentType"),`
	`140`	`+ componentName = providerEntry.FindPropertyRelative("componentName"),`
	`141`	`+ componentType = providerEntry.FindPropertyRelative("componentType"),`
`142`	`142`	`providerProfile = providerEntry.FindPropertyRelative("settingsProfile"),`
`143`	`143`	`runtimePlatform = providerEntry.FindPropertyRelative("runtimePlatform"),`
`144`	`144`	`};`
Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,8 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr`
`195`	`195`	`{`
`196`	`196`	`return new ServiceConfigurationProperties()`
`197`	`197`	`{`
`198`		`- Name = providerEntry.FindPropertyRelative("componentName"),`
`199`		`- Type = providerEntry.FindPropertyRelative("componentType"),`
	`198`	`+ componentName = providerEntry.FindPropertyRelative("componentName"),`
	`199`	`+ componentType = providerEntry.FindPropertyRelative("componentType"),`
`200`	`200`	`providerProfile = providerEntry.FindPropertyRelative("deviceManagerProfile"),`
`201`	`201`	`runtimePlatform = providerEntry.FindPropertyRelative("runtimePlatform"),`
`202`	`202`	`};`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr`
`57`	`57`	`{`
`58`	`58`	`return new ServiceConfigurationProperties()`
`59`	`59`	`{`
`60`		`- Name = providerEntry.FindPropertyRelative("componentName"),`
`61`		`- Type = providerEntry.FindPropertyRelative("componentType"),`
	`60`	`+ componentName = providerEntry.FindPropertyRelative("componentName"),`
	`61`	`+ componentType = providerEntry.FindPropertyRelative("componentType"),`
`62`	`62`	`providerProfile = providerEntry.FindPropertyRelative("observerProfile"),`
`63`	`63`	`runtimePlatform = providerEntry.FindPropertyRelative("runtimePlatform"),`
`64`	`64`	`};`