Remove empty FfsFileNameGuid element under ModuleSaBuildOptions if user input empty...

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 0e1f4ccf89253fa75bd103c690d9dfbf7572c1c9..6e7c79f6582976223cc09d38f89c805a23833b0a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -40,6 +40,7 @@ import org.tianocore.FrameworkModulesDocument;
 import org.tianocore.IntermediateOutputType;\r
 import org.tianocore.LibrariesDocument;\r
 import org.tianocore.ModuleSADocument;\r
 import org.tianocore.IntermediateOutputType;\r
 import org.tianocore.LibrariesDocument;\r
 import org.tianocore.ModuleSADocument;\r

+import org.tianocore.ModuleSaBuildOptionsDocument;\r

 import org.tianocore.ModuleSurfaceAreaDocument;\r
 import org.tianocore.OptionDocument;\r
 import org.tianocore.OptionsDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument;\r
 import org.tianocore.OptionDocument;\r
 import org.tianocore.OptionsDocument;\r


@@ -570,10 +571,21 @@ public class FpdFileContents {
             return;\r
         }\r
         if(msa.getModuleSaBuildOptions() == null){\r
             return;\r
         }\r
         if(msa.getModuleSaBuildOptions() == null){\r

-            msa.addNewModuleSaBuildOptions().setFfsFileNameGuid(fileGuid);\r
-            return;\r
+            msa.addNewModuleSaBuildOptions();\r
+            \r
+        }\r
+        ModuleSaBuildOptionsDocument.ModuleSaBuildOptions msaBuildOpts= msa.getModuleSaBuildOptions();\r
+        if (fileGuid != null) {\r
+            msaBuildOpts.setFfsFileNameGuid(fileGuid);\r
+        }\r
+        else{\r
+            XmlCursor cursor = msaBuildOpts.newCursor();\r
+            if (cursor.toChild(xmlNs, "FfsFileNameGuid")) {\r
+                cursor.removeXml();\r
+            }\r
+            cursor.dispose();\r

         }\r
         }\r

-        msa.getModuleSaBuildOptions().setFfsFileNameGuid(fileGuid);\r
+        \r

     }\r
     \r
     public String getFfsFormatKey(String moduleKey){\r
     }\r
     \r
     public String getFfsFormatKey(String moduleKey){\r