1. keep from generating empty FrameworkModules.

[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 617f74e0bd95996366a01a7159860a442c7e7b5b..f730fa2a6ee22cee410c272c63b5138f80e91df3 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
@@ -182,7 +182,7 @@ public class FpdFileContents {
     }\r
     \r
     public int getFrameworkModulesCount() {\r
-        if (getfpdFrameworkModules().getModuleSAList() == null){\r
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return 0;\r
@@ -223,7 +223,7 @@ public class FpdFileContents {
     \r
     public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
         String[] s = key.split(" ");\r
-        if (getfpdFrameworkModules().getModuleSAList() == null) {\r
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r
             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return null;\r
@@ -1034,7 +1034,7 @@ public class FpdFileContents {
     }\r
     \r
     public int getDynamicPcdBuildDataCount() {\r
-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
             removeElement(getfpdDynPcdBuildDefs());\r
             fpdDynPcdBuildDefs = null;\r
             return 0;\r
@@ -1043,7 +1043,7 @@ public class FpdFileContents {
     }\r
     \r
     public void getDynamicPcdBuildData(String[][] saa) {\r
-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
             removeElement(getfpdDynPcdBuildDefs());\r
             fpdDynPcdBuildDefs = null;\r
             return ;\r
@@ -1962,6 +1962,10 @@ public class FpdFileContents {
     \r
     public void getPlatformDefsSkuInfos(String[][] saa){\r
         if (getfpdPlatformDefs().getSkuInfo() == null || getfpdPlatformDefs().getSkuInfo().getUiSkuNameList() == null) {\r
+            if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+                removeElement(getfpdDynPcdBuildDefs());\r
+                fpdDynPcdBuildDefs = null;\r
+            }\r
             return ;\r
         }\r
         \r