keep from generating empty DynamicPcdBuildDefinitions

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1119 6f19259b-4bc3-4df7-8a09-765794883524

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 fa0924a7a45e616021cfc2b6818c3228db3a2806..617f74e0bd95996366a01a7159860a442c7e7b5b 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
@@ -96,6 +96,8 @@ public class FpdFileContents {
           dynPcdMap = new HashMap<String, ArrayList<String>>();\r
           List<ModuleSADocument.ModuleSA> l = getfpdFrameworkModules().getModuleSAList();\r
           if (l == null) {\r
           dynPcdMap = new HashMap<String, ArrayList<String>>();\r
           List<ModuleSADocument.ModuleSA> l = getfpdFrameworkModules().getModuleSAList();\r
           if (l == null) {\r

+              removeElement(getfpdFrameworkModules());\r
+              fpdFrameworkModules = null;\r

               return;\r
           }\r
           ListIterator<ModuleSADocument.ModuleSA> li = l.listIterator();\r
               return;\r
           }\r
           ListIterator<ModuleSADocument.ModuleSA> li = l.listIterator();\r


@@ -181,6 +183,8 @@ public class FpdFileContents {
     \r
     public int getFrameworkModulesCount() {\r
         if (getfpdFrameworkModules().getModuleSAList() == null){\r
     \r
     public int getFrameworkModulesCount() {\r
         if (getfpdFrameworkModules().getModuleSAList() == null){\r

+            removeElement(getfpdFrameworkModules());\r
+            fpdFrameworkModules = null;\r

             return 0;\r
         }\r
         return getfpdFrameworkModules().getModuleSAList().size();\r
             return 0;\r
         }\r
         return getfpdFrameworkModules().getModuleSAList().size();\r


@@ -220,6 +224,8 @@ public class FpdFileContents {
     public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
         String[] s = key.split(" ");\r
         if (getfpdFrameworkModules().getModuleSAList() == null) {\r
     public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
         String[] s = key.split(" ");\r
         if (getfpdFrameworkModules().getModuleSAList() == null) {\r

+            removeElement(getfpdFrameworkModules());\r
+            fpdFrameworkModules = null;\r

             return null;\r
         }\r
         ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
             return null;\r
         }\r
         ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r


@@ -250,7 +256,10 @@ public class FpdFileContents {
     \r
     private ModuleSADocument.ModuleSA getModuleSA(int i) {\r
         ModuleSADocument.ModuleSA msa = null;\r
     \r
     private ModuleSADocument.ModuleSA getModuleSA(int i) {\r
         ModuleSADocument.ModuleSA msa = null;\r

-        XmlCursor cursor = getfpdFrameworkModules().newCursor();\r
+        if (fpdRoot.getFrameworkModules() == null) {\r
+            return null;\r
+        }\r
+        XmlCursor cursor = fpdRoot.getFrameworkModules().newCursor();\r

         if (cursor.toFirstChild()) {\r
             for (int j = 0; j < i; ++j) {\r
                 cursor.toNextSibling();\r
         if (cursor.toFirstChild()) {\r
             for (int j = 0; j < i; ++j) {\r
                 cursor.toNextSibling();\r


@@ -262,7 +271,7 @@ public class FpdFileContents {
     }\r
     \r
     public void removeModuleSA(int i) {\r
     }\r
     \r
     public void removeModuleSA(int i) {\r

-        XmlObject o = getfpdFrameworkModules();\r
+        XmlObject o = fpdRoot.getFrameworkModules();\r

         if (o == null) {\r
             return;\r
         }\r
         if (o == null) {\r
             return;\r
         }\r


@@ -431,7 +440,7 @@ public class FpdFileContents {
             \r
         }\r
         catch (Exception e){\r
             \r
         }\r
         catch (Exception e){\r

-//            e.printStackTrace();\r
+            e.printStackTrace();\r

             throw e;\r
         }\r
         \r
             throw e;\r
         }\r
         \r


@@ -652,7 +661,7 @@ public class FpdFileContents {
     \r
     public void getModuleSAOptions(String moduleKey, String[][] saa) {\r
         ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
     \r
     public void getModuleSAOptions(String moduleKey, String[][] saa) {\r
         ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r

-        if (msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
+        if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r

                         || msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
             return ;\r
         }\r
                         || msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
             return ;\r
         }\r


@@ -682,7 +691,7 @@ public class FpdFileContents {
     \r
     public int getModuleSAOptionsCount(String moduleKey){\r
         ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
     \r
     public int getModuleSAOptionsCount(String moduleKey){\r
         ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r

-        if (msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
+        if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r

                         || msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
             return 0;\r
         }\r
                         || msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
             return 0;\r
         }\r


@@ -779,7 +788,7 @@ public class FpdFileContents {
             \r
         }\r
         catch (Exception e){\r
             \r
         }\r
         catch (Exception e){\r

-//            e.printStackTrace();\r
+            e.printStackTrace();\r

             throw e; \r
         }\r
         \r
             throw e; \r
         }\r
         \r


@@ -1026,6 +1035,8 @@ public class FpdFileContents {
     \r
     public int getDynamicPcdBuildDataCount() {\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
     \r
     public int getDynamicPcdBuildDataCount() {\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r

+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r

             return 0;\r
         }\r
         return getfpdDynPcdBuildDefs().getPcdBuildDataList().size();\r
             return 0;\r
         }\r
         return getfpdDynPcdBuildDefs().getPcdBuildDataList().size();\r


@@ -1033,6 +1044,8 @@ public class FpdFileContents {
     \r
     public void getDynamicPcdBuildData(String[][] saa) {\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
     \r
     public void getDynamicPcdBuildData(String[][] saa) {\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r

+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r

             return ;\r
         }\r
         List<DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData> l = getfpdDynPcdBuildDefs().getPcdBuildDataList();\r
             return ;\r
         }\r
         List<DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData> l = getfpdDynPcdBuildDefs().getPcdBuildDataList();\r


@@ -1107,7 +1120,10 @@ public class FpdFileContents {
     }\r
     \r
     public void removeDynamicPcdBuildData(String cName, String tsGuid) {\r
     }\r
     \r
     public void removeDynamicPcdBuildData(String cName, String tsGuid) {\r

-        XmlObject o = getfpdDynPcdBuildDefs();\r
+        XmlObject o = fpdRoot.getDynamicPcdBuildDefinitions();\r
+        if (o == null) {\r
+            return;\r
+        }\r

         \r
         XmlCursor cursor = o.newCursor();\r
         if (cursor.toFirstChild()) {\r
         \r
         XmlCursor cursor = o.newCursor();\r
         if (cursor.toFirstChild()) {\r


@@ -1132,7 +1148,8 @@ public class FpdFileContents {
     // Get the Sku Info count of ith dyn pcd element.\r
     //\r
     public int getDynamicPcdSkuInfoCount(int i){\r
     // Get the Sku Info count of ith dyn pcd element.\r
     //\r
     public int getDynamicPcdSkuInfoCount(int i){\r

-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+        if (fpdRoot.getDynamicPcdBuildDefinitions() == null || fpdRoot.getDynamicPcdBuildDefinitions().getPcdBuildDataList() == null \r
+                        || fpdRoot.getDynamicPcdBuildDefinitions().getPcdBuildDataList().size() == 0) {\r

             return 0;\r
         }\r
         \r
             return 0;\r
         }\r
         \r


@@ -1156,6 +1173,8 @@ public class FpdFileContents {
     \r
     public void getDynamicPcdSkuInfos(int i, String[][] saa){\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
     \r
     public void getDynamicPcdSkuInfos(int i, String[][] saa){\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r

+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r

             return;\r
         }\r
         \r
             return;\r
         }\r
         \r


@@ -1193,6 +1212,8 @@ public class FpdFileContents {
     public String getDynamicPcdBuildDataValue(int i){\r
         String value = null;\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
     public String getDynamicPcdBuildDataValue(int i){\r
         String value = null;\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r

+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r

             return value;\r
         }\r
         \r
             return value;\r
         }\r
         \r


@@ -1216,6 +1237,8 @@ public class FpdFileContents {
     public String getDynamicPcdBuildDataVpdOffset(int i){\r
         String vpdOffset = null;\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
     public String getDynamicPcdBuildDataVpdOffset(int i){\r
         String vpdOffset = null;\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r

+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r

             return vpdOffset;\r
         }\r
         \r
             return vpdOffset;\r
         }\r
         \r


@@ -1238,6 +1261,8 @@ public class FpdFileContents {
     \r
     public void removeDynamicPcdBuildDataSkuInfo(int i) {\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
     \r
     public void removeDynamicPcdBuildDataSkuInfo(int i) {\r
         if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r

+            removeElement(getfpdDynPcdBuildDefs());\r
+            fpdDynPcdBuildDefs = null;\r

             return;\r
         }\r
         \r
             return;\r
         }\r
         \r


@@ -1264,9 +1289,9 @@ public class FpdFileContents {
     //\r
     public void genDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
                                               String hiiDefault, String vpdOffset, String value, int i) {\r
     //\r
     public void genDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
                                               String hiiDefault, String vpdOffset, String value, int i) {\r

-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
-            return;\r
-        }\r
+//        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+//            return;\r
+//        }\r

         \r
         XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
         if (cursor.toFirstChild()) {\r
         \r
         XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
         if (cursor.toFirstChild()) {\r


@@ -1293,9 +1318,9 @@ public class FpdFileContents {
     \r
     public void updateDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
                                                  String hiiDefault, String vpdOffset, String value, int i){\r
     \r
     public void updateDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
                                                  String hiiDefault, String vpdOffset, String value, int i){\r

-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
-            return;\r
-        }\r
+//        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+//            return;\r
+//        }\r

         \r
         XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
         if (cursor.toFirstChild()) {\r
         \r
         XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
         if (cursor.toFirstChild()) {\r


@@ -2419,6 +2444,12 @@ public class FpdFileContents {
         }\r
         return s.trim();\r
     }\r
         }\r
         return s.trim();\r
     }\r

+    \r
+    private void removeElement(XmlObject o) {\r
+        XmlCursor cursor = o.newCursor();\r
+        cursor.removeXml();\r
+        cursor.dispose();\r
+    }\r

 }\r
 \r
 class PcdItemTypeConflictException extends Exception {\r
 }\r
 \r
 class PcdItemTypeConflictException extends Exception {\r