Fixed an FDG warning (nested types)

David Lassonde · David Lassonde · commit 5e3fd03767d1 · 2018-06-01T16:03:37.000-04:00
diff --git a/Assets/com.unity.formats.fbx.tests/FbxPrefabAutoUpdaterTest.cs b/Assets/com.unity.formats.fbx.tests/FbxPrefabAutoUpdaterTest.cs
@@ -170,7 +170,7 @@ public void TestNameMapping()
             FbxPrefab fbxPrefabScript = cubePrefab.GetComponent<FbxPrefab>();
 
 
-            FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
+            StringPair stringpair = new StringPair();
             stringpair.FBXObjectName = "SphereFBX";
             stringpair.UnityObjectName = "Sphere";
             fbxPrefabScript.NameMapping.Add(stringpair);
@@ -203,7 +203,7 @@ public void RemappingTest()
 
             // In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
             FbxPrefab fbxPrefabScript = cube.GetComponent<FbxPrefab>();
-            FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
+            StringPair stringpair = new StringPair();
             stringpair.FBXObjectName = "SphereFBX";
             stringpair.UnityObjectName = "Sphere";
             fbxPrefabScript.NameMapping.Add(stringpair);
@@ -262,7 +262,7 @@ public void RemappingTest()
 
             // In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
             FbxPrefab fbxPrefabScript = cube.GetComponent<FbxPrefab>();
-            FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
+            StringPair stringpair = new StringPair();
             stringpair.FBXObjectName = "SphereFBX";
             stringpair.UnityObjectName = "Sphere";
             fbxPrefabScript.NameMapping.Add(stringpair);
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabUtility.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabUtility.cs
@@ -42,11 +42,11 @@ public string GetUnityObjectName(string fbxObjectName)
         /// </summary>
         public void RemoveMappingFBXObjectName(string fbxObjectName)
         {
-            FbxPrefab.StringPair stockNameMapping = new FbxPrefab.StringPair();
+            StringPair stockNameMapping = new StringPair();
             if (!String.IsNullOrEmpty(fbxObjectName) && m_fbxPrefab.NameMapping != null)
             {
                 bool foundMapping = false;
-                foreach (FbxPrefab.StringPair nameMapping in m_fbxPrefab.NameMapping)
+                foreach (StringPair nameMapping in m_fbxPrefab.NameMapping)
                 {
                     if (fbxObjectName == nameMapping.FBXObjectName)
                     {
@@ -67,11 +67,11 @@ public void RemoveMappingFBXObjectName(string fbxObjectName)
         /// </summary>
         public void RemoveMappingUnityObjectName(string unityObjectName)
         {
-            FbxPrefab.StringPair stockNameMapping = new FbxPrefab.StringPair();
+            StringPair stockNameMapping = new StringPair();
             if (!String.IsNullOrEmpty(unityObjectName) && m_fbxPrefab.NameMapping != null)
             {
                 bool foundMapping = false;
-                foreach (FbxPrefab.StringPair nameMapping in m_fbxPrefab.NameMapping)
+                foreach (StringPair nameMapping in m_fbxPrefab.NameMapping)
                 {
                     if (unityObjectName == nameMapping.UnityObjectName)
                     {
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ManualUpdateEditorWindow.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ManualUpdateEditorWindow.cs
@@ -142,7 +142,7 @@ void ApplyChanges()
                 // != [Delete] 
                 if (selectedNodesToDestroy[i] != 0)
                 {
-                    FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
+                    StringPair stringpair = new StringPair();
                     stringpair.FBXObjectName = options[selectedNodesToDestroy[i]].text;
                     stringpair.UnityObjectName = m_nodesToDestroy[i];
 
@@ -170,7 +170,7 @@ void ApplyChanges()
                     if (currentUnityNodeName != m_fbxPrefabUtility.GetUnityObjectName(options[selectedNodesToRename[i]].text))
                     {
                         m_fbxPrefabUtility.RemoveMappingUnityObjectName(currentUnityNodeName);
-                        FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
+                        StringPair stringpair = new StringPair();
                         stringpair.FBXObjectName = options[selectedNodesToRename[i]].text;
                         stringpair.UnityObjectName = currentUnityNodeName;
                         m_fbxPrefab.NameMapping.Add(stringpair);

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ public string GetUnityObjectName(string fbxObjectName)`
`42`	`42`	`/// </summary>`
`43`	`43`	`public void RemoveMappingFBXObjectName(string fbxObjectName)`
`44`	`44`	`{`
`45`		`- FbxPrefab.StringPair stockNameMapping = new FbxPrefab.StringPair();`
	`45`	`+ StringPair stockNameMapping = new StringPair();`
`46`	`46`	`if (!String.IsNullOrEmpty(fbxObjectName) && m_fbxPrefab.NameMapping != null)`
`47`	`47`	`{`
`48`	`48`	`bool foundMapping = false;`
`49`		`- foreach (FbxPrefab.StringPair nameMapping in m_fbxPrefab.NameMapping)`
	`49`	`+ foreach (StringPair nameMapping in m_fbxPrefab.NameMapping)`
`50`	`50`	`{`
`51`	`51`	`if (fbxObjectName == nameMapping.FBXObjectName)`
`52`	`52`	`{`
`@@ -67,11 +67,11 @@ public void RemoveMappingFBXObjectName(string fbxObjectName)`
`67`	`67`	`/// </summary>`
`68`	`68`	`public void RemoveMappingUnityObjectName(string unityObjectName)`
`69`	`69`	`{`
`70`		`- FbxPrefab.StringPair stockNameMapping = new FbxPrefab.StringPair();`
	`70`	`+ StringPair stockNameMapping = new StringPair();`
`71`	`71`	`if (!String.IsNullOrEmpty(unityObjectName) && m_fbxPrefab.NameMapping != null)`
`72`	`72`	`{`
`73`	`73`	`bool foundMapping = false;`
`74`		`- foreach (FbxPrefab.StringPair nameMapping in m_fbxPrefab.NameMapping)`
	`74`	`+ foreach (StringPair nameMapping in m_fbxPrefab.NameMapping)`
`75`	`75`	`{`
`76`	`76`	`if (unityObjectName == nameMapping.UnityObjectName)`
`77`	`77`	`{`