Remove empty attributes for build option.

[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 26d3d694c952860db0552209be4884e74d9ad846..1e0a5cdc44eac6d5a49b032f7ce381ff1567c916 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
@@ -2135,11 +2135,42 @@ public class FpdFileContents {
     \r
     private void setBuildOptionsOpt(Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents, OptionDocument.Option opt){\r
         opt.setStringValue(contents);\r
+        if (buildTargets != null) {\r
+            opt.setBuildTargets(buildTargets);\r
+        }\r
+        else {\r
+            if (opt.isSetBuildTargets()) {\r
+                opt.unsetBuildTargets();\r
+            }\r
+        }\r
+        \r
+        if (toolChain != null && toolChain.length() > 0) {\r
+            opt.setToolChainFamily(toolChain);\r
+        }\r
+        else {\r
+            if (opt.isSetToolChainFamily()) {\r
+                opt.unsetToolChainFamily();\r
+            }\r
+        }\r
+        \r
+        if (tagName != null && tagName.length() > 0) {\r
+            opt.setTagName(tagName);\r
+        }\r
+        else {\r
+            if (opt.isSetTagName()) {\r
+                opt.unsetTagName();\r
+            }\r
+        }\r
+        \r
+        if (toolCmd != null && toolCmd.length() > 0) {\r
+            opt.setToolCode(toolCmd);\r
+        }\r
+        else {\r
+            if (opt.isSetToolCode()) {\r
+                opt.unsetToolCode();\r
+            }\r
+        }\r
         \r
-        opt.setBuildTargets(buildTargets);\r
-        opt.setToolChainFamily(toolChain);\r
-        opt.setTagName(tagName);\r
-        opt.setToolCode(toolCmd);\r
         \r
         if (archList != null) {\r
             opt.setSupArchList(archList);\r