Fix the problem of not sync. module order list in FVs when user change the FvBinding...

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFileContents.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index fc49cd4151faf641964d3a1e920b9e3a3cdc344f..bc472480732078223a42f3fe1018ab6e41be5d93 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -1991,7 +1991,16 @@ public class FpdFileContents {
     }\r
     \r
     public void removeModuleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
-        if (getUserExtsIncModCount(fvName) > 0) {\r
+        //\r
+        // if there is only one module before remove operation, the whole user extension should be removed.\r
+        //\r
+        int moduleAmount = getUserExtsIncModCount(fvName);\r
+        if (moduleAmount == 1) {\r
+            removeBuildOptionsUserExtensions(fvName);\r
+            return;\r
+        }\r
+        \r
+        if (moduleAmount > 1) {\r
             \r
             XmlCursor cursor = getfpdBuildOpts().newCursor();\r
             QName elementUserExts = new QName (xmlNs, "UserExtensions");\r